From a71efdf4b2e8bd50dd8aa4bc618c399e087c8d0d Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 17 Jan 2022 00:10:23 +0100 Subject: [PATCH] Adjust coroutine scope default dispatchers --- .../main/java/de/mm20/launcher2/accounts/AccountsRepository.kt | 2 +- .../src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt | 2 +- .../java/de/mm20/launcher2/favorites/FavoritesRepository.kt | 2 +- .../java/de/mm20/launcher2/hiddenitems/HiddenItemsRepository.kt | 2 +- icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt | 2 +- music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt | 2 +- .../de/mm20/launcher2/notifications/NotificationRepository.kt | 2 +- .../main/java/de/mm20/launcher2/search/WebsearchRepository.kt | 2 +- .../main/java/de/mm20/launcher2/weather/WeatherRepository.kt | 2 +- .../java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt b/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt index 4aa48d53..e5b3ba6a 100644 --- a/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt +++ b/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt @@ -28,7 +28,7 @@ interface AccountsRepository { internal class AccountsRepositoryImpl( private val context: Context ) : AccountsRepository { - private val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private val googleApiHelper = GoogleApiHelper.getInstance(context) private val msGraphApiHelper = MicrosoftGraphApiHelper.getInstance(context) diff --git a/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt b/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt index 9fc258cb..02511239 100644 --- a/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt +++ b/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt @@ -20,7 +20,7 @@ interface BadgeRepository { internal class BadgeRepositoryImpl(private val context: Context) : BadgeRepository, KoinComponent { private val dataStore: LauncherDataStore by inject() - private val scope = CoroutineScope(Dispatchers.Main + Job()) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private val badgeProviders = MutableStateFlow>(emptyList()) diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt b/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt index fc50aba3..d4eb9f7b 100644 --- a/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt +++ b/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt @@ -36,7 +36,7 @@ class FavoritesRepositoryImpl( private val database: AppDatabase ) : FavoritesRepository, KoinComponent { - private val scope = CoroutineScope(Dispatchers.Main + Job()) + private val scope = CoroutineScope(Job() + Dispatchers.Default) override fun getFavorites(): Flow> = channelFlow { diff --git a/hiddenitems/src/main/java/de/mm20/launcher2/hiddenitems/HiddenItemsRepository.kt b/hiddenitems/src/main/java/de/mm20/launcher2/hiddenitems/HiddenItemsRepository.kt index 3a86323b..967d1850 100644 --- a/hiddenitems/src/main/java/de/mm20/launcher2/hiddenitems/HiddenItemsRepository.kt +++ b/hiddenitems/src/main/java/de/mm20/launcher2/hiddenitems/HiddenItemsRepository.kt @@ -20,7 +20,7 @@ import kotlinx.coroutines.launch */ class HiddenItemsRepository(val context: Context, database: AppDatabase) { - val scope = CoroutineScope(Job() + Dispatchers.Main) + val scope = CoroutineScope(Job() + Dispatchers.Default) val hiddenItemsKeys = MutableStateFlow>(emptyList()) init { diff --git a/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt b/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt index 07a01874..f04269d1 100644 --- a/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt +++ b/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt @@ -24,7 +24,7 @@ class IconRepository( } } - private val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private val cache = LruCache(200) diff --git a/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt b/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt index 9ca6f775..a0995bd7 100644 --- a/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt +++ b/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt @@ -52,7 +52,7 @@ class MusicRepositoryImpl( private val notificationRepository: NotificationRepository ) : MusicRepository, KoinComponent { - private val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private val dataStore: LauncherDataStore by inject() override val playbackState = MutableStateFlow(PlaybackState.Stopped) diff --git a/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt b/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt index b576646c..63c2009d 100644 --- a/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt +++ b/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt @@ -32,7 +32,7 @@ interface NotificationRepository { } internal class NotificationRepositoryImpl() : NotificationRepository { - private val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Default) override val notifications: MutableStateFlow> = MutableStateFlow( emptyList() ) diff --git a/search/src/main/java/de/mm20/launcher2/search/WebsearchRepository.kt b/search/src/main/java/de/mm20/launcher2/search/WebsearchRepository.kt index 77888ae9..9697d8fc 100644 --- a/search/src/main/java/de/mm20/launcher2/search/WebsearchRepository.kt +++ b/search/src/main/java/de/mm20/launcher2/search/WebsearchRepository.kt @@ -23,7 +23,7 @@ class WebsearchRepositoryImpl( private val dataStore: LauncherDataStore by inject() - private val scope = CoroutineScope(Job() + Dispatchers.Main) + private val scope = CoroutineScope(Job() + Dispatchers.Default) override fun search(query: String): Flow> = channelFlow { if (query.isEmpty()) { diff --git a/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt b/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt index 227b7323..371bd28c 100644 --- a/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt +++ b/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt @@ -49,7 +49,7 @@ class WeatherRepositoryImpl( private val dataStore: LauncherDataStore, ) : WeatherRepository, KoinComponent { - private val scope = CoroutineScope(Dispatchers.Main + Job()) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private var provider: WeatherProvider diff --git a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt b/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt index aca822ae..e43cddab 100644 --- a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt +++ b/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt @@ -22,7 +22,7 @@ class WikipediaRepositoryImpl( private val context: Context ) : WikipediaRepository, KoinComponent { - private val scope = CoroutineScope(Dispatchers.Main + Job()) + private val scope = CoroutineScope(Job() + Dispatchers.Default) private val dataStore: LauncherDataStore by inject()