diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt index e0335365c..0e08cef19 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt @@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.data.backup.restore.restorers.MangaRestorer import eu.kanade.tachiyomi.data.backup.restore.restorers.PreferenceRestorer import eu.kanade.tachiyomi.data.backup.restore.restorers.SavedSearchRestorer import eu.kanade.tachiyomi.util.system.createFileInCacheDir -import exh.source.MERGED_SOURCE_ID import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.ensureActive @@ -175,7 +174,6 @@ class BackupRestorer( backupCategories: List, ) = launch { mangaRestorer.sortByNew(backupMangas) - /* SY --> */.sortedBy { it.source == MERGED_SOURCE_ID } /* SY <-- */ .forEach { ensureActive() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt index d2cd3292b..d03f6e113 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt @@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.data.backup.models.BackupManga import eu.kanade.tachiyomi.data.backup.models.BackupMergedMangaReference import eu.kanade.tachiyomi.data.backup.models.BackupTracking import exh.EXHMigrations +import exh.source.MERGED_SOURCE_ID import tachiyomi.data.DatabaseHandler import tachiyomi.data.UpdateStrategyColumnAdapter import tachiyomi.data.manga.MangaMapper @@ -64,7 +65,10 @@ class MangaRestorer( return backupMangas .sortedWith( - compareBy { it.url in urlsBySource[it.source].orEmpty() } + // KMK --> + compareBy { it.source == MERGED_SOURCE_ID } + // KMK <-- + .then(compareBy { it.url in urlsBySource[it.source].orEmpty() }) .then(compareByDescending { it.lastModifiedAt }), ) }