Minor improvements
(cherry picked from commit 2b890c20577100e64004e4983cbda2467ba695df)
This commit is contained in:
parent
24f7d133f7
commit
aba9faff57
2 changed files with 6 additions and 0 deletions
|
|
@ -22,6 +22,7 @@ import kotlinx.coroutines.channels.Channel
|
|||
import kotlinx.coroutines.flow.catch
|
||||
import kotlinx.coroutines.flow.collectLatest
|
||||
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
|
|
@ -81,6 +82,7 @@ open class FeedScreenModel(
|
|||
getFeedSavedSearchGlobal.subscribe()
|
||||
.distinctUntilChanged()
|
||||
.onEach {
|
||||
sourceManager.isInitialized.first { it }
|
||||
val items = getSourcesToGetFeed(it).map { (feed, savedSearch) ->
|
||||
createCatalogueSearchItem(
|
||||
feed = feed,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ import android.net.Uri
|
|||
import androidx.lifecycle.lifecycleScope
|
||||
import eu.kanade.tachiyomi.ui.setting.track.BaseOAuthLoginActivity
|
||||
import exh.md.utils.MdUtil
|
||||
import kotlinx.coroutines.flow.first
|
||||
import tachiyomi.core.common.util.lang.launchIO
|
||||
import tachiyomi.domain.source.service.SourceManager
|
||||
import uy.kohesive.injekt.Injekt
|
||||
import uy.kohesive.injekt.api.get
|
||||
|
||||
|
|
@ -14,11 +16,13 @@ class MangaDexLoginActivity : BaseOAuthLoginActivity() {
|
|||
val code = data?.getQueryParameter("code")
|
||||
if (code != null) {
|
||||
lifecycleScope.launchIO {
|
||||
Injekt.get<SourceManager>().isInitialized.first { it }
|
||||
MdUtil.getEnabledMangaDex(Injekt.get())?.login(code)
|
||||
returnToSettings()
|
||||
}
|
||||
} else {
|
||||
lifecycleScope.launchIO {
|
||||
Injekt.get<SourceManager>().isInitialized.first { it }
|
||||
MdUtil.getEnabledMangaDex(Injekt.get())?.logout()
|
||||
returnToSettings()
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue