diff --git a/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt b/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt index 8fa0b00a3..afdc32449 100644 --- a/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt +++ b/app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt @@ -34,7 +34,7 @@ class TrackChapter( service == null || !service.isLoggedIn || chapterNumber <= track.lastChapterRead /* SY --> */ || - (service is MdList && track.status == FollowStatus.UNFOLLOWED.int.toLong())/* SY <-- */ + (service is MdList && track.status == FollowStatus.UNFOLLOWED.long)/* SY <-- */ ) { return@mapNotNull null } 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 96c010cb5..fb7c13778 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -634,9 +634,9 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet var tracker = dbTracks.firstOrNull { it.trackerId == TrackerManager.MDLIST } ?: mdList.createInitialTracker(manga).toDomainTrack(idRequired = false) - if (tracker?.status == FollowStatus.UNFOLLOWED.int.toLong()) { + if (tracker?.status == FollowStatus.UNFOLLOWED.long) { tracker = tracker.copy( - status = FollowStatus.READING.int.toLong(), + status = FollowStatus.READING.long, ) val updatedTrack = mdList.update(tracker.toDbTrack()) insertTrack.await(updatedTrack.toDomainTrack(false)!!) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt index 9ac9958d5..62079375f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt @@ -26,7 +26,7 @@ enum class TrackStatus(val int: Int, val res: StringResource) { fun parseTrackerStatus(trackerManager: TrackerManager, tracker: Long, status: Long): TrackStatus? { return when (tracker) { trackerManager.mdList.id -> { - when (FollowStatus.fromInt(status)) { + when (FollowStatus.fromLong(status)) { FollowStatus.UNFOLLOWED -> null FollowStatus.READING -> READING FollowStatus.COMPLETED -> COMPLETED diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 25cd8932a..884d16dc4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -41,7 +41,7 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { } override fun getStatusList(): List { - return FollowStatus.entries.map { it.int } + return FollowStatus.entries.map { it.long } } override fun getStatus(status: Long): StringResource? = when (status) { @@ -64,13 +64,13 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { val mdex = mdex ?: throw MangaDexNotFoundException() val remoteTrack = mdex.fetchTrackingInfo(track.tracking_url) - val followStatus = FollowStatus.fromInt(track.status) + val followStatus = FollowStatus.fromLong(track.status) // this updates the follow status in the metadata // allow follow status to update - if (remoteTrack.status != followStatus.int) { + if (remoteTrack.status != followStatus.long) { if (mdex.updateFollowStatus(MdUtil.getMangaId(track.tracking_url), followStatus)) { - remoteTrack.status = followStatus.int + remoteTrack.status = followStatus.long } else { track.status = remoteTrack.status } @@ -103,19 +103,19 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { } } - override fun getCompletionStatus(): Long = FollowStatus.COMPLETED.int + override fun getCompletionStatus(): Long = FollowStatus.COMPLETED.long - override fun getReadingStatus(): Long = FollowStatus.READING.int + override fun getReadingStatus(): Long = FollowStatus.READING.long - override fun getRereadingStatus(): Long = FollowStatus.RE_READING.int + override fun getRereadingStatus(): Long = FollowStatus.RE_READING.long override suspend fun bind(track: Track, hasReadChapters: Boolean): Track = update( refresh(track).also { - if (it.status == FollowStatus.UNFOLLOWED.int) { + if (it.status == FollowStatus.UNFOLLOWED.long) { it.status = if (hasReadChapters) { - FollowStatus.READING.int + FollowStatus.READING.long } else { - FollowStatus.PLAN_TO_READ.int + FollowStatus.PLAN_TO_READ.long } } }, @@ -136,7 +136,7 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { fun createInitialTracker(dbManga: Manga, mdManga: Manga = dbManga): Track { return Track.create(id).apply { manga_id = dbManga.id - status = FollowStatus.UNFOLLOWED.int + status = FollowStatus.UNFOLLOWED.long tracking_url = MdUtil.baseUrl + mdManga.url title = mdManga.title } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index 7c790a381..1ed985433 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -1679,7 +1679,7 @@ class MangaScreenModel( val trackingCount: Int get() = trackItems.count { - it.track != null && ((it.tracker is MdList && it.track.status != FollowStatus.UNFOLLOWED.int.toLong()) || it.tracker !is MdList) + it.track != null && ((it.tracker is MdList && it.track.status != FollowStatus.UNFOLLOWED.long) || it.tracker !is MdList) } /** diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt index 605c9b100..05e08b266 100644 --- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt +++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt @@ -57,7 +57,7 @@ class FollowsHandler( it, lang, ) to MangaDexSearchMetadata().apply { - followStatus = FollowStatus.fromDex(statuses[it.id]).int.toInt() + followStatus = FollowStatus.fromDex(statuses[it.id]).long.toInt() } }.sortedWith(comparator) } @@ -155,7 +155,7 @@ class FollowsHandler( val (followStatus, rating) = followStatusDef.await() to ratingDef.await() Track.create(TrackerManager.MDLIST).apply { title = "" - status = followStatus.int + status = followStatus.long tracking_url = url score = rating?.rating?.toDouble() ?: 0.0 } diff --git a/app/src/main/java/exh/md/utils/FollowStatus.kt b/app/src/main/java/exh/md/utils/FollowStatus.kt index d417c28b6..ff3e4aa76 100644 --- a/app/src/main/java/exh/md/utils/FollowStatus.kt +++ b/app/src/main/java/exh/md/utils/FollowStatus.kt @@ -2,14 +2,14 @@ package exh.md.utils import java.util.Locale -enum class FollowStatus(val int: Long) { - UNFOLLOWED(0), - READING(1), - COMPLETED(2), - ON_HOLD(3), - PLAN_TO_READ(4), - DROPPED(5), - RE_READING(6), +enum class FollowStatus(val long: Long) { + UNFOLLOWED(0L), + READING(1L), + COMPLETED(2L), + ON_HOLD(3L), + PLAN_TO_READ(4L), + DROPPED(5L), + RE_READING(6L), ; fun toDex(): String = this.name.lowercase(Locale.US) @@ -18,6 +18,6 @@ enum class FollowStatus(val int: Long) { fun fromDex( value: String?, ): FollowStatus = entries.firstOrNull { it.name.lowercase(Locale.US) == value } ?: UNFOLLOWED - fun fromInt(value: Long): FollowStatus = entries.firstOrNull { it.int == value } ?: UNFOLLOWED + fun fromLong(value: Long): FollowStatus = entries.firstOrNull { it.long == value } ?: UNFOLLOWED } }