Minor cleanups

Pulling out some of the smaller changes that aren't related to the manga controller changes in #7244

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt

@@ -16,12 +16,8 @@ object MigrationFlags {
     private const val TRACK = 0b0100
     private const val CUSTOM_COVER = 0b1000
 
-    private const val CHAPTERS2 = 0x1
-    private const val CATEGORIES2 = 0x2
-    private const val TRACK2 = 0x4
-
-	private val coverCache: CoverCache by injectLazy()
-	private val db: DatabaseHelper = Injekt.get()
+    private val coverCache: CoverCache by injectLazy()
+    private val db: DatabaseHelper = Injekt.get()
 
     val flags get() = arrayOf(CHAPTERS, CATEGORIES, TRACK, CUSTOM_COVER)
 
@@ -49,19 +45,19 @@ object MigrationFlags {
         return positions.fold(0) { accumulated, position -> accumulated or (1 shl position) }
     }
 
-	fun titles(manga: Manga?): Array<Int> {
-		val titles = arrayOf(R.string.chapters, R.string.categories).toMutableList()
-		if (manga != null) {
-			db.inTransaction {
-				if (db.getTracks(manga).executeAsBlocking().isNotEmpty()) {
-					titles.add(R.string.track)
-				}
+    fun titles(manga: Manga?): Array<Int> {
+        val titles = arrayOf(R.string.chapters, R.string.categories).toMutableList()
+        if (manga != null) {
+            db.inTransaction {
+                if (db.getTracks(manga.id).executeAsBlocking().isNotEmpty()) {
+                    titles.add(R.string.track)
+                }
 
-				if (manga.hasCustomCover(coverCache)) {
-					titles.add(R.string.custom_cover)
-				}
-			}
-		}
-			return titles.toTypedArray()
-	}
+                if (manga.hasCustomCover(coverCache)) {
+                    titles.add(R.string.custom_cover)
+                }
+            }
+        }
+        return titles.toTypedArray()
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt

@@ -150,7 +150,7 @@ class SearchPresenter(
 
             // Update track
             if (migrateTracks) {
-                val tracksToUpdate = db.getTracks(prevManga).executeAsBlocking().mapNotNull { track ->
+                val tracksToUpdate = db.getTracks(prevManga.id).executeAsBlocking().mapNotNull { track ->
                     track.id = null
                     track.manga_id = manga.id!!
 
@@ -183,7 +183,7 @@ class SearchPresenter(
 
             // Update custom cover
             if (migrateCustomCover) {
-                coverCache.setCustomCoverToCache(manga, coverCache.getCustomCoverFile(prevManga).inputStream())
+                coverCache.setCustomCoverToCache(manga, coverCache.getCustomCoverFile(prevManga.id).inputStream())
             }
 
             // SearchPresenter#networkToLocalManga may have updated the manga title,