Made closed group deleting-someone-elses msgs use 'Delete message' or…

… 'Delete Messages' appropriately
session-foundation · Aug 21, 2024 · b7f627f · b7f627f
1 parent 69f6818
commit b7f627f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt
@@ -11,7 +11,7 @@ class DeleteMediaPreviewDialog {
                 iconAttribute(R.attr.dialog_alert_icon)
                 title(R.string.deleteMessage)
                 text(R.string.deleteMessageDescriptionEveryone)
-                button(R.string.delete) { doDelete.run() }
+                dangerButton(R.string.delete) { doDelete.run() }
                 cancelButton()
             }
         }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -2119,9 +2119,10 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         else // Finally, if this is a closed group and you are deleting someone else's message(s) then we can only delete locally.
         {
             showSessionDialog {
-                title(resources.getString(R.string.deleteMessage))
-                text(resources.getString(R.string.deleteMessageDescriptionEveryone))
-                button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
+                val titleTxtId = if (messages.size == 1) { R.string.deleteMessage } else { R.string.deleteMessages }
+                title(resources.getString(titleTxtId))
+                text(resources.getString(R.string.deleteMessageDescriptionDevice))
+                dangerButton(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
                 cancelButton(::endActionMode)
             }
         }