From 19507d1837135cbf97d06bebda2760a0be7c317a Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 25 Apr 2020 14:55:55 -0400 Subject: [PATCH] Return success/failure result for backup job --- .../eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt | 7 +++++-- .../java/eu/kanade/tachiyomi/data/backup/BackupManager.kt | 4 +++- 2 files changed, 8 insertions(+), 3 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 8152be31fa..d30182b250 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 @@ -20,8 +20,11 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet val backupManager = BackupManager(context) val uri = Uri.parse(preferences.backupsDirectory().get()) val flags = BackupCreateService.BACKUP_ALL - backupManager.createBackup(uri, flags, true) - return Result.success() + return if (backupManager.createBackup(uri, flags, true)) { + Result.success() + } else { + Result.failure() + } } companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt index c0f99d13bb..142f6faa3e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt @@ -102,7 +102,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) { * @param uri path of Uri * @param isJob backup called from job */ - fun createBackup(uri: Uri, flags: Int, isJob: Boolean) { + fun createBackup(uri: Uri, flags: Int, isJob: Boolean): Boolean { // Create root object val root = JsonObject() @@ -169,6 +169,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) { } context.sendLocalBroadcast(intent) } + return true } catch (e: Exception) { Timber.e(e) if (!isJob) { @@ -179,6 +180,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) { } context.sendLocalBroadcast(intent) } + return false } }