From 9c5987b6822816d2385127d18167e683aead7101 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 4 Oct 2019 19:36:22 +0200 Subject: [PATCH] SAS: fix potential crash --- .../features/crypto/verification/SASVerificationActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt index 2c695cad6e..de10e8d3b2 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt @@ -97,8 +97,9 @@ class SASVerificationActivity : SimpleFragmentActivity() { } if (isIncoming) { - val incoming = viewModel.transaction as IncomingSasVerificationTransaction - when (incoming.uxState) { + val incoming = viewModel.transaction as? IncomingSasVerificationTransaction + when (incoming?.uxState) { + null, IncomingSasVerificationTransaction.UxState.UNKNOWN, IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT, IncomingSasVerificationTransaction.UxState.WAIT_FOR_KEY_AGREEMENT -> {