TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 10:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
alansley 2024-08-21 14:54:17 +10:00
parent 69f6818f99
commit b7f627f03c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/DeleteMediaPreviewDialog.kt
View File

@ -11,7 +11,7 @@ class DeleteMediaPreviewDialog {
iconAttribute(R.attr.dialog_alert_icon) iconAttribute(R.attr.dialog_alert_icon)
title(R.string.deleteMessage) title(R.string.deleteMessage)
text(R.string.deleteMessageDescriptionEveryone) text(R.string.deleteMessageDescriptionEveryone)
button(R.string.delete) { doDelete.run() } dangerButton(R.string.delete) { doDelete.run() }
cancelButton() cancelButton()
} }
} }

7
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -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. else // Finally, if this is a closed group and you are deleting someone else's message(s) then we can only delete locally.
{ {
showSessionDialog { showSessionDialog {
title(resources.getString(R.string.deleteMessage)) val titleTxtId = if (messages.size == 1) { R.string.deleteMessage } else { R.string.deleteMessages }
text(resources.getString(R.string.deleteMessageDescriptionEveryone)) title(resources.getString(titleTxtId))
button(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() } text(resources.getString(R.string.deleteMessageDescriptionDevice))
dangerButton(R.string.delete) { messages.forEach(viewModel::deleteLocally); endActionMode() }
cancelButton(::endActionMode) cancelButton(::endActionMode)
} }
} }