From 3d856ca357f92e808f75097e81ef04ffa145b5aa Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 20 Mar 2023 19:04:35 -0400
Subject: [PATCH] Minor cleanup

---
 .../java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt  | 6 +++---
 app/src/main/java/exh/EXHMigrations.kt                      | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
index 4a0df005c..4ade99c80 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt
@@ -227,9 +227,9 @@ class BackupRestorer(
         backupManager.restoreHistory(history)
         backupManager.restoreTracking(manga, tracks)
         // SY -->
-        backupManager.restoreMergedMangaReferencesForManga(manga.id!!, mergedMangaReferences)
-        flatMetadata?.let { backupManager.restoreFlatMetadata(manga.id!!, it) }
-        backupManager.restoreEditedInfo(customManga?.copy(id = manga.id!!))
+        backupManager.restoreMergedMangaReferencesForManga(manga.id, mergedMangaReferences)
+        flatMetadata?.let { backupManager.restoreFlatMetadata(manga.id, it) }
+        backupManager.restoreEditedInfo(customManga?.copy(id = manga.id))
         // SY <--
     }
 
diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt
index a72bfc447..70480e38a 100644
--- a/app/src/main/java/exh/EXHMigrations.kt
+++ b/app/src/main/java/exh/EXHMigrations.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
 package exh
 
 import android.content.Context
@@ -66,8 +64,6 @@ import tachiyomi.domain.source.interactor.InsertSavedSearch
 import tachiyomi.domain.source.model.FeedSavedSearch
 import tachiyomi.domain.source.model.SavedSearch
 import tachiyomi.domain.source.service.SourceManager
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.net.URI
@@ -208,7 +204,6 @@ object EXHMigrations {
                 }
                 if (oldVersion under 12) {
                     // Force MAL log out due to login flow change
-                    val trackManager = Injekt.get<TrackManager>()
                     trackManager.myAnimeList.logout()
                 }
                 if (oldVersion under 14) {
@@ -508,7 +503,6 @@ object EXHMigrations {
                 }
                 if (oldVersion under 45) {
                     // Force MangaDex log out due to login flow change
-                    val trackManager = Injekt.get<TrackManager>()
                     trackManager.mdList.logout()
                 }
                 if (oldVersion under 48) {