From d935be7b0ae69f156d59ca1cf7754c7cedc80b44 Mon Sep 17 00:00:00 2001 From: Rhodey Orbits Date: Fri, 12 Jun 2015 12:59:10 -0700 Subject: [PATCH] check for null Intent.EXTRA_STREAM Fixes #3413 Closes #3414 // FREEBIE --- src/org/thoughtcrime/securesms/ShareActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 0acb3f7801..bb69698f11 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -119,6 +119,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity private Uri getStreamExtra() { Uri streamUri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM); + if (streamUri == null) { + return null; + } + if (streamUri.getAuthority().equals("com.google.android.apps.photos.contentprovider") && streamUri.toString().endsWith("/ACTUAL")) {