From 747dbd5aa89963117b7e306e4df3cf9f14b9b2af Mon Sep 17 00:00:00 2001 From: "daniel.boehrs" Date: Fri, 12 Jul 2019 11:09:11 +0200 Subject: [PATCH 1/2] Sharing from special app crashed #996 --- src/org/thoughtcrime/securesms/ShareActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 7665c4e43..297945657 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -213,7 +213,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement private Intent getBaseShareIntent(final @NonNull Class target) { final Intent intent = new Intent(this, target); - setSharedText(intent, getIntent().getStringExtra(Intent.EXTRA_TEXT)); + CharSequence text = getIntent().getCharSequenceExtra(Intent.EXTRA_TEXT); + if (text != null) { + setSharedText(intent, text.toString()); + } if (resolvedExtras.size() > 0) { Uri data = resolvedExtras.get(0); if (data != null) { From ffb205f6afe872379a497097c858c5785b65e958 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 12 Jul 2019 12:34:42 +0200 Subject: [PATCH 2/2] still default to getStringExtra() --- src/org/thoughtcrime/securesms/ShareActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 297945657..26f356fa7 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -213,7 +213,14 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement private Intent getBaseShareIntent(final @NonNull Class target) { final Intent intent = new Intent(this, target); - CharSequence text = getIntent().getCharSequenceExtra(Intent.EXTRA_TEXT); + String text = getIntent().getStringExtra(Intent.EXTRA_TEXT); + if (text==null) { + CharSequence cs = getIntent().getCharSequenceExtra(Intent.EXTRA_TEXT); + if (cs!=null) { + text = cs.toString(); + } + } + if (text != null) { setSharedText(intent, text.toString()); }