From 8afa6975916e389007b35528729e2957478b8c5d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 11:36:54 +0200
Subject: [PATCH] GlobalScope -> sessionScope

---
 .../im/vector/app/core/glide/VectorGlideModelLoader.kt    | 2 +-
 .../app/features/home/room/detail/RoomDetailFragment.kt   | 2 +-
 .../notifications/NotificationBroadcastReceiver.kt        | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index fb2f59d6b5..ab4ac00b1e 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -115,7 +115,7 @@ class VectorGlideDataFetcher(context: Context,
             callback.onLoadFailed(IllegalArgumentException("No File service"))
         }
         // Use the file vector service, will avoid flickering and redownload after upload
-        GlobalScope.launch {
+        activeSessionHolder.getSafeActiveSession()?.launch {
             val result = runCatching {
                 fileService.downloadFile(
                         fileName = data.filename,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 699906b2c4..5eaca48e68 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1749,7 +1749,7 @@ class RoomDetailFragment @Inject constructor(
             sharedActionViewModel.pendingAction = action
             return
         }
-        lifecycleScope.launch {
+        session.launch {
             val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
             if (!isAdded) return@launch
             result.fold(
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index f265a5bd5f..5368491d96 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,8 +23,6 @@ import androidx.core.app.RemoteInput
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
@@ -78,7 +76,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.join() }
                 }
             }
@@ -89,7 +87,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.leave() }
                 }
             }
@@ -100,7 +98,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getActiveSession().let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
                 }
             }