From 2c1a5aef1c058ecf6b41ed892ba27056b555b6ee Mon Sep 17 00:00:00 2001 From: Max Muth Date: Wed, 1 Mar 2017 13:18:37 +0100 Subject: [PATCH] Fix occasional crash on Android 7 direct reply Fixes #6185 Closes #6322 //FREEBIE --- .../securesms/notifications/RemoteReplyReceiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index b846c00056..73decd5f52 100644 --- a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -60,7 +60,6 @@ public class RemoteReplyReceiver extends MasterSecretBroadcastReceiver { final long[] recipientIds = intent.getLongArrayExtra(RECIPIENT_IDS_EXTRA); final CharSequence responseText = remoteInput.getCharSequence(MessageNotifier.EXTRA_REMOTE_REPLY); - final Recipients recipients = RecipientFactory.getRecipientsForIds(context, recipientIds, false); if (masterSecret != null && responseText != null) { new AsyncTask() { @@ -72,6 +71,7 @@ public class RemoteReplyReceiver extends MasterSecretBroadcastReceiver { int subscriptionId = preferences.isPresent() ? preferences.get().getDefaultSubscriptionId().or(-1) : -1; long expiresIn = preferences.isPresent() ? preferences.get().getExpireMessages() * 1000 : 0; + Recipients recipients = RecipientFactory.getRecipientsForIds(context, recipientIds, false); if (recipients.isGroupRecipient()) { OutgoingMediaMessage reply = new OutgoingMediaMessage(recipients, responseText.toString(), new LinkedList(), System.currentTimeMillis(), subscriptionId, expiresIn, 0); threadId = MessageSender.send(context, masterSecret, reply, -1, false);