Fix login prompts despite being logged in to trackers in Manga screen
(cherry picked from commit cbcd8bd6682023f728568f2b44da26124618aed7) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
This commit is contained in:
parent
2d12c670db
commit
c5546e1095
@ -186,7 +186,7 @@ class MangaScreen(
|
|||||||
)
|
)
|
||||||
}.takeIf { isHttpSource },
|
}.takeIf { isHttpSource },
|
||||||
onTrackingClicked = {
|
onTrackingClicked = {
|
||||||
if (successState.loggedInTracker.isEmpty()) {
|
if (!successState.hasLoggedInTrackers) {
|
||||||
navigator.push(SettingsScreen(SettingsScreen.Destination.Tracking))
|
navigator.push(SettingsScreen(SettingsScreen.Destination.Tracking))
|
||||||
} else {
|
} else {
|
||||||
screenModel.showTrackDialog()
|
screenModel.showTrackDialog()
|
||||||
|
@ -34,7 +34,6 @@ import eu.kanade.tachiyomi.data.download.DownloadCache
|
|||||||
import eu.kanade.tachiyomi.data.download.DownloadManager
|
import eu.kanade.tachiyomi.data.download.DownloadManager
|
||||||
import eu.kanade.tachiyomi.data.download.model.Download
|
import eu.kanade.tachiyomi.data.download.model.Download
|
||||||
import eu.kanade.tachiyomi.data.track.EnhancedTracker
|
import eu.kanade.tachiyomi.data.track.EnhancedTracker
|
||||||
import eu.kanade.tachiyomi.data.track.Tracker
|
|
||||||
import eu.kanade.tachiyomi.data.track.TrackerManager
|
import eu.kanade.tachiyomi.data.track.TrackerManager
|
||||||
import eu.kanade.tachiyomi.data.track.mdlist.MdList
|
import eu.kanade.tachiyomi.data.track.mdlist.MdList
|
||||||
import eu.kanade.tachiyomi.network.HttpException
|
import eu.kanade.tachiyomi.network.HttpException
|
||||||
@ -128,6 +127,7 @@ import tachiyomi.domain.manga.repository.MangaRepository
|
|||||||
import tachiyomi.domain.source.service.SourceManager
|
import tachiyomi.domain.source.service.SourceManager
|
||||||
import tachiyomi.domain.track.interactor.GetTracks
|
import tachiyomi.domain.track.interactor.GetTracks
|
||||||
import tachiyomi.domain.track.interactor.InsertTrack
|
import tachiyomi.domain.track.interactor.InsertTrack
|
||||||
|
import tachiyomi.domain.track.model.Track
|
||||||
import tachiyomi.i18n.MR
|
import tachiyomi.i18n.MR
|
||||||
import tachiyomi.i18n.sy.SYMR
|
import tachiyomi.i18n.sy.SYMR
|
||||||
import tachiyomi.source.local.LocalSource
|
import tachiyomi.source.local.LocalSource
|
||||||
@ -361,16 +361,6 @@ class MangaScreenModel(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
screenModelScope.launchIO {
|
|
||||||
trackerManager.loggedInTrackersFlow()
|
|
||||||
.distinctUntilChanged()
|
|
||||||
.collectLatest { trackers ->
|
|
||||||
updateSuccessState {
|
|
||||||
it.copy(loggedInTracker = trackers)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
observeDownloads()
|
observeDownloads()
|
||||||
|
|
||||||
screenModelScope.launchIO {
|
screenModelScope.launchIO {
|
||||||
@ -1500,45 +1490,55 @@ class MangaScreenModel(
|
|||||||
|
|
||||||
screenModelScope.launchIO {
|
screenModelScope.launchIO {
|
||||||
combine(
|
combine(
|
||||||
getTracks.subscribe(manga.id).catch { logcat(LogPriority.ERROR, it) },
|
getTracks.subscribe(manga.id)
|
||||||
|
// SY -->
|
||||||
|
.map { trackItems ->
|
||||||
|
if (manga.source in mangaDexSourceIds || state.mergedData?.manga?.values.orEmpty().any {
|
||||||
|
it.source in mangaDexSourceIds
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
val mdTrack = trackItems.firstOrNull { it.trackerId == TrackerManager.MDLIST }
|
||||||
|
when {
|
||||||
|
trackerManager.mdList.isLoggedIn && mdTrack == null -> {
|
||||||
|
trackItems + createMdListTrack()
|
||||||
|
}
|
||||||
|
else -> trackItems
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
trackItems
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// SY <--
|
||||||
|
.catch { logcat(LogPriority.ERROR, it) },
|
||||||
trackerManager.loggedInTrackersFlow(),
|
trackerManager.loggedInTrackersFlow(),
|
||||||
) { mangaTracks, loggedInTrackers ->
|
) { mangaTracks, loggedInTrackers ->
|
||||||
loggedInTrackers
|
// Show only if the service supports this manga's source
|
||||||
// Map to TrackItem
|
val supportedTrackers = loggedInTrackers.filter { (it as? EnhancedTracker)?.accept(source!!) ?: true }
|
||||||
.map { service -> TrackItem(mangaTracks.find { it.trackerId == service.id }, service) }
|
val supportedTrackerIds = supportedTrackers.map { it.id }.toHashSet()
|
||||||
// Show only if the service supports this manga's source
|
val supportedTrackerTracks = mangaTracks.filter { it.trackerId in supportedTrackerIds }
|
||||||
.filter { (it.tracker as? EnhancedTracker)?.accept(source!!) ?: true }
|
|
||||||
}
|
|
||||||
// SY -->
|
// SY -->
|
||||||
.map { trackItems ->
|
val trackingCount = supportedTrackerTracks.count {
|
||||||
if (manga.source in mangaDexSourceIds || state.mergedData?.manga?.values.orEmpty().any {
|
(it.trackerId == TrackerManager.MDLIST && it.status != FollowStatus.UNFOLLOWED.long) ||
|
||||||
it.source in mangaDexSourceIds
|
it.trackerId != TrackerManager.MDLIST
|
||||||
}
|
|
||||||
) {
|
|
||||||
val mdTrack = trackItems.firstOrNull { it.tracker is MdList }
|
|
||||||
when {
|
|
||||||
mdTrack == null -> {
|
|
||||||
trackItems
|
|
||||||
}
|
|
||||||
mdTrack.track == null -> {
|
|
||||||
trackItems - mdTrack + createMdListTrack()
|
|
||||||
}
|
|
||||||
else -> trackItems
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
trackItems
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
trackingCount to supportedTrackers.isNotEmpty()
|
||||||
// SY <--
|
// SY <--
|
||||||
|
}
|
||||||
|
|
||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.collectLatest { trackItems ->
|
.collectLatest { (trackingCount, hasLoggedInTrackers) ->
|
||||||
updateSuccessState { it.copy(trackItems = trackItems) }
|
updateSuccessState {
|
||||||
|
it.copy(
|
||||||
|
trackingCount = trackingCount,
|
||||||
|
hasLoggedInTrackers = hasLoggedInTrackers,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SY -->
|
// SY -->
|
||||||
private suspend fun createMdListTrack(): TrackItem {
|
private suspend fun createMdListTrack(): Track {
|
||||||
val state = successState!!
|
val state = successState!!
|
||||||
val mdManga = state.manga.takeIf { it.source in mangaDexSourceIds }
|
val mdManga = state.manga.takeIf { it.source in mangaDexSourceIds }
|
||||||
?: state.mergedData?.manga?.values?.find { it.source in mangaDexSourceIds }
|
?: state.mergedData?.manga?.values?.find { it.source in mangaDexSourceIds }
|
||||||
@ -1546,7 +1546,7 @@ class MangaScreenModel(
|
|||||||
val track = trackerManager.mdList.createInitialTracker(state.manga, mdManga)
|
val track = trackerManager.mdList.createInitialTracker(state.manga, mdManga)
|
||||||
.toDomainTrack(false)!!
|
.toDomainTrack(false)!!
|
||||||
insertTrack.await(track)
|
insertTrack.await(track)
|
||||||
return TrackItem(getTracks.await(mangaId).first { it.trackerId == trackerManager.mdList.id }, trackerManager.mdList)
|
return getTracks.await(mangaId).first { it.trackerId == trackerManager.mdList.id }
|
||||||
}
|
}
|
||||||
// SY <--
|
// SY <--
|
||||||
|
|
||||||
@ -1643,11 +1643,11 @@ class MangaScreenModel(
|
|||||||
val chapters: List<ChapterList.Item>,
|
val chapters: List<ChapterList.Item>,
|
||||||
val availableScanlators: ImmutableSet<String>,
|
val availableScanlators: ImmutableSet<String>,
|
||||||
val excludedScanlators: ImmutableSet<String>,
|
val excludedScanlators: ImmutableSet<String>,
|
||||||
val trackItems: List<TrackItem> = emptyList(),
|
val trackingCount: Int = 0,
|
||||||
|
val hasLoggedInTrackers: Boolean = false,
|
||||||
val isRefreshingData: Boolean = false,
|
val isRefreshingData: Boolean = false,
|
||||||
val dialog: MangaScreenModel.Dialog? = null,
|
val dialog: MangaScreenModel.Dialog? = null,
|
||||||
val hasPromptedToAddBefore: Boolean = false,
|
val hasPromptedToAddBefore: Boolean = false,
|
||||||
val loggedInTracker: List<Tracker> = emptyList(),
|
|
||||||
// SY -->
|
// SY -->
|
||||||
val meta: RaisedSearchMetadata?,
|
val meta: RaisedSearchMetadata?,
|
||||||
val mergedData: MergedMangaData?,
|
val mergedData: MergedMangaData?,
|
||||||
@ -1700,11 +1700,6 @@ class MangaScreenModel(
|
|||||||
val filterActive: Boolean
|
val filterActive: Boolean
|
||||||
get() = scanlatorFilterActive || manga.chaptersFiltered()
|
get() = scanlatorFilterActive || manga.chaptersFiltered()
|
||||||
|
|
||||||
val trackingCount: Int
|
|
||||||
get() = trackItems.count {
|
|
||||||
it.track != null && ((it.tracker is MdList && it.track.status != FollowStatus.UNFOLLOWED.long) || it.tracker !is MdList)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies the view filters to the list of chapters obtained from the database.
|
* Applies the view filters to the list of chapters obtained from the database.
|
||||||
* @return an observable of the list of chapters filtered and sorted.
|
* @return an observable of the list of chapters filtered and sorted.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user