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

Commit 3f1ab367 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

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

Merge "OPP: Add support for queing same file during ongoing transfer." am: f5607beb am: 9bb7e3c3
am: 744dce3f

Change-Id: I2aedb7a67d16ee7f34e9ba86f4ca999719445231
parents 42456ab7 744dce3f

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