From 0957ff69c40c763531528beb9ef49ff182869c36 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 10 Feb 2021 16:39:26 +0100
Subject: [PATCH] fix post initial sync crash on 404

---
 CHANGES.md                                       |  1 +
 .../app/features/home/HomeActivityViewModel.kt   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 17605b4940..27550f8aeb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - VoIP : fix audio devices output
+ - Fix crash after initial sync on Dendrite
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index afaa290190..44e02fea0b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -32,20 +32,20 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
+import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
-import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
-import org.matrix.android.sdk.api.auth.UIABaseAuth
-import org.matrix.android.sdk.api.auth.UserPasswordAuth
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
@@ -211,8 +211,8 @@ class HomeActivityViewModel @AssistedInject constructor(
             } else {
                 // Try to initialize cross signing in background if possible
                 Timber.d("Initialize cross signing...")
-                awaitCallback<Unit> {
-                    try {
+                try {
+                    awaitCallback<Unit> {
                         session.cryptoService().crossSigningService().initializeCrossSigning(
                                 object : UserInteractiveAuthInterceptor {
                                     override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
@@ -235,9 +235,9 @@ class HomeActivityViewModel @AssistedInject constructor(
                                 callback = it
                         )
                         Timber.d("Initialize cross signing SUCCESS")
-                    } catch (failure: Throwable) {
-                        Timber.e(failure, "Failed to initialize cross signing")
                     }
+                } catch (failure: Throwable) {
+                    Timber.e(failure, "Failed to initialize cross signing")
                 }
             }
         }