diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-12-01 11:06:34 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-12-09 22:31:40 +0000 |
| commit | 28769211a67e70bda03628bc1f98ffdd6ae68112 (patch) | |
| tree | abae02e91c4788bf343a2e68edba586ba05d51c8 | |
| parent | 58395bbe54dee9ab992e8f062a420cb0454f8b0c (diff) | |
| download | android_packages_apps_CMFileManager-28769211a67e70bda03628bc1f98ffdd6ae68112.tar.gz android_packages_apps_CMFileManager-28769211a67e70bda03628bc1f98ffdd6ae68112.tar.bz2 android_packages_apps_CMFileManager-28769211a67e70bda03628bc1f98ffdd6ae68112.zip | |
CMFileManager: Fix force close when sharing more than one file at a time
Change-Id: I64eb78ad4a2bbbe5626c0c93c4a80e0b8b97777b
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java index 01020622..47be24ee 100644 --- a/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java +++ b/src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java @@ -509,10 +509,25 @@ public final class IntentsActionPolicy extends ActionsPolicy { String authority = null; if (uri != null) { authority = uri.getAuthority(); + grantSecureAccess(intent, authority, ri, uri); } else if (intent.getExtras() != null) { - uri = (Uri) intent.getExtras().get(Intent.EXTRA_STREAM); - authority = uri.getAuthority(); + Object obj = intent.getExtras().get(Intent.EXTRA_STREAM); + if (obj instanceof Uri) { + uri = (Uri) intent.getExtras().get(Intent.EXTRA_STREAM); + authority = uri.getAuthority(); + grantSecureAccess(intent, authority, ri, uri); + } else if (obj instanceof ArrayList) { + ArrayList<Uri> uris = (ArrayList<Uri>) intent.getExtras().get(Intent.EXTRA_STREAM); + for (Uri u : uris) { + authority = u.getAuthority(); + grantSecureAccess(intent, authority, ri, u); + } + } } + } + + private static final void grantSecureAccess(Intent intent, String authority, ResolveInfo ri, + Uri uri) { if (authority != null && authority.equals(SecureResourceProvider.AUTHORITY)) { boolean isInternalEditor = isInternalEditor(ri); if (isInternalEditor) { |