From 6d668ae086fa1fa1499e81ed6ae864645e25048e Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Wed, 2 Oct 2024 07:43:31 +0700
Subject: [PATCH] chore(backup/creator): Split error log

---
 CHANGELOG.md                                          |  4 ++--
 .../tachiyomi/data/backup/create/BackupCreator.kt     | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0fcd4de7c..0481197efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,5 +9,5 @@
 
 ## Other  ?? Technical stuff, what happened behind the scene
 -->
-## Fixes
-- Fixed more NPE crashes
+## Other
+- Separate backup error log when destination is null or not a file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
index 8746b1138d..5e2ea126e9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
@@ -18,9 +18,7 @@ import okio.gzip
 import okio.sink
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
 import yokai.domain.backup.BackupPreferences
-import yokai.domain.storage.StorageManager
 import yokai.i18n.MR
 import yokai.util.lang.getString
 import java.io.FileOutputStream
@@ -37,7 +35,6 @@ class BackupCreator(
     val parser = ProtoBuf
     private val db: DatabaseHelper = Injekt.get()
     private val backupPreferences: BackupPreferences = Injekt.get()
-    private val storageManager: StorageManager by injectLazy()
 
     @Suppress("RedundantSuspendModifier")
     private suspend fun getDatabaseManga(includeReadManga: Boolean) = db.inTransactionReturn {
@@ -60,7 +57,7 @@ class BackupCreator(
         try {
             file = if (isAutoBackup) {
                 // Get dir of file and create
-                val dir = storageManager.getAutomaticBackupsDirectory()
+                val dir = UniFile.fromUri(context, uri)
 
                 // Delete older backups
                 val numberOfBackups = backupPreferences.numberOfBackups().get()
@@ -74,10 +71,10 @@ class BackupCreator(
                 dir?.createFile(Backup.getBackupFilename())
             } else {
                 UniFile.fromUri(context, uri)
-            }
+            } ?: throw IllegalStateException("Unable to retrieve backup destination")
 
-            if (file == null || !file.isFile) {
-                throw IllegalStateException("Failed to get handle on file")
+            if (!file.isFile) {
+                throw IllegalStateException("Invalid backup destination")
             }
 
             val backupManga = mangaBackupCreator(getDatabaseManga(options.readManga), options)