rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: more combining shit

Browse source
This commit is contained in:
rebelonion 2024-04-29 16:07:52 -05:00
parent a7589a0296
commit ed0e06d1af
3 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/ani/dantotsu/App.kt
View file

@ -28,7 +28,9 @@ import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import logcat.AndroidLogcatLogger import logcat.AndroidLogcatLogger
@ -57,6 +59,7 @@ class App : MultiDexApplication() {
val mFTActivityLifecycleCallbacks = FTActivityLifecycleCallbacks() val mFTActivityLifecycleCallbacks = FTActivityLifecycleCallbacks()
@OptIn(DelicateCoroutinesApi::class)
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
@ -98,43 +101,29 @@ class App : MultiDexApplication() {
LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE)) LogcatLogger.install(AndroidLogcatLogger(LogPriority.VERBOSE))
} }
animeExtensionManager = Injekt.get() GlobalScope.launch {
mangaExtensionManager = Injekt.get() animeExtensionManager = Injekt.get()
novelExtensionManager = Injekt.get() mangaExtensionManager = Injekt.get()
torrentAddonManager = Injekt.get() novelExtensionManager = Injekt.get()
downloadAddonManager = Injekt.get() torrentAddonManager = Injekt.get()
downloadAddonManager = Injekt.get()
val animeScope = CoroutineScope(Dispatchers.Default)
animeScope.launch {
animeExtensionManager.findAvailableExtensions() animeExtensionManager.findAvailableExtensions()
Logger.log("Anime Extensions: ${animeExtensionManager.installedExtensionsFlow.first()}") Logger.log("Anime Extensions: ${animeExtensionManager.installedExtensionsFlow.first()}")
AnimeSources.init(animeExtensionManager.installedExtensionsFlow) AnimeSources.init(animeExtensionManager.installedExtensionsFlow)
}
val mangaScope = CoroutineScope(Dispatchers.Default)
mangaScope.launch {
mangaExtensionManager.findAvailableExtensions() mangaExtensionManager.findAvailableExtensions()
Logger.log("Manga Extensions: ${mangaExtensionManager.installedExtensionsFlow.first()}") Logger.log("Manga Extensions: ${mangaExtensionManager.installedExtensionsFlow.first()}")
MangaSources.init(mangaExtensionManager.installedExtensionsFlow) MangaSources.init(mangaExtensionManager.installedExtensionsFlow)
}
val novelScope = CoroutineScope(Dispatchers.Default)
novelScope.launch {
novelExtensionManager.findAvailableExtensions() novelExtensionManager.findAvailableExtensions()
Logger.log("Novel Extensions: ${novelExtensionManager.installedExtensionsFlow.first()}") Logger.log("Novel Extensions: ${novelExtensionManager.installedExtensionsFlow.first()}")
NovelSources.init(novelExtensionManager.installedExtensionsFlow) NovelSources.init(novelExtensionManager.installedExtensionsFlow)
}
val addonScope = CoroutineScope(Dispatchers.Default)
addonScope.launch {
torrentAddonManager.init() torrentAddonManager.init()
downloadAddonManager.init() downloadAddonManager.init()
}
val commentsScope = CoroutineScope(Dispatchers.Default)
commentsScope.launch {
CommentsAPI.fetchAuthToken() CommentsAPI.fetchAuthToken()
}
val useAlarmManager = PrefManager.getVal<Boolean>(PrefName.UseAlarmManager) val useAlarmManager = PrefManager.getVal<Boolean>(PrefName.UseAlarmManager)
val scheduler = TaskScheduler.create(this, useAlarmManager) val scheduler = TaskScheduler.create(this@App, useAlarmManager)
scheduler.scheduleAllTasks(this) scheduler.scheduleAllTasks(this@App)
}
} }
private fun setupNotificationChannels() { private fun setupNotificationChannels() {

2
app/src/main/java/ani/dantotsu/addons/download/DownloadAddonManager.kt
View file

@ -24,7 +24,7 @@ class DownloadAddonManager(
override var name: String = "Download Addon" override var name: String = "Download Addon"
override var type = AddonType.DOWNLOAD override var type = AddonType.DOWNLOAD
private val _isInitialized = MutableLiveData<Boolean>().apply { value = false } private val _isInitialized = MutableLiveData<Boolean>().apply { postValue(false) }
val isInitialized: LiveData<Boolean> = _isInitialized val isInitialized: LiveData<Boolean> = _isInitialized
private var error: String? = null private var error: String? = null

2
app/src/main/java/ani/dantotsu/addons/torrent/TorrentAddonManager.kt
View file

@ -25,7 +25,7 @@ class TorrentAddonManager(
override var type: AddonType = AddonType.TORRENT override var type: AddonType = AddonType.TORRENT
var torrentHash: String? = null var torrentHash: String? = null
private val _isInitialized = MutableLiveData<Boolean>().apply { value = false } private val _isInitialized = MutableLiveData<Boolean>().apply { postValue(false) }
val isInitialized: LiveData<Boolean> = _isInitialized val isInitialized: LiveData<Boolean> = _isInitialized
private var error: String? = null private var error: String? = null