filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix / handling of back

This commit is contained in:
Valere 2020-03-24 15:51:09 +01:00
parent 63d3bf93f2
commit 37ac45c90a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/IncomingGossipingRequestManager.kt
View File

@ -133,7 +133,6 @@ internal class IncomingGossipingRequestManager @Inject constructor(
* It must be called on CryptoThread * It must be called on CryptoThread
*/ */
fun processReceivedGossipingRequests() { fun processReceivedGossipingRequests() {
Timber.v("## GOSSIP processReceivedGossipingRequests()")
val roomKeyRequestsToProcess = receivedGossipingRequests.toList() val roomKeyRequestsToProcess = receivedGossipingRequests.toList()
receivedGossipingRequests.clear() receivedGossipingRequests.clear()

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

@ -142,9 +142,15 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
args: VerificationBottomSheet.VerificationArgs): VerificationBottomSheetViewModel args: VerificationBottomSheet.VerificationArgs): VerificationBottomSheetViewModel
} }
fun queryCancel() { fun queryCancel() = withState {
setState { if (it.userThinkItsNotHim) {
copy(userWantsToCancel = true) setState {
copy(userThinkItsNotHim = false)
}
} else {
setState {
copy(userWantsToCancel = true)
}
} }
} }