From 7e6811692e8c16a074271ffb1ca01a73daeb4404 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 1 Jun 2024 17:46:42 -0400
Subject: [PATCH] Fix WorkManager cancellation issues

---
 app/build.gradle.kts                                          | 2 +-
 .../main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt    | 2 +-
 app/src/main/java/exh/eh/EHentaiUpdateWorker.kt               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index abb813304..4ad0c86bd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi.sy"
 
-        versionCode = 67
+        versionCode = 68
         versionName = "1.10.5"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt
index dae3a4b06..3aeca8fad 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt
@@ -45,7 +45,7 @@ class SyncDataJob(private val context: Context, workerParams: WorkerParameters)
         } catch (e: Exception) {
             logcat(LogPriority.ERROR, e)
             notifier.showSyncError(e.message)
-            Result.failure()
+            Result.success() // try again next time
         } finally {
             context.cancelNotification(Notifications.ID_RESTORE_PROGRESS)
         }
diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
index 0d42e039a..e9a3908ca 100644
--- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
+++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt
@@ -61,14 +61,14 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara
     override suspend fun doWork(): Result {
         return try {
             if (requiresWifiConnection(preferences) && !context.isConnectedToWifi()) {
-                Result.failure()
+                Result.success() // retry again later
             } else {
                 startUpdating()
                 logger.d("Update job completed!")
                 Result.success()
             }
         } catch (e: Exception) {
-            Result.failure()
+            Result.success() // retry again later
         }
     }