Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-26 22:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix share selection crash.

Browse Source
This commit is contained in:
Cody Henthorne
2021-12-16 20:42:12 -05:00
committed by Greyson Parrelli
parent 9177f5637a
commit 0dcae81dba
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareViewModel.java
View File

@@ -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;