From 412aed6dcbd0f07cf46fb5973b5ce874ed0d7672 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 21 Feb 2020 09:55:20 +0100
Subject: [PATCH] Fix / Update title before return

---
 .../crypto/verification/VerificationBottomSheet.kt  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
index d4e6aeef04..48c7827e87 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt
@@ -126,12 +126,6 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun invalidate() = withState(viewModel) { state ->
 
-        if (state.selfVerificationMode && state.verifiedFromPrivateKeys) {
-            showFragment(VerificationConclusionFragment::class, Bundle().apply {
-                putParcelable(MvRx.KEY_ARG, VerificationConclusionFragment.Args(true, null, state.isMe))
-            })
-            return@withState
-        }
         state.otherUserMxItem?.let { matrixItem ->
             if (state.isMe) {
                 if (state.sasTransactionState == VerificationTxState.Verified
@@ -155,6 +149,13 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
                 }
             }
         }
+        
+        if (state.selfVerificationMode && state.verifiedFromPrivateKeys) {
+            showFragment(VerificationConclusionFragment::class, Bundle().apply {
+                putParcelable(MvRx.KEY_ARG, VerificationConclusionFragment.Args(true, null, state.isMe))
+            })
+            return@withState
+        }
 
         // Did the request result in a SAS transaction?
         if (state.sasTransactionState != null) {