diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt index ffdd99f89f..509679325a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt @@ -133,7 +133,6 @@ internal class IncomingGossipingRequestManager @Inject constructor( * It must be called on CryptoThread */ fun processReceivedGossipingRequests() { - Timber.v("## GOSSIP processReceivedGossipingRequests()") val roomKeyRequestsToProcess = receivedGossipingRequests.toList() receivedGossipingRequests.clear() diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt index 515657eb13..ac6155e02c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt @@ -142,9 +142,15 @@ class VerificationBottomSheetViewModel @AssistedInject constructor( args: VerificationBottomSheet.VerificationArgs): VerificationBottomSheetViewModel } - fun queryCancel() { - setState { - copy(userWantsToCancel = true) + fun queryCancel() = withState { + if (it.userThinkItsNotHim) { + setState { + copy(userThinkItsNotHim = false) + } + } else { + setState { + copy(userWantsToCancel = true) + } } }