From a421630789cf313194864257f8adaa3f07a6276b Mon Sep 17 00:00:00 2001 From: FeuRenard Date: Wed, 15 Mar 2017 02:05:48 +0100 Subject: [PATCH] Update input after enabling SMS Fixes #6363 Closes #6387 // FREEBIE --- src/org/thoughtcrime/securesms/ConversationActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 40058fa59d..f5349faf2b 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -367,7 +367,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity Log.w(TAG, "onActivityResult called: " + reqCode + ", " + resultCode + " , " + data); super.onActivityResult(reqCode, resultCode, data); - if ((data == null && reqCode != TAKE_PHOTO) || (resultCode != RESULT_OK && reqCode != SMS_DEFAULT)) return; + if ((data == null && reqCode != TAKE_PHOTO && reqCode != SMS_DEFAULT) || + (resultCode != RESULT_OK && reqCode != SMS_DEFAULT)) + { + return; + } switch (reqCode) { case PICK_IMAGE: