Send uri path directly and add try/catch to prevent permission relate…

…d crashes
wordpress-mobile · Feb 7, 2024 · 9d3e3e2 · 9d3e3e2
1 parent abc7992
commit 9d3e3e2
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java
@@ -4,7 +4,6 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -22,6 +21,8 @@
 import org.wordpress.android.ui.main.WPMainActivity;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
 import org.wordpress.android.ui.media.MediaBrowserType;
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.FluxCUtils;
 import org.wordpress.android.util.MediaUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -95,27 +96,27 @@ private void refreshContent() {
     }
 
     private void downloadExternalMedia() {
-        if (Intent.ACTION_SEND_MULTIPLE.equals(getIntent().getAction())) {
-            ArrayList<Uri> externalUris = getIntent().getParcelableArrayListExtra((Intent.EXTRA_STREAM));
-            for (Uri uri : externalUris) {
-                if (uri != null && isAllowedMediaType(uri)) {
-                    mLocalMediaUris.add(MediaUtils.downloadExternalMedia(this, uri));
+        try {
+            if (Intent.ACTION_SEND_MULTIPLE.equals(getIntent().getAction())) {
+                ArrayList<Uri> externalUris = getIntent().getParcelableArrayListExtra((Intent.EXTRA_STREAM));
+                for (Uri uri : externalUris) {
+                    if (uri != null && isAllowedMediaType(uri)) {
+                        mLocalMediaUris.add(MediaUtils.downloadExternalMedia(this, uri));
+                    }
+                }
+            } else if (Intent.ACTION_SEND.equals(getIntent().getAction())) {
+                Uri externalUri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+                if (externalUri != null && isAllowedMediaType(externalUri)) {
+                    mLocalMediaUris.add(MediaUtils.downloadExternalMedia(this, externalUri));
                 }
             }
-        } else if (Intent.ACTION_SEND.equals(getIntent().getAction())) {
-            Uri externalUri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
-            if (externalUri != null && isAllowedMediaType(externalUri)) {
-                mLocalMediaUris.add(MediaUtils.downloadExternalMedia(this, externalUri));
-            }
+        } catch (Exception e) {
+            AppLog.e(T.MEDIA, "ShareIntentReceiver failed ", e);
         }
     }
 
     private boolean isAllowedMediaType(@NonNull Uri uri) {
-        String filePath = MediaUtils.getRealPathFromURI(this, uri);
-        // For cases when the uri is already the file path
-        if (TextUtils.isEmpty(filePath)) {
-            filePath = String.valueOf(uri);
-        }
+        String filePath = uri.getPath();
         return MediaUtils.isValidImage(filePath) || MediaUtils.isVideo(filePath);
     }