From d06984e3a345983919105776fdb5dc7d9eff7198 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 5 Mar 2022 09:49:21 -0500 Subject: [PATCH] Use same name for manual backup job tag and work name --- .../tachiyomi/data/backup/BackupCreatorJob.kt | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt index 6d6300df1a..6f27c8bdce 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt @@ -49,14 +49,8 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet } companion object { - private const val TAG = "BackupCreator" - - private const val IS_AUTO_BACKUP_KEY = "is_auto_backup" // Boolean - private const val LOCATION_URI_KEY = "location_uri" // String - private const val BACKUP_FLAGS_KEY = "backup_flags" // Int - fun isManualJobRunning(context: Context): Boolean { - val list = WorkManager.getInstance(context).getWorkInfosByTag(TAG).get() + val list = WorkManager.getInstance(context).getWorkInfosByTag(TAG_MANUAL).get() return list.find { it.state == WorkInfo.State.RUNNING } != null } @@ -71,13 +65,13 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet 10, TimeUnit.MINUTES ) - .addTag(TAG) + .addTag(TAG_AUTO) .setInputData(workDataOf(IS_AUTO_BACKUP_KEY to true)) .build() - workManager.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.REPLACE, request) + workManager.enqueueUniquePeriodicWork(TAG_AUTO, ExistingPeriodicWorkPolicy.REPLACE, request) } else { - workManager.cancelUniqueWork(TAG) + workManager.cancelUniqueWork(TAG_AUTO) } } @@ -88,10 +82,17 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet BACKUP_FLAGS_KEY to flags ) val request = OneTimeWorkRequestBuilder() - .addTag(TAG) + .addTag(TAG_MANUAL) .setInputData(inputData) .build() - WorkManager.getInstance(context).enqueueUniqueWork("$TAG:manual", ExistingWorkPolicy.KEEP, request) + WorkManager.getInstance(context).enqueueUniqueWork(TAG_MANUAL, ExistingWorkPolicy.KEEP, request) } } } + +private const val TAG_AUTO = "BackupCreator" +private const val TAG_MANUAL = "$TAG_AUTO:manual" + +private const val IS_AUTO_BACKUP_KEY = "is_auto_backup" // Boolean +private const val LOCATION_URI_KEY = "location_uri" // String +private const val BACKUP_FLAGS_KEY = "backup_flags" // Int