From 7c0137e2dc8e42e0690b0ce2ae144d5b7f7faa60 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 9 Apr 2020 10:46:52 +0200
Subject: [PATCH] Fix / await callback suspend forever

---
 .../crypto/quads/SharedSecureStorageViewModel.kt   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
index 3eef4b20cf..9cd60eba43 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.riotx.features.crypto.quads
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
@@ -34,7 +35,6 @@ import im.vector.riotx.core.platform.VectorViewModel
 import im.vector.riotx.core.platform.WaitingViewData
 import im.vector.riotx.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -78,7 +78,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
 
     private fun handleSubmitPassphrase(action: SharedSecureStorageAction.SubmitPassphrase) {
         val decryptedSecretMap = HashMap<String, String>()
-        GlobalScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(Dispatchers.IO) {
             runCatching {
                 _viewEvents.post(SharedSecureStorageViewEvent.ShowModalLoading)
                 val passphrase = action.passphrase
@@ -117,18 +117,18 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
 
                 withContext(Dispatchers.IO) {
                     args.requestedSecrets.forEach {
-                        val res = awaitCallback<String> { callback ->
-                            if (session.getAccountDataEvent(it) != null) {
+                        if (session.getAccountDataEvent(it) != null) {
+                            val res = awaitCallback<String> { callback ->
                                 session.sharedSecretStorageService.getSecret(
                                         name = it,
                                         keyId = keyInfo.id,
                                         secretKey = keySpec,
                                         callback = callback)
-                            } else {
-                                Timber.w("## Cannot find secret $it in SSSS, skip")
                             }
+                            decryptedSecretMap[it] = res
+                        } else {
+                            Timber.w("## Cannot find secret $it in SSSS, skip")
                         }
-                        decryptedSecretMap[it] = res
                     }
                 }
             }.fold({