From ad84a8c3e9bd56025ab59beb5c024a7b7d6e2b35 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Thu, 29 Sep 2022 19:20:07 +0600
Subject: [PATCH] Improve DelayedTrackerStore (#8109)

* Improve DelayedTrackerStore

* Review changes
---
 .../tachiyomi/data/track/job/DelayedTrackingStore.kt   |  4 ++--
 .../data/track/job/DelayedTrackingUpdateJob.kt         | 10 ++++------
 .../eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt   |  6 ++++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingStore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingStore.kt
index 862d11e8fe..ba3db4406e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingStore.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingStore.kt
@@ -25,9 +25,9 @@ class DelayedTrackingStore(context: Context) {
         }
     }
 
-    fun clear() {
+    fun remove(track: Track) {
         preferences.edit {
-            clear()
+            remove(track.id.toString())
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
index 508861e88d..929856599a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/job/DelayedTrackingUpdateJob.kt
@@ -14,9 +14,8 @@ import eu.kanade.domain.track.interactor.GetTracks
 import eu.kanade.domain.track.interactor.InsertTrack
 import eu.kanade.domain.track.model.toDbTrack
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.system.logcat
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import logcat.LogPriority
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -33,9 +32,9 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
         val trackManager = Injekt.get<TrackManager>()
         val delayedTrackingStore = Injekt.get<DelayedTrackingStore>()
 
-        withContext(Dispatchers.IO) {
+        withIOContext {
             val tracks = delayedTrackingStore.getItems().mapNotNull {
-                val manga = getManga.await(it.mangaId) ?: return@withContext
+                val manga = getManga.await(it.mangaId) ?: return@withIOContext
                 getTracks.await(manga.id)
                     .find { track -> track.id == it.trackId }
                     ?.copy(lastChapterRead = it.lastChapterRead.toDouble())
@@ -48,12 +47,11 @@ class DelayedTrackingUpdateJob(context: Context, workerParams: WorkerParameters)
                         service.update(track.toDbTrack(), true)
                         insertTrack.await(track)
                     }
+                    delayedTrackingStore.remove(track)
                 } catch (e: Exception) {
                     logcat(LogPriority.ERROR, e)
                 }
             }
-
-            delayedTrackingStore.clear()
         }
 
         return Result.success()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index 5b1bcfc738..aa71495163 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -843,12 +843,14 @@ class ReaderPresenter(
                         // for a while. The view can still be garbage collected.
                         async {
                             runCatching {
-                                if (context.isOnline()) {
+                                try {
+                                    if (!context.isOnline()) error("Couldn't update tracker as device is offline")
                                     service.update(updatedTrack.toDbTrack(), true)
                                     insertTrack.await(updatedTrack)
-                                } else {
+                                } catch (e: Exception) {
                                     delayedTrackingStore.addItem(updatedTrack)
                                     DelayedTrackingUpdateJob.setupTask(context)
+                                    throw e
                                 }
                             }
                         }