mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Cancel all on going to settings

Browse source
This commit is contained in:
Valere 2020-03-24 17:48:16 +01:00
parent bddd70afdb
commit 2c9a8865bf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
View file

@ -155,6 +155,11 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
}
fun confirmCancel() = withState { state ->
cancelAllPendingVerifications(state)
_viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
}
private fun cancelAllPendingVerifications(state: VerificationBottomSheetViewState) {
session.cryptoService()
.verificationService().getExistingVerificationRequest(state.otherUserMxItem?.id ?: "", state.transactionId)?.let {
session.cryptoService().verificationService().cancelVerificationRequest(it)
@ -163,7 +168,6 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
.verificationService()
.getExistingTransaction(state.otherUserMxItem?.id ?: "", state.transactionId ?: "")
?.cancel(CancelCode.User)
_viewEvents.post(VerificationBottomSheetViewEvents.Dismiss)
}
fun continueFromCancel() {
@ -185,10 +189,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
}
fun goToSettings() = withState { state ->
session.cryptoService()
.verificationService()
.getExistingTransaction(state.otherUserMxItem?.id ?: "", state.transactionId ?: "")
?.cancel(CancelCode.User)
cancelAllPendingVerifications(state)
_viewEvents.post(VerificationBottomSheetViewEvents.GoToSettings)
}