From 9bfe4ed8296278956d4a0e7a983535fb74885866 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 4 May 2020 20:33:09 -0400
Subject: [PATCH] Remove unneeded backup stuff, now almost everything is from
 stable

---
 .../data/backup/BackupRestoreService.kt       | 35 +++++--------------
 app/src/main/java/exh/EXHMigrations.kt        |  7 ++--
 2 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
index 9da1e1d9a..b623191fe 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.system.isServiceRunning
-import exh.BackupEntry
 import exh.EXHMigrations
 import exh.eh.EHentaiThrottleManager
 import java.io.File
@@ -217,18 +216,9 @@ class BackupRestoreService : Service() {
         val mangasJson = json.get(MANGAS).asJsonArray
 
         val validManga = mangasJson.filter {
-            val tmanga = backupManager.parser.fromJson<MangaImpl>(it.asJsonObject.get(MANGA))
+            var manga = backupManager.parser.fromJson<MangaImpl>(it.asJsonObject.get(MANGA))
             // EXH -->
-            val migrated = EXHMigrations.migrateBackupEntry(
-                BackupEntry(
-                    tmanga,
-                    backupManager.parser.fromJson<List<ChapterImpl>>(JsonArray()),
-                    backupManager.parser.fromJson<List<String>>(JsonArray()),
-                    backupManager.parser.fromJson<List<DHistory>>(JsonArray()),
-                    backupManager.parser.fromJson<List<TrackImpl>>(JsonArray())
-                )
-            )
-            val (manga, _, _, _, _) = migrated
+            manga = EXHMigrations.migrateBackupEntry(manga)
             val sourced = backupManager.sourceManager.get(manga.source) != null
             if (!sourced) {
                 restoreAmount -= 1
@@ -269,20 +259,20 @@ class BackupRestoreService : Service() {
 
     private fun restoreManga(mangaJson: JsonObject) {
         db.inTransaction {
-            val tmanga = backupManager.parser.fromJson<MangaImpl>(mangaJson.get(MANGA))
-            val tchapters = backupManager.parser.fromJson<List<ChapterImpl>>(
+            var manga = backupManager.parser.fromJson<MangaImpl>(mangaJson.get(MANGA))
+            val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
                 mangaJson.get(CHAPTERS)
                     ?: JsonArray()
             )
-            val tcategories = backupManager.parser.fromJson<List<String>>(
+            val categories = backupManager.parser.fromJson<List<String>>(
                 mangaJson.get(CATEGORIES)
                     ?: JsonArray()
             )
-            val thistory = backupManager.parser.fromJson<List<DHistory>>(
+            val history = backupManager.parser.fromJson<List<DHistory>>(
                 mangaJson.get(HISTORY)
                     ?: JsonArray()
             )
-            val ttracks = backupManager.parser.fromJson<List<TrackImpl>>(
+            val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
                 mangaJson.get(TRACK)
                     ?: JsonArray()
             )
@@ -292,16 +282,7 @@ class BackupRestoreService : Service() {
             }
 
             // EXH -->
-            val migrated = EXHMigrations.migrateBackupEntry(
-                BackupEntry(
-                    tmanga,
-                    tchapters,
-                    tcategories,
-                    thistory,
-                    ttracks
-                )
-            )
-            val (manga, chapters, categories, history, tracks) = migrated
+            manga = EXHMigrations.migrateBackupEntry(manga)
             // <-- EXH
 
             try {
diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt
index ab5f1d25e..ad0f75ad0 100644
--- a/app/src/main/java/exh/EXHMigrations.kt
+++ b/app/src/main/java/exh/EXHMigrations.kt
@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.backup.models.DHistory
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -59,9 +60,7 @@ object EXHMigrations {
         return false
     }
 
-    fun migrateBackupEntry(backupEntry: BackupEntry): BackupEntry {
-        val (manga, chapters, categories, history, tracks) = backupEntry
-
+    fun migrateBackupEntry(manga: MangaImpl): MangaImpl {
         // Migrate HentaiCafe source IDs
         if (manga.source == 6908L) {
             manga.source = HENTAI_CAFE_SOURCE_ID
@@ -97,7 +96,7 @@ object EXHMigrations {
             manga.source = EH_SOURCE_ID
         }
 
-        return backupEntry
+        return manga
     }
 
     private fun backupDatabase(context: Context, oldMigrationVersion: Int) {