Skip to content
Permalink
Browse files

Bluetooth: OPP: Display proper name while cancelling transfer

Saves names of all the selected files to be transferred even
before starting of client thread so that names remain intact
in the outbound information even when the batch is cancelled
from initiator.

Change-Id: I1763e6fee04dc8bbac943ec1db4d739d46f40939
(cherry picked from commit 6bb19d0c0829fc58a369fa7c509e46492ea497c9)
(cherry picked from commit 4ff3f8e74af2570ad560ca8e311e704bb2580a28)
(cherry picked from commit f11f07a1f02f8a9ce726721951a64133e3ec68a7)
  • Loading branch information...
Pradeep Panigrahi authored and andi34 committed Aug 29, 2013
1 parent 469ee95 commit 1ae385d2d13c4fb428079b9eb5c3ca3beb5f8c9f
Showing with 4 additions and 0 deletions.
  1. +4 −0 src/com/android/bluetooth/opp/BluetoothOppManager.java
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
* Copyright (c) 2008-2009, Motorola, Inc.
*
* All rights reserved.
@@ -433,11 +434,14 @@ private void insertMultipleShare() {
contentType = mTypeOfMultipleFiles;
}

BluetoothOppSendFileInfo fileInfo = BluetoothOppSendFileInfo.generateFileInfo(
mContext, fileUri, contentType);
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);
values.put(BluetoothShare.FILENAME_HINT, fileInfo.mFileName);
if (mIsHandoverInitiated) {
values.put(BluetoothShare.USER_CONFIRMATION,
BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);

0 comments on commit 1ae385d

Please sign in to comment.
You can’t perform that action at this time.