Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86449ac4 authored by Hemant Gupta's avatar Hemant Gupta Committed by Matthew Xie
Browse files

Bluetooth-OPP: Enable support to send same file multiple times 

Change will add support to send same file multiple times. Otherwise,
if same file is selected to send multiple times after first transfer
succeeds queued instances of the same file got removed and it fails
to be sent.

Change-Id: Ic5b3706644a417cae2491d1df9588a22344f1711
parent f30c02bc

src/com/android/bluetooth/opp/BluetoothOppManager.java

+16 −8
Original line number Diff line number Diff line
@@ -250,11 +250,13 @@ public class BluetoothOppManager { 
        synchronized (BluetoothOppManager.this) {

            mMultipleFlag = false;

            mMimeTypeOfSendingFile = mimeType;

            mUriOfSendingFile = uriString;

            mIsHandoverInitiated = isHandover;

            Uri uri = Uri.parse(uriString);

            BluetoothOppUtility.putSendFileInfo(uri,

                    BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType));

            BluetoothOppSendFileInfo sendFileInfo =

                BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType);

            uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

            BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

            mUriOfSendingFile = uri.toString();

            storeApplicationData();

        }

    }
@@ -263,11 +265,14 @@ public class BluetoothOppManager { 
        synchronized (BluetoothOppManager.this) {

            mMultipleFlag = true;

            mMimeTypeOfSendingFiles = mimeType;

            mUrisOfSendingFiles = uris;

            mUrisOfSendingFiles = new ArrayList<Uri>();

            mIsHandoverInitiated = isHandover;

            for (Uri uri : uris) {

                BluetoothOppUtility.putSendFileInfo(uri,

                        BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType));

                BluetoothOppSendFileInfo sendFileInfo =

                    BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType);

                uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

                mUrisOfSendingFiles.add(uri);

                BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

            }

            storeApplicationData();

        }
@@ -426,15 +431,18 @@ public class BluetoothOppManager { 
            Long ts = System.currentTimeMillis();

            for (int i = 0; i < count; i++) {

                Uri fileUri = mUris.get(i);



                ContentValues values = new ContentValues();

                values.put(BluetoothShare.URI, fileUri.toString());



                ContentResolver contentResolver = mContext.getContentResolver();

                fileUri = BluetoothOppUtility.originalUri(fileUri);

                String contentType = contentResolver.getType(fileUri);

                if (V) Log.v(TAG, "Got mimetype: " + contentType + "  Got uri: " + fileUri);

                if (TextUtils.isEmpty(contentType)) {

                    contentType = mTypeOfMultipleFiles;

                }



                ContentValues values = new ContentValues();

                values.put(BluetoothShare.URI, fileUri.toString());

                values.put(BluetoothShare.MIMETYPE, contentType);

                values.put(BluetoothShare.DESTINATION, mRemoteDevice.getAddress());

                values.put(BluetoothShare.TIMESTAMP, ts);

src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -371,6 +371,12 @@ public class BluetoothOppTransferActivity extends AlertActivity implements 
                            .cancel(mTransInfo.mID);



                    // retry the failed transfer

                    Uri uri = BluetoothOppUtility.originalUri(Uri.parse(mTransInfo.mFileUri));

                    BluetoothOppSendFileInfo sendFileInfo =

                        BluetoothOppSendFileInfo.generateFileInfo(this, uri, mTransInfo.mFileType);

                    uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

                    BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

                    mTransInfo.mFileUri = uri.toString();

                    BluetoothOppUtility.retryTransfer(this, mTransInfo);



                    BluetoothDevice remoteDevice = mAdapter.getRemoteDevice(mTransInfo.mDestAddr);

src/com/android/bluetooth/opp/BluetoothOppUtility.java

+21 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class BluetoothOppUtility { 
                info.mFileUri = cursor.getString(cursor.getColumnIndexOrThrow(BluetoothShare.URI));



                if (info.mFileUri != null) {

                    Uri u = Uri.parse(info.mFileUri);

                    Uri u = originalUri(Uri.parse(info.mFileUri));

                    info.mFileType = context.getContentResolver().getType(u);

                } else {

                    Uri u = Uri.parse(info.mFileName);
@@ -308,6 +308,26 @@ public class BluetoothOppUtility { 
                transInfo.mDeviceName);

    }



    static Uri originalUri(Uri uri) {

        String mUri = uri.toString();

        int atIndex = mUri.lastIndexOf("@");

        if (atIndex != -1) {

            mUri = mUri.substring(0, atIndex);

            uri = Uri.parse(mUri);

        }

        if (V) Log.v(TAG, "originalUri: " + uri);

        return uri;

    }



    static Uri generateUri(Uri uri, BluetoothOppSendFileInfo sendFileInfo) {

        String fileInfo = sendFileInfo.toString();

        int atIndex = fileInfo.lastIndexOf("@");

        fileInfo = fileInfo.substring(atIndex);

        uri = Uri.parse(uri + fileInfo);

        if (V) Log.v(TAG, "generateUri: " + uri);

        return uri;

    }



    static void putSendFileInfo(Uri uri, BluetoothOppSendFileInfo sendFileInfo) {

        if (D) Log.d(TAG, "putSendFileInfo: uri=" + uri + " sendFileInfo=" + sendFileInfo);

        sSendFileMap.put(uri, sendFileInfo);