From da68212255cb2eb15e115ae9aa66a03f826c9d8f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 6 May 2020 18:11:11 +0200
Subject: [PATCH] Crashes when private key missing

---
 CHANGES.md                                           |  2 +-
 .../features/settings/devices/DevicesViewModel.kt    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f0cf30af2d..295ec12608 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Fix | Verify Manually by Text crashes if private SSK not known (#1337)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
index cd5e53b7c3..d0369e7707 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt
@@ -30,7 +30,6 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.NoOpMatrixCallback
-import im.vector.matrix.android.api.extensions.tryThis
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod
@@ -48,6 +47,7 @@ import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.subjects.PublishSubject
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 data class DevicesViewState(
@@ -65,6 +65,7 @@ data class DeviceFullInfo(
         val deviceInfo: DeviceInfo,
         val cryptoDeviceInfo: CryptoDeviceInfo?
 )
+
 class DevicesViewModel @AssistedInject constructor(
         @Assisted initialState: DevicesViewState,
         private val session: Session
@@ -215,8 +216,13 @@ class DevicesViewModel @AssistedInject constructor(
     private fun handleVerifyManually(action: DevicesAction.MarkAsManuallyVerified) = withState { state ->
         viewModelScope.launch {
             if (state.hasAccountCrossSigning) {
-                awaitCallback<Unit> {
-                    tryThis { session.cryptoService().crossSigningService().trustDevice(action.cryptoDeviceInfo.deviceId, it) }
+                try {
+                    awaitCallback<Unit> {
+                        session.cryptoService().crossSigningService().trustDevice(action.cryptoDeviceInfo.deviceId, it)
+                    }
+                } catch (failure: Throwable) {
+                    Timber.e("Failed to manually cross sign device ${action.cryptoDeviceInfo.deviceId} : ${failure.localizedMessage}")
+                    _viewEvents.post(DevicesViewEvents.Failure(failure))
                 }
             } else {
                 // legacy