From 03ce33e434b7f02c544f7c0294bacdfb19a75beb Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Fri, 17 Sep 2021 18:09:52 -0400
Subject: [PATCH] Remove global scope in AppModule

---
 .../main/java/eu/kanade/tachiyomi/AppModule.kt  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
index ddfe633fd7..3f1bdb9a8a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi
 
 import android.app.Application
+import androidx.core.content.ContextCompat
 import com.google.gson.Gson
 import eu.kanade.tachiyomi.data.cache.ChapterCache
 import eu.kanade.tachiyomi.data.cache.CoverCache
@@ -14,8 +15,6 @@ import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.util.chapter.ChapterFilter
 import eu.kanade.tachiyomi.util.manga.MangaShortcutManager
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import uy.kohesive.injekt.api.InjektModule
 import uy.kohesive.injekt.api.InjektRegistrar
@@ -58,16 +57,18 @@ class AppModule(val app: Application) : InjektModule {
 
         // Asynchronously init expensive components for a faster cold start
 
-        GlobalScope.launch { get<PreferencesHelper>() }
+        ContextCompat.getMainExecutor(app).execute {
+            get<PreferencesHelper>()
 
-        GlobalScope.launch { get<NetworkHelper>() }
+            get<NetworkHelper>()
 
-        GlobalScope.launch { get<SourceManager>() }
+            get<SourceManager>()
 
-        GlobalScope.launch { get<DatabaseHelper>() }
+            get<DatabaseHelper>()
 
-        GlobalScope.launch { get<DownloadManager>() }
+            get<DownloadManager>()
 
-        GlobalScope.launch { get<CustomMangaManager>() }
+            get<CustomMangaManager>()
+        }
     }
 }