From 736b5313e634c17e1446c0f42f1962ba1fdb0664 Mon Sep 17 00:00:00 2001 From: alansley Date: Wed, 28 Aug 2024 14:02:54 +1000 Subject: [PATCH] Changed toast to warning - although condition to trigger should not be possible --- .../securesms/groups/EditClosedGroupActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt index 4aa086e147..03050e6291 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt @@ -310,10 +310,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() { val userPublicKey = TextSecurePreferences.getLocalNumber(this)!! val userAsRecipient = Recipient.from(this, Address.fromSerialized(userPublicKey), false) + // There's presently way in the UI to get into the state whereby you could remove yourself from the group when removing any other members + // (you can't unselect yourself - the only way to leave is to "Leave Group" from the menu) - but it's possible that this was not always + // the case - so we can leave this in as defensive code in-case something goes screwy. if (!members.contains(userAsRecipient) && !members.map { it.address.toString() }.containsAll(originalMembers.minus(userPublicKey))) { - // ACL TODO - Need a proper string for this - val message = "Can't leave while adding or removing other members." - return Toast.makeText(this@EditClosedGroupActivity, message, Toast.LENGTH_LONG).show() + return Log.w("EditClosedGroup", "Can't leave group while adding or removing other members.") } if (isClosedGroup) {