filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix / prevent cancel when in conclusion fragment

Browse Source
This commit is contained in:
Valere 2020-03-26 14:09:41 +01:00
parent 1de57bbf3b
commit acd90657c7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
View File

@ -142,17 +142,22 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
args: VerificationBottomSheet.VerificationArgs): VerificationBottomSheetViewModel args: VerificationBottomSheet.VerificationArgs): VerificationBottomSheetViewModel
} }
fun queryCancel() = withState { fun queryCancel() = withState { state ->
if (it.userThinkItsNotHim) { if (state.userThinkItsNotHim) {
setState { setState {
copy(userThinkItsNotHim = false) copy(userThinkItsNotHim = false)
} }
} else {
// if the verification is already done you can't cancel anymore
if (state.pendingRequest.invoke()?.cancelConclusion != null || state.sasTransactionState is VerificationTxState.TerminalTxState) {
// you cannot cancel anymore
} else { } else {
setState { setState {
copy(userWantsToCancel = true) copy(userWantsToCancel = true)
} }
} }
} }
}
fun confirmCancel() = withState { state -> fun confirmCancel() = withState { state ->
cancelAllPendingVerifications(state) cancelAllPendingVerifications(state)