Move null check outside of isAllowedMediaType and put them where it's…

… called
wordpress-mobile · Jan 15, 2024 · e837837 · e837837
1 parent a630efc
commit e837837
Showing 1 changed file with 4 additions and 7 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
@@ -97,24 +97,21 @@ private void downloadExternalMedia() {
         if (Intent.ACTION_SEND_MULTIPLE.equals(getIntent().getAction())) {
             ArrayList<Uri> externalUris = getIntent().getParcelableArrayListExtra((Intent.EXTRA_STREAM));
             for (Uri uri : externalUris) {
-                if (isAllowedMediaType(uri)) {
+                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 (isAllowedMediaType(externalUri)) {
+            if (externalUri != null && isAllowedMediaType(externalUri)) {
                 mLocalMediaUris.add(MediaUtils.downloadExternalMedia(this, externalUri));
             }
         }
     }
 
     private boolean isAllowedMediaType(@NonNull Uri uri) {
-        if (uri != null) {
-            String filePath = MediaUtils.getRealPathFromURI(this, uri);
-            return MediaUtils.isValidImage(filePath) || MediaUtils.isVideo(filePath);
-        }
-        return false;
+        String filePath = MediaUtils.getRealPathFromURI(this, uri);
+        return MediaUtils.isValidImage(filePath) || MediaUtils.isVideo(filePath);
     }
 
     private void initShareFragment() {