diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 1629d00b5..316a89b64 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -61,6 +61,7 @@ import exh.util.days import io.realm.Realm import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import logcat.LogPriority import logcat.LogcatLogger import org.conscrypt.Conscrypt import uy.kohesive.injekt.Injekt @@ -188,7 +189,6 @@ open class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory { } } - // EXH private fun setupExhLogging() { EHLogLevel.init(this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt index 579a66655..f866100bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.ui.browse.migration.advanced.process import android.view.MenuItem import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.data.database.DatabaseHelper +import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.History import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.MangaCategory @@ -108,17 +109,17 @@ class MigrationProcessAdapter( manga: Manga, replace: Boolean ) { - if (controller.config == null) return + controller.config ?: return val flags = preferences.migrateFlags().get() // Update chapters read if (MigrationFlags.hasChapters(flags)) { val prevMangaChapters = db.getChapters(prevManga).executeAsBlocking() val maxChapterRead = - prevMangaChapters.filter { it.read }.maxOfOrNull { it.chapter_number } + prevMangaChapters.filter(Chapter::read).maxOfOrNull(Chapter::chapter_number) val dbChapters = db.getChapters(manga).executeAsBlocking() val prevHistoryList = db.getHistoryByMangaId(prevManga.id!!).executeAsBlocking() val historyList = mutableListOf() - for (chapter in dbChapters) { + dbChapters.forEach { chapter -> if (chapter.isRecognizedNumber) { val prevChapter = prevMangaChapters.find { it.isRecognizedNumber && it.chapter_number == chapter.chapter_number }