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

Commit 878ad0e7 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into... 

Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 45d21c45 am: 3f05431a am: bf4572a1
am: 8ad100a4

Change-Id: I4103a6efeccbbcc94aff45632af1474960f0fddc
parents bdd913ac 8ad100a4

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

+10 −10
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ public class BluetoothOppUtility { 
    private static final ConcurrentHashMap<Uri, BluetoothOppSendFileInfo> sSendFileMap

            = new ConcurrentHashMap<Uri, BluetoothOppSendFileInfo>();



    public static boolean isBluetoothShareUri(Uri uri) {

        return uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString());

    }



    public static BluetoothOppTransferInfo queryRecord(Context context, Uri uri) {

        BluetoothOppTransferInfo info = new BluetoothOppTransferInfo();

        Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
@@ -178,6 +182,11 @@ public class BluetoothOppUtility { 
            return;

        }



        if (!isBluetoothShareUri(uri)) {

            Log.e(TAG, "Trying to open a file that wasn't transfered over Bluetooth");

            return;

        }



        File f = new File(fileName);

        if (!f.exists()) {

            Intent in = new Intent(context, BluetoothOppBtErrorActivity.class);
@@ -208,17 +217,8 @@ public class BluetoothOppUtility { 
                .queryIntentActivities(activityIntent,

                        PackageManager.MATCH_DEFAULT_ONLY);



            // Grant permissions for any app that can handle a file to access it

            for (ResolveInfo resolveInfo : resInfoList) {

                String packageName = resolveInfo.activityInfo.packageName;

                context.grantUriPermission(packageName, path,

                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION |

                        Intent.FLAG_GRANT_READ_URI_PERMISSION);

            }



            activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            activityIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

            activityIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

            activityIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);



            try {

                if (V) Log.d(TAG, "ACTION_VIEW intent sent out: " + path + " / " + mimetype);