From 7a933bef2993c61d6bf74d465dce8b0abc7fcbcf Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Thu, 28 Feb 2019 10:57:04 -0800 Subject: [PATCH] Check for null uri prior to getting path to shared content (#2607) --- .../com/mattermost/share/ShareModule.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/com/mattermost/share/ShareModule.java b/android/app/src/main/java/com/mattermost/share/ShareModule.java index 203b2800a..08f7271a4 100644 --- a/android/app/src/main/java/com/mattermost/share/ShareModule.java +++ b/android/app/src/main/java/com/mattermost/share/ShareModule.java @@ -145,17 +145,19 @@ public class ShareModule extends ReactContextBaseJavaModule { items.pushMap(map); } else if (Intent.ACTION_SEND.equals(action)) { Uri uri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); - text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri); - map.putString("value", text); + if (uri != null) { + text = "file://" + RealPathUtil.getRealPathFromURI(currentActivity, uri); + map.putString("value", text); - if (type.equals("image/*")) { - type = "image/jpeg"; - } else if (type.equals("video/*")) { - type = "video/mp4"; + if (type.equals("image/*")) { + type = "image/jpeg"; + } else if (type.equals("video/*")) { + type = "video/mp4"; + } + + map.putString("type", type); + items.pushMap(map); } - - map.putString("type", type); - items.pushMap(map); } else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) { ArrayList uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); for (Uri uri : uris) {