Toast confirmation on 'delete locally'

pull/1518/head
ThomasSession 8 months ago
parent 58826d914e
commit f73e022cfd

@ -2083,7 +2083,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
//todo DELETION handle control messages deletion ( and make clickable ) //todo DELETION handle control messages deletion ( and make clickable )
//todo DELETION handle "marked as deleted" message deletion ( and make clickable ) //todo DELETION handle multi select scenarios
//todo DELETION check that the unread status works as expected when deleting a message //todo DELETION check that the unread status works as expected when deleting a message
@ -2093,9 +2093,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
//todo DELETION check notifications deleted //todo DELETION check notifications deleted
//todo DELETION add padding to bubble long press menu. It touches the bottom of the screen //todo DELETION handle errors: Toasts for errors, or deleting messages not fully sent yet
//todo DELETION check why I can't long press on certain messages at the bottom of some threads ( like with bruno )
@ -2130,12 +2128,19 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
// creating a reusable callback // creating a reusable callback
val deleteDeviceOnly = { val deleteDeviceOnly = {
// delete the message locally
viewModel.markAsDeletedLocally( viewModel.markAsDeletedLocally(
messages = messages, messages = messages,
displayedMessage = resources.getString(R.string.deleteMessageDeletedLocally) displayedMessage = resources.getString(R.string.deleteMessageDeletedLocally)
) )
endActionMode() endActionMode()
//todo DELETION show confirmation toast
// show confirmation toast
Toast.makeText(
this,
resources.getQuantityString(R.plurals.deleteMessageDeleted, messages.count(), messages.count()),
Toast.LENGTH_SHORT
).show()
} }
// There are three types of dialogs for deletion: // There are three types of dialogs for deletion:

@ -58,9 +58,11 @@ class DeleteMessageDialog(
cancelButton(onCancel) cancelButton(onCancel)
} }
private val deleteOptions: List<DeleteOption> = listOf( private val deleteOptions: List<DeleteOption> by lazy {
DeleteOption.DeleteDeviceOnly(requireContext()), DeleteOption.DeleteForEveryone(requireContext()) listOf(
) DeleteOption.DeleteDeviceOnly(requireContext()), DeleteOption.DeleteForEveryone(requireContext())
)
}
private sealed class DeleteOption( private sealed class DeleteOption(
open val label: String open val label: String

@ -56,9 +56,11 @@ class DeleteNoteToSelfDialog(
cancelButton(onCancel) cancelButton(onCancel)
} }
private val deleteOptions: List<DeleteOption> = listOf( private val deleteOptions: List<DeleteOption> by lazy {
DeleteOption.DeleteDeviceOnly(requireContext()), DeleteOption.DeleteOnAllMyDevices(requireContext()) listOf(
) DeleteOption.DeleteDeviceOnly(requireContext()), DeleteOption.DeleteOnAllMyDevices(requireContext())
)
}
private sealed class DeleteOption( private sealed class DeleteOption(
open val label: String open val label: String

@ -206,9 +206,6 @@ class DefaultConversationRepository @Inject constructor(
displayedMessage = displayedMessage displayedMessage = displayedMessage
) )
} }
//todo DELETION delete attachments and links
//todo DELETION delete notifications
} }
override fun deleteAllLocalMessagesInThreadFromSenderOfMessage(messageRecord: MessageRecord) { override fun deleteAllLocalMessagesInThreadFromSenderOfMessage(messageRecord: MessageRecord) {

Loading…
Cancel
Save