From 257b2ef593b363baa62db82c79d6d248b5ebb41a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 14 May 2021 14:36:36 +0200
Subject: [PATCH] Remove usage of GlobalScope

---
 .../java/im/vector/app/features/crypto/keys/KeysExporter.kt   | 4 ++--
 .../java/im/vector/app/features/crypto/keys/KeysImporter.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
index 282f7b1a71..c7e4c26385 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
@@ -18,8 +18,8 @@ package im.vector.app.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
@@ -33,7 +33,7 @@ class KeysExporter(private val session: Session) {
      * Export keys and return the file path with the callback
      */
     fun export(context: Context, password: String, uri: Uri, callback: MatrixCallback<Boolean>) {
-        GlobalScope.launch(Dispatchers.Main) {
+        session.coroutineScope.launch(Dispatchers.Main) {
             runCatching {
                 withContext(Dispatchers.IO) {
                     val data = awaitCallback<ByteArray> { session.cryptoService().exportRoomKeys(password, it) }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
index 8932bb9489..3d93b26edd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
@@ -20,8 +20,8 @@ import android.content.Context
 import android.net.Uri
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.resources.openResource
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
@@ -41,7 +41,7 @@ class KeysImporter(private val session: Session) {
                mimetype: String?,
                password: String,
                callback: MatrixCallback<ImportRoomKeysResult>) {
-        GlobalScope.launch(Dispatchers.Main) {
+        session.coroutineScope.launch(Dispatchers.Main) {
             runCatching {
                 withContext(Dispatchers.IO) {
                     val resource = openResource(context, uri, mimetype ?: getMimeTypeFromUri(context, uri))