TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
ryanzhao 2021-08-13 15:49:05 +10:00
parent aad58043d3
commit cb59a1af2d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1155,7 +1155,10 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
} }
} }
} else { } else {
messageDataProvider.getServerHashForMessage(message.id)?.let { serverHash -> val serverHash = messageDataProvider.getServerHashForMessage(message.id)
if (serverHash == null) {
messageDataProvider.deleteMessage(message.id, !message.isMms)
} else {
SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash)) SnodeAPI.deleteMessage(thread.address.serialize(), listOf(serverHash))
.success { .success {
messageDataProvider.deleteMessage(message.id, !message.isMms) messageDataProvider.deleteMessage(message.id, !message.isMms)
@ -1192,14 +1195,19 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
this.deleteLocally(message) this.deleteLocally(message)
} }
bottomSheet.dismiss() bottomSheet.dismiss()
endActionMode()
} }
bottomSheet.onDeleteForEveryoneTapped = { bottomSheet.onDeleteForEveryoneTapped = {
for (message in messages) { for (message in messages) {
this.deleteForEveryone(message) this.deleteForEveryone(message)
} }
bottomSheet.dismiss() bottomSheet.dismiss()
endActionMode()
}
bottomSheet.onCancelTapped = {
bottomSheet.dismiss()
endActionMode()
} }
bottomSheet.onCancelTapped = { bottomSheet.dismiss() }
bottomSheet.show(supportFragmentManager, bottomSheet.tag) bottomSheet.show(supportFragmentManager, bottomSheet.tag)
} }
} }