diff --git a/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt b/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt index affe09bb6..d83a2b38b 100644 --- a/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt +++ b/app/src/main/java/eu/kanade/domain/sync/SyncPreferences.kt @@ -73,7 +73,6 @@ class SyncPreferences( syncOnChapterOpen = preferenceStore.getBoolean("sync_on_chapter_open", false).get(), syncOnAppStart = preferenceStore.getBoolean("sync_on_app_start", false).get(), syncOnAppResume = preferenceStore.getBoolean("sync_on_app_resume", false).get(), - syncOnLibraryUpdate = preferenceStore.getBoolean("sync_on_library_update", false).get(), ) } @@ -86,7 +85,5 @@ class SyncPreferences( .set(syncTriggerOptions.syncOnAppStart) preferenceStore.getBoolean("sync_on_app_resume", false) .set(syncTriggerOptions.syncOnAppResume) - preferenceStore.getBoolean("sync_on_library_update", false) - .set(syncTriggerOptions.syncOnLibraryUpdate) } } 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 52dd8c3a0..c8adc5337 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 @@ -817,19 +817,11 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet KEY_GROUP_EXTRA to groupExtra, // SY <-- ) - val request = OneTimeWorkRequestBuilder() - .addTag(TAG) - .addTag(WORK_NAME_MANUAL) - .setInputData(inputData) - .build() - wm.enqueueUniqueWork(WORK_NAME_MANUAL, ExistingWorkPolicy.KEEP, request) val syncPreferences: SyncPreferences = Injekt.get() - // Only proceed with SyncDataJob if sync is enabled and the specific sync on library update flag is set - val syncTriggerOpt = syncPreferences.getSyncTriggerOptions() - if (syncPreferences.isSyncEnabled() && syncTriggerOpt.syncOnLibraryUpdate - ) { + // Always sync the data before library update if syncing is enabled. + if (syncPreferences.isSyncEnabled()) { // Check if SyncDataJob is already running if (wm.isRunning(SyncDataJob.TAG_MANUAL)) { // SyncDataJob is already running @@ -842,7 +834,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet .build() // Chain SyncDataJob to run before LibraryUpdateJob - val inputData = workDataOf(KEY_CATEGORY to category?.id) val libraryUpdateJob = OneTimeWorkRequestBuilder() .addTag(TAG) .addTag(WORK_NAME_MANUAL) @@ -853,7 +844,6 @@ class LibraryUpdateJob(private val context: Context, workerParams: WorkerParamet .then(libraryUpdateJob) .enqueue() } else { - val inputData = workDataOf(KEY_CATEGORY to category?.id) val request = OneTimeWorkRequestBuilder() .addTag(TAG) .addTag(WORK_NAME_MANUAL) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/models/SyncTriggerOptions.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/models/SyncTriggerOptions.kt index b5dfaf001..7d8a9bdb8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/models/SyncTriggerOptions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/models/SyncTriggerOptions.kt @@ -9,21 +9,18 @@ data class SyncTriggerOptions( val syncOnChapterOpen: Boolean = false, val syncOnAppStart: Boolean = false, val syncOnAppResume: Boolean = false, - val syncOnLibraryUpdate: Boolean = false, ) { fun asBooleanArray() = booleanArrayOf( syncOnChapterRead, syncOnChapterOpen, syncOnAppStart, syncOnAppResume, - syncOnLibraryUpdate, ) fun anyEnabled() = syncOnChapterRead || syncOnChapterOpen || syncOnAppStart || - syncOnAppResume || - syncOnLibraryUpdate + syncOnAppResume companion object { val mainOptions = persistentListOf( @@ -47,11 +44,6 @@ data class SyncTriggerOptions( getter = SyncTriggerOptions::syncOnAppResume, setter = { options, enabled -> options.copy(syncOnAppResume = enabled) }, ), - Entry( - label = MR.strings.sync_on_library_update, - getter = SyncTriggerOptions::syncOnLibraryUpdate, - setter = { options, enabled -> options.copy(syncOnLibraryUpdate = enabled) }, - ), ) fun fromBooleanArray(array: BooleanArray) = SyncTriggerOptions( @@ -59,7 +51,6 @@ data class SyncTriggerOptions( syncOnChapterOpen = array[1], syncOnAppStart = array[2], syncOnAppResume = array[3], - syncOnLibraryUpdate = array[4], ) } diff --git a/i18n/src/commonMain/resources/MR/base/strings.xml b/i18n/src/commonMain/resources/MR/base/strings.xml index 4d1b6a1ec..d7798ff45 100755 --- a/i18n/src/commonMain/resources/MR/base/strings.xml +++ b/i18n/src/commonMain/resources/MR/base/strings.xml @@ -591,7 +591,6 @@ Sync on Chapter Open Sync on App Start Sync on App Resume - Sync on Library Update Sync library