Delayed Tracking Update related fix (#8642)

* Delayed Tracking Update related fix

* Lint

(cherry picked from commit ba91b483a03ab24907574c392cf008395ca4e628)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/data/track/TrackRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/track/interactor/GetTracks.kt
#	app/src/main/java/eu/kanade/domain/track/repository/TrackRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/sqldelight/data/manga_sync.sq

app/build.gradle.kts

@@ -30,7 +30,7 @@ android {
         applicationId = "eu.kanade.tachiyomi.sy"
         minSdk = AndroidConfig.minSdk
         targetSdk = AndroidConfig.targetSdk
-        versionCode = 43
+        versionCode = 44
         versionName = "1.8.5"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")

app/src/main/java/eu/kanade/data/track/TrackRepositoryImpl.kt

@@ -9,6 +9,10 @@ class TrackRepositoryImpl(
     private val handler: DatabaseHandler,
 ) : TrackRepository {
 
+    override suspend fun getTrackById(id: Long): Track? {
+        return handler.awaitOneOrNull { manga_syncQueries.getTrackById(id, trackMapper) }
+    }
+
     // SY -->
     override suspend fun getTracks(): List<Track> {
         return handler.awaitList {

app/src/main/java/eu/kanade/domain/track/interactor/GetTracks.kt

@@ -10,6 +10,15 @@ class GetTracks(
     private val trackRepository: TrackRepository,
 ) {
 
+    suspend fun awaitOne(id: Long): Track? {
+        return try {
+            trackRepository.getTrackById(id)
+        } catch (e: Exception) {
+            logcat(LogPriority.ERROR, e)
+            null
+        }
+    }
+
     // SY -->
     suspend fun await(): List<Track> {
         return try {

app/src/main/java/eu/kanade/domain/track/repository/TrackRepository.kt

@@ -5,6 +5,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface TrackRepository {
 
+    suspend fun getTrackById(id: Long): Track?
+
     // SY -->
     suspend fun getTracks(): List<Track>
 

app/src/main/java/eu/kanade/domain/track/service/DelayedTrackingUpdateJob.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.data.track.job
+package eu.kanade.domain.track.service
 
 import android.content.Context
 import androidx.work.BackoffPolicy
@@ -9,10 +9,10 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.domain.track.interactor.GetTracks
 import eu.kanade.domain.track.interactor.InsertTrack
 import eu.kanade.domain.track.model.toDbTrack
+import eu.kanade.domain.track.store.DelayedTrackingStore
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.system.logcat
@@ -25,7 +25,6 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
     CoroutineWorker(context, workerParams) {
 
     override suspend fun doWork(): Result {
-        val getManga = Injekt.get<GetManga>()
         val getTracks = Injekt.get<GetTracks>()
         val insertTrack = Injekt.get<InsertTrack>()
 
@@ -34,10 +33,11 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
 
         withIOContext {
             val tracks = delayedTrackingStore.getItems().mapNotNull {
-                val manga = getManga.await(it.mangaId) ?: return@withIOContext
+                val track = getTracks.awaitOne(it.trackId)
-                getTracks.await(manga.id)
+                if (track == null) {
-                    .find { track -> track.id == it.trackId }
+                    delayedTrackingStore.remove(it.trackId)
-                    ?.copy(lastChapterRead = it.lastChapterRead.toDouble())
+                }
+                track
             }
 
             tracks.forEach { track ->
@@ -47,7 +47,7 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
                         service.update(track.toDbTrack(), true)
                         insertTrack.await(track)
                     }
-                    delayedTrackingStore.remove(track)
+                    delayedTrackingStore.remove(track.id)
                 } catch (e: Exception) {
                     logcat(LogPriority.ERROR, e)
                 }

app/src/main/java/eu/kanade/domain/track/store/DelayedTrackingStore.kt

@@ -0,0 +1,46 @@
+package eu.kanade.domain.track.store
+
+import android.content.Context
+import androidx.core.content.edit
+import eu.kanade.domain.track.model.Track
+import eu.kanade.tachiyomi.util.system.logcat
+import logcat.LogPriority
+
+class DelayedTrackingStore(context: Context) {
+
+    /**
+     * Preference file where queued tracking updates are stored.
+     */
+    private val preferences = context.getSharedPreferences("tracking_queue", Context.MODE_PRIVATE)
+
+    fun addItem(track: Track) {
+        val trackId = track.id.toString()
+        val lastChapterRead = preferences.getFloat(trackId, 0f)
+        if (track.lastChapterRead > lastChapterRead) {
+            logcat(LogPriority.DEBUG) { "Queuing track item: $trackId, last chapter read: ${track.lastChapterRead}" }
+            preferences.edit {
+                putFloat(trackId, track.lastChapterRead.toFloat())
+            }
+        }
+    }
+
+    fun remove(trackId: Long) {
+        preferences.edit {
+            remove(trackId.toString())
+        }
+    }
+
+    fun getItems(): List<DelayedTrackingItem> {
+        return preferences.all.mapNotNull {
+            DelayedTrackingItem(
+                trackId = it.key.toLong(),
+                lastChapterRead = it.value.toString().toFloat(),
+            )
+        }
+    }
+
+    data class DelayedTrackingItem(
+        val trackId: Long,
+        val lastChapterRead: Float,
+    )
+}

app/src/main/java/eu/kanade/tachiyomi/AppModule.kt

@@ -24,6 +24,7 @@ import eu.kanade.domain.download.service.DownloadPreferences
 import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.domain.track.service.TrackPreferences
+import eu.kanade.domain.track.store.DelayedTrackingStore
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.tachiyomi.core.preference.AndroidPreferenceStore
 import eu.kanade.tachiyomi.core.preference.PreferenceStore
@@ -39,7 +40,6 @@ import eu.kanade.tachiyomi.data.download.DownloadProvider
 import eu.kanade.tachiyomi.data.library.CustomMangaManager
 import eu.kanade.tachiyomi.data.saver.ImageSaver
 import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.data.track.job.DelayedTrackingStore
 import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.JavaScriptEngine
 import eu.kanade.tachiyomi.network.NetworkHelper

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -38,7 +38,6 @@ object Migrations {
     /**
      * Performs a migration when the application is updated.
      *
-     * @param preferences Preferences of the application.
      * @return true if a migration is performed, false otherwise.
      */
     fun upgrade(
@@ -342,6 +341,16 @@ object Migrations {
                     }
                 }
             }
+            if (oldVersion < 92) {
+                val trackingQueuePref = context.getSharedPreferences("tracking_queue", Context.MODE_PRIVATE)
+                trackingQueuePref.all.forEach {
+                    val (_, lastChapterRead) = it.value.toString().split(":")
+                    trackingQueuePref.edit {
+                        remove(it.key)
+                        putFloat(it.key, lastChapterRead.toFloat())
+                    }
+                }
+            }
             return true
         }
 

app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingStore.kt

@@ -1,52 +0,0 @@
-package eu.kanade.tachiyomi.data.track.job
-
-import android.content.Context
-import androidx.core.content.edit
-import eu.kanade.domain.track.model.Track
-import eu.kanade.tachiyomi.util.system.logcat
-import logcat.LogPriority
-
-class DelayedTrackingStore(context: Context) {
-
-    /**
-     * Preference file where queued tracking updates are stored.
-     */
-    private val preferences = context.getSharedPreferences("tracking_queue", Context.MODE_PRIVATE)
-
-    fun addItem(track: Track) {
-        val trackId = track.id.toString()
-        val (_, lastChapterRead) = preferences.getString(trackId, "0:0.0")!!.split(":")
-        if (track.lastChapterRead > lastChapterRead.toFloat()) {
-            val value = "${track.mangaId}:${track.lastChapterRead}"
-            logcat(LogPriority.DEBUG) { "Queuing track item: $trackId, $value" }
-            preferences.edit {
-                putString(trackId, value)
-            }
-        }
-    }
-
-    fun remove(track: Track) {
-        preferences.edit {
-            remove(track.id.toString())
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    fun getItems(): List<DelayedTrackingItem> {
-        return (preferences.all as Map<String, String>).entries
-            .map {
-                val (mangaId, lastChapterRead) = it.value.split(":")
-                DelayedTrackingItem(
-                    trackId = it.key.toLong(),
-                    mangaId = mangaId.toLong(),
-                    lastChapterRead = lastChapterRead.toFloat(),
-                )
-            }
-    }
-
-    data class DelayedTrackingItem(
-        val trackId: Long,
-        val mangaId: Long,
-        val lastChapterRead: Float,
-    )
-}

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt

@@ -26,7 +26,9 @@ import eu.kanade.domain.manga.model.toDbManga
 import eu.kanade.domain.track.interactor.GetTracks
 import eu.kanade.domain.track.interactor.InsertTrack
 import eu.kanade.domain.track.model.toDbTrack
+import eu.kanade.domain.track.service.DelayedTrackingUpdateJob
 import eu.kanade.domain.track.service.TrackPreferences
+import eu.kanade.domain.track.store.DelayedTrackingStore
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.toDomainChapter
@@ -38,8 +40,6 @@ import eu.kanade.tachiyomi.data.saver.Image
 import eu.kanade.tachiyomi.data.saver.ImageSaver
 import eu.kanade.tachiyomi.data.saver.Location
 import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.data.track.job.DelayedTrackingStore
-import eu.kanade.tachiyomi.data.track.job.DelayedTrackingUpdateJob
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource

app/src/main/java/exh/EXHMigrations.kt

@@ -89,7 +89,6 @@ object EXHMigrations {
     /**
      * Performs a migration when the application is updated.
      *
-     * @param preferences Preferences of the application.
      * @return true if a migration is performed, false otherwise.
      */
     fun upgrade(
@@ -501,6 +500,16 @@ object EXHMigrations {
                         libraryPreferences.showContinueReadingButton().set(true)
                     }
                 }
+                if (oldVersion under 44) {
+                    val trackingQueuePref = context.getSharedPreferences("tracking_queue", Context.MODE_PRIVATE)
+                    trackingQueuePref.all.forEach {
+                        val (_, lastChapterRead) = it.value.toString().split(":")
+                        trackingQueuePref.edit {
+                            remove(it.key)
+                            putFloat(it.key, lastChapterRead.toFloat())
+                        }
+                    }
+                }
 
                 // if (oldVersion under 1) { } (1 is current release version)
                 // do stuff here when releasing changed crap

app/src/main/sqldelight/data/manga_sync.sq

@@ -25,6 +25,11 @@ getTracks:
 SELECT *
 FROM manga_sync;
 
+getTrackById:
+SELECT *
+FROM manga_sync
+WHERE _id = :id;
+
 getTracksByMangaIds:
 SELECT * FROM manga_sync WHERE manga_id IN :mangaIds;