From d2972c7c5afac9dd3f8909ad8f6e1a3bc66b7431 Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 6 Mar 2022 14:36:47 +0100 Subject: [PATCH] Recreate Backup worker with IS_AUTO_BACKUP_KEY flag (#6742) * Recreate Backup worker with IS_AUTO_BACKUP_KEY flag * Extra safety net to not delete backup folder (cherry picked from commit 86016de6cbca0c83e15a05ca822abe450374d26b) # Conflicts: # app/build.gradle.kts --- app/build.gradle.kts | 2 +- app/src/main/java/eu/kanade/tachiyomi/Migrations.kt | 3 +++ .../java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt | 2 +- app/src/main/java/exh/EXHMigrations.kt | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 74ff17b69..6b9bebf16 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,7 +25,7 @@ android { applicationId = "eu.kanade.tachiyomi.sy" minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk - versionCode = 29 + versionCode = 30 versionName = "1.8.1" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 79bda8407..9c3f19810 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -258,6 +258,9 @@ object Migrations { preferences.extensionInstaller().set(PreferenceValues.ExtensionInstaller.LEGACY) } } + if (oldVersion < 76) { + BackupCreatorJob.setupTask(context) + } return true } 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 6f27c8bdc..489bc0ded 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 @@ -32,7 +32,7 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet val uri = inputData.getString(LOCATION_URI_KEY)?.let { Uri.parse(it) } ?: preferences.backupsDirectory().get().toUri() val flags = inputData.getInt(BACKUP_FLAGS_KEY, BackupConst.BACKUP_ALL) - val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, false) + val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, true) context.notificationManager.notify(Notifications.ID_BACKUP_PROGRESS, notifier.showBackupProgress().build()) return try { diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index ff622734e..02d458742 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -392,6 +392,9 @@ object EXHMigrations { preferences.sourceDisplayMode().set(DisplayModeSetting.COMPACT_GRID) } } + if (oldVersion under 30) { + BackupCreatorJob.setupTask(context) + } // if (oldVersion under 1) { } (1 is current release version) // do stuff here when releasing changed crap