From 0dcae81dbaa92df920771d3f29f9191febec8cbe Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 16 Dec 2021 20:42:12 -0500 Subject: [PATCH] Fix share selection crash. --- .../securesms/sharing/ShareViewModel.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java index a5da1bbcb7..de5ad1e38f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java @@ -147,12 +147,17 @@ public class ShareViewModel extends ViewModel { return SmsShareRestriction.NO_RESTRICTIONS; } else if (shareContacts.size() == 1) { ShareContact shareContact = shareContacts.iterator().next(); - Recipient recipient = Recipient.live(shareContact.getRecipientId().get()).get(); - if (!recipient.isRegistered() || recipient.isForceSmsSelection()) { - return SmsShareRestriction.DISALLOW_MULTI_SHARE; + if (shareContact.getRecipientId().isPresent()) { + Recipient recipient = Recipient.live(shareContact.getRecipientId().get()).get(); + + if (!recipient.isRegistered() || recipient.isForceSmsSelection()) { + return SmsShareRestriction.DISALLOW_MULTI_SHARE; + } else { + return SmsShareRestriction.DISALLOW_SMS_CONTACTS; + } } else { - return SmsShareRestriction.DISALLOW_SMS_CONTACTS; + return SmsShareRestriction.DISALLOW_MULTI_SHARE; } } else { return SmsShareRestriction.DISALLOW_SMS_CONTACTS;