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

Commit dce5ae60 authored by Hemant Gupta's avatar Hemant Gupta
Browse files

OPP: Add support for queing same file during ongoing transfer. 

Steps:
1. Push a file from DUT to remote.
2. while transfer is ongoing, try to push the same file
   to some other remote.

Failure:
Pop up displayed Unkown file not sent.

Fix:
Add support to send same file multiple times. Otherwise,if
same file is queued for sending after first transfer succeeds
queued instances of the same file gets removed and error is shown
as failed to send the file.

Test: Same file can be transferred successfully if queued during active
ongoing transfer.

Bug: 35014157
Change-Id: Ic86277b4e28a93481c3b89e65644878bd644e6ff
parent 27e8db22

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

+14 −8
Original line number Diff line number Diff line
@@ -266,12 +266,14 @@ public class BluetoothOppManager { 
        synchronized (BluetoothOppManager.this) {

            mMultipleFlag = false;

            mMimeTypeOfSendingFile = mimeType;

            mUriOfSendingFile = uriString;

            mIsHandoverInitiated = isHandover;

            Uri uri = Uri.parse(uriString);

            BluetoothOppUtility.putSendFileInfo(uri,

            BluetoothOppSendFileInfo sendFileInfo =

                    BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType,

                            fromExternal));

                    fromExternal);

            uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

            BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

            mUriOfSendingFile = uri.toString();

            storeApplicationData();

        }

    }
@@ -281,12 +283,15 @@ 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 sendFileInfo =

                        BluetoothOppSendFileInfo.generateFileInfo(mContext, uri, mimeType,

                                fromExternal));

                        fromExternal);

                uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

                mUrisOfSendingFiles.add(uri);

                BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

            }

            storeApplicationData();

        }
@@ -452,7 +457,10 @@ 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);
@@ -461,8 +469,6 @@ public class BluetoothOppManager { 
                    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);

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

+7 −0
Original line number Diff line number Diff line
@@ -381,6 +381,13 @@ public class BluetoothOppTransferActivity extends AlertActivity 
                            mTransInfo.mID);



                    // retry the failed transfer

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

                    BluetoothOppSendFileInfo sendFileInfo =

                            BluetoothOppSendFileInfo.generateFileInfo(BluetoothOppTransferActivity

                            .this, uri, mTransInfo.mFileType, false);

                    uri = BluetoothOppUtility.generateUri(uri, sendFileInfo);

                    BluetoothOppUtility.putSendFileInfo(uri, sendFileInfo);

                    mTransInfo.mFileUri = uri.toString();

                    BluetoothOppUtility.retryTransfer(this, mTransInfo);



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

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

+20 −0
Original line number Diff line number Diff line
@@ -345,6 +345,26 @@ public class BluetoothOppUtility { 
        }

    }



    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);