Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 19:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ISE in mutli-share flow.

Browse Source
This commit is contained in:
Cody Henthorne
2022-01-05 14:33:11 -05:00
committed by Alex Hart
parent 8bc7d1b7f5
commit 0aabf9945f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java
View File

@@ -208,6 +208,10 @@ public class ShareActivity extends PassphraseRequiredActivity
Toast.makeText(this, R.string.ShareActivity_you_do_not_have_permission_to_send_to_this_group, Toast.LENGTH_SHORT).show();
callback.accept(false);
break;
case FALSE_AND_SHOW_SMS_MULTISELECT_TOAST:
Toast.makeText(this, R.string.ShareActivity__sharing_to_multiple_chats_is, Toast.LENGTH_LONG).show();
callback.accept(false);
break;
}
}));
}

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

@@ -76,6 +76,9 @@ public class ShareViewModel extends ViewModel {
if (record.isPresent() && record.get().isAnnouncementGroup() && !record.get().isAdmin(Recipient.self())) {
return ContactSelectResult.FALSE_AND_SHOW_PERMISSION_TOAST;
}
} else if (SmsShareRestriction.DISALLOW_SMS_CONTACTS.equals(smsShareRestriction.getValue()) &&
(!recipient.isRegistered() || recipient.isForceSmsSelection())) {
return ContactSelectResult.FALSE_AND_SHOW_SMS_MULTISELECT_TOAST;
}
}
@@ -165,7 +168,7 @@ public class ShareViewModel extends ViewModel {
}
enum ContactSelectResult {
TRUE, FALSE, FALSE_AND_SHOW_PERMISSION_TOAST
TRUE, FALSE, FALSE_AND_SHOW_PERMISSION_TOAST, FALSE_AND_SHOW_SMS_MULTISELECT_TOAST
}
enum SmsShareRestriction {