From 80f3ba727f6aa7aee2ee97a72d608b8561f46f41 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Mon, 21 Oct 2024 10:01:02 +1100 Subject: [PATCH] Deletion handled by VM so menu item is always visible --- .../v2/menus/ConversationActionModeCallback.kt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt index abadc06335..ea265bdbbf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt @@ -42,18 +42,6 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p val blindedPublicKey = openGroup?.publicKey?.let { SodiumUtilities.blindedKeyPair(it, edKeyPair)?.publicKey?.asBytes } ?.let { AccountId(IdPrefix.BLINDED, it) }?.hexString - // Embedded function - fun userCanDeleteSelectedItems(): Boolean { - // admin can delete all combinations - if(adapter.isAdmin) return true - - val allSentByCurrentUser = selectedItems.all { it.isOutgoing } - val allReceivedByCurrentUser = selectedItems.all { !it.isOutgoing } - if (openGroup == null) { return allSentByCurrentUser || allReceivedByCurrentUser } - if (allSentByCurrentUser) { return true } - return OpenGroupManager.isUserModerator(context, openGroup.groupId, userPublicKey, blindedPublicKey) - } - // Embedded function fun userCanBanSelectedUsers(): Boolean { if (openGroup == null) { return false } @@ -67,7 +55,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p // Delete message - menu.findItem(R.id.menu_context_delete_message).isVisible = userCanDeleteSelectedItems() + menu.findItem(R.id.menu_context_delete_message).isVisible = true // can always delete since delete logic will be handled by the VM // Ban user menu.findItem(R.id.menu_context_ban_user).isVisible = userCanBanSelectedUsers() // Ban and delete all