From 94567a37fa3d1c743c466387bcb9c803f864a7c4 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Mon, 26 Aug 2024 14:47:32 +0700 Subject: [PATCH] refactor(tracker): Check if tracker is EnhancedTrackService from the function itself --- .../eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt | 5 +---- .../eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt | 8 ++------ .../eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt | 5 +++++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index 801f0f64ac..9115ecec58 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -36,7 +36,6 @@ import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.data.track.EnhancedTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.domain.manga.models.Manga import eu.kanade.tachiyomi.extension.ExtensionUpdateJob @@ -322,9 +321,7 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet val newTrack = service.refresh(track) db.insertTrack(newTrack).executeAsBlocking() - if (service is EnhancedTrackService) { - syncChaptersWithTrackServiceTwoWay(db, getChapter.awaitAll(manga.id!!, false), track, service) - } + syncChaptersWithTrackServiceTwoWay(db, getChapter.awaitAll(manga.id!!, false), track, service) } catch (e: Exception) { Logger.e(e) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index a0da5fe577..c6f658a91b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -1024,9 +1024,7 @@ class MangaDetailsPresenter( } if (trackItem != null) { db.insertTrack(trackItem).executeAsBlocking() - if (item.service is EnhancedTrackService) { - syncChaptersWithTrackServiceTwoWay(db, chapters, trackItem, item.service) - } + syncChaptersWithTrackServiceTwoWay(db, chapters, trackItem, item.service) trackItem } else { item.track @@ -1069,9 +1067,7 @@ class MangaDetailsPresenter( db.insertTrack(binding).executeAsBlocking() } - if (service is EnhancedTrackService) { - syncChaptersWithTrackServiceTwoWay(db, chapters, item, service) - } + syncChaptersWithTrackServiceTwoWay(db, chapters, item, service) } fetchTracks() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt index 1fa9e3ca97..0f62a3d881 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterTrackSync.kt @@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Track import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.track.DelayedTrackingUpdateJob +import eu.kanade.tachiyomi.data.track.EnhancedTrackService import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.util.system.e @@ -34,6 +35,10 @@ suspend fun syncChaptersWithTrackServiceTwoWay( service: TrackService, updateChapter: UpdateChapter = Injekt.get(), ) = withIOContext { + if (service !is EnhancedTrackService) { + return@withIOContext + } + val sortedChapters = chapters.sortedBy { it.chapter_number } sortedChapters .filter { chapter -> chapter.chapter_number <= remoteTrack.last_chapter_read && !chapter.read }