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

QrCode: WIP

This commit is contained in:
Benoit Marty 2020-01-28 11:48:36 +01:00
parent f46023e84c
commit 69ab5e43d5
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/CancelCode.kt
View File

@ -27,9 +27,9 @@ enum class CancelCode(val value: String, val humanReadable: String) {
UnexpectedMessage("m.unexpected_message", "the device received an unexpected message"), UnexpectedMessage("m.unexpected_message", "the device received an unexpected message"),
InvalidMessage("m.invalid_message", "an invalid message was received"), InvalidMessage("m.invalid_message", "an invalid message was received"),
MismatchedKeys("m.key_mismatch", "Key mismatch"), MismatchedKeys("m.key_mismatch", "Key mismatch"),
UserError("m.user_error", "User mismatch"), UserError("m.user_error", "User error"),
UserMismatchError("m.user_mismatch", "Key mismatch"), MismatchedUser("m.user_mismatch", "User mismatch"),
QrCodeInvalid("m.qr_code.invalid", "User mismatch") QrCodeInvalid("m.qr_code.invalid", "Invalid QR code")
} }
fun safeValueOf(code: String?): CancelCode { fun safeValueOf(code: String?): CancelCode {

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
View File

@ -74,7 +74,7 @@ internal class DefaultQrCodeVerificationTransaction(
} }
if (otherQrCodeData.userId != otherUserId) { if (otherQrCodeData.userId != otherUserId) {
cancel(CancelCode.UserMismatchError) cancel(CancelCode.MismatchedUser)
return return
} }

3
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
View File

@ -156,11 +156,12 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
it.qrTransactionState == VerificationTxState.Verified, it.qrTransactionState == VerificationTxState.Verified,
it.cancelCode?.value)) it.cancelCode?.value))
}) })
return@withState
} }
else -> Unit else -> Unit
} }
// At this point there is no transaction for this request // At this point there is no SAS transaction for this request
// Transaction has not yet started // Transaction has not yet started
if (it.pendingRequest.invoke()?.cancelConclusion != null) { if (it.pendingRequest.invoke()?.cancelConclusion != null) {

2
vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
View File

@ -43,6 +43,8 @@ class VerificationConclusionViewModel(initialState: VerificationConclusionViewSt
val args = viewModelContext.args<VerificationConclusionFragment.Args>() val args = viewModelContext.args<VerificationConclusionFragment.Args>()
return when (safeValueOf(args.cancelReason)) { return when (safeValueOf(args.cancelReason)) {
CancelCode.QrCodeInvalid,
CancelCode.MismatchedUser,
CancelCode.MismatchedSas, CancelCode.MismatchedSas,
CancelCode.MismatchedCommitment, CancelCode.MismatchedCommitment,
CancelCode.MismatchedKeys -> { CancelCode.MismatchedKeys -> {