Translated using Weblate (Russian)

Currently translated at 99.7% (722 of 724 strings)

Co-authored-by: Koitharu <nvasya95@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ru/
Translation: Kotatsu/Strings

.idea/gradle.xml

@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">

README.md

@@ -53,5 +53,5 @@ install instructions.
 
 ### DMCA disclaimer
 
-The developers of this application does not have any affiliation with the content available in the app.
-It is collecting from the sources freely available through any web browser.
+The developers of this application do not have any affiliation with the content available in the app.
+It collects content from sources that are freely available through any web browser

app/build.gradle

@@ -8,16 +8,16 @@ plugins {
 }
 
 android {
-	compileSdk = 34
-	buildToolsVersion = '34.0.0'
+	compileSdk = 35
+	buildToolsVersion = '35.0.0'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 35
-		versionCode = 660
-		versionName = '7.4.3'
+		versionCode = 673
+		versionName = '7.6'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -48,14 +48,15 @@ android {
 	}
 	compileOptions {
 		coreLibraryDesugaringEnabled true
-		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_11
+		targetCompatibility JavaVersion.VERSION_11
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_1_8.toString()
+		jvmTarget = JavaVersion.VERSION_11.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
+			'-opt-in=kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil.annotation.ExperimentalCoilApi',
@@ -82,23 +83,23 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:98cbee11b9') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:3cdd391410') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.10'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0-RC.2'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.20'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
 
 	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
-	implementation 'androidx.activity:activity-ktx:1.9.1'
-	implementation 'androidx.fragment:fragment-ktx:1.8.2'
+	implementation 'androidx.activity:activity-ktx:1.9.2'
+	implementation 'androidx.fragment:fragment-ktx:1.8.3'
 	implementation 'androidx.transition:transition-ktx:1.5.1'
-	implementation 'androidx.collection:collection-ktx:1.4.3'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.4'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.4'
+	implementation 'androidx.collection:collection-ktx:1.4.4'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
+	implementation 'androidx.lifecycle:lifecycle-service:2.8.6'
+	implementation 'androidx.lifecycle:lifecycle-process:2.8.6'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -106,12 +107,12 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.4'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.6'
 	implementation 'androidx.webkit:webkit:1.11.0'
 
 	implementation 'androidx.work:work-runtime:2.9.1'
 	//noinspection GradleDependency
-	implementation('com.google.guava:guava:32.0.1-android') {
+	implementation('com.google.guava:guava:33.2.1-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
 		exclude group: 'org.checkerframework', module: 'checker-qual'
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
@@ -124,46 +125,44 @@ dependencies {
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-tls:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
-	implementation 'com.squareup.okio:okio:3.9.0'
+	implementation 'com.squareup.okio:okio:3.9.1'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.51.1'
-	kapt 'com.google.dagger:hilt-compiler:2.51.1'
+	implementation 'com.google.dagger:hilt-android:2.52'
+	kapt 'com.google.dagger:hilt-compiler:2.52'
 	implementation 'androidx.hilt:hilt-work:1.2.0'
 	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
 	implementation 'io.coil-kt:coil-base:2.7.0'
 	implementation 'io.coil-kt:coil-svg:2.7.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:882bc0620c'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:4ec7176962'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.3'
-	implementation 'ch.acra:acra-dialog:5.11.3'
-	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
-	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
+	implementation 'ch.acra:acra-http:5.11.4'
+	implementation 'ch.acra:acra-dialog:5.11.4'
 
 	implementation 'org.conscrypt:conscrypt-android:2.5.2'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:3.0-alpha-8'
 	debugImplementation 'com.github.Koitharu:WorkInspector:5778dd1747'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.json:json:20240303'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0'
 
 	androidTestImplementation 'androidx.test:runner:1.6.1'
 	androidTestImplementation 'androidx.test:rules:1.6.1'
 	androidTestImplementation 'androidx.test:core-ktx:1.6.1'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0'
 
 	androidTestImplementation 'androidx.room:room-testing:2.6.1'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51.1'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51.1'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.52'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.52'
 }

app/proguard-rules.pro

@@ -14,6 +14,7 @@
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
+-dontwarn com.google.j2objc.annotations.**
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
@@ -21,3 +22,7 @@
 -keep class org.koitharu.kotatsu.settings.backup.PeriodicalBackupSettingsFragment { *; }
 -keep class org.jsoup.parser.Tag
 -keep class org.jsoup.internal.StringUtil
+
+-keep class org.acra.security.NoKeyStoreFactory { *; }
+-keep class org.acra.config.DefaultRetryPolicy { *; }
+-keep class org.acra.attachment.DefaultAttachmentProvider { *; }

app/src/androidTest/kotlin/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt

@@ -1,198 +0,0 @@
-package org.koitharu.kotatsu.tracker.domain
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import junit.framework.TestCase.*
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.core.parser.MangaDataRepository
-import org.koitharu.kotatsu.parsers.model.Manga
-import javax.inject.Inject
-
-@HiltAndroidTest
-@RunWith(AndroidJUnit4::class)
-class TrackerTest {
-
-	@get:Rule
-	var hiltRule = HiltAndroidRule(this)
-
-	@Inject
-	lateinit var repository: TrackingRepository
-
-	@Inject
-	lateinit var dataRepository: MangaDataRepository
-
-	@Inject
-	lateinit var tracker: Tracker
-
-	@Before
-	fun setUp() {
-		hiltRule.inject()
-	}
-
-	@Test
-	fun noUpdates() = runTest {
-		val manga = loadManga("full.json")
-		tracker.deleteTrack(manga.id)
-
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-		tracker.checkUpdates(manga, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(manga.id))
-	}
-
-	@Test
-	fun hasUpdates() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun badIds2() = runTest {
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaBad = loadManga("bad_ids.json")
-		val mangaFull = loadManga("full.json")
-		tracker.deleteTrack(mangaFirst.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaBad, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	@Test
-	fun fullReset() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		val mangaEmpty = loadManga("empty.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFull.id))
-		tracker.checkUpdates(mangaEmpty, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFull.id))
-	}
-
-	@Test
-	fun syncWithHistory() = runTest {
-		val mangaFull = loadManga("full.json")
-		val mangaFirst = loadManga("first_chapters.json")
-		tracker.deleteTrack(mangaFull.id)
-
-		tracker.checkUpdates(mangaFirst, commit = true).apply {
-			assertFalse(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assertEquals(3, newChapters.size)
-		}
-		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
-
-		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
-		tracker.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
-
-		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
-		tracker.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-
-		tracker.checkUpdates(mangaFull, commit = true).apply {
-			assertTrue(isValid)
-			assert(newChapters.isEmpty())
-		}
-		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
-	}
-
-	private suspend fun loadManga(name: String): Manga {
-		val manga = SampleData.loadAsset("manga/$name", Manga::class)
-		dataRepository.storeManga(manga)
-		return manga
-	}
-}

app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt

@@ -8,6 +8,7 @@ import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 
 class KotatsuApp : BaseApp() {
 
@@ -30,6 +31,7 @@ class KotatsuApp : BaseApp() {
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
 				.setClassInstanceLimit(PageLoader::class.java, 1)
+				.setClassInstanceLimit(ReaderViewModel::class.java, 1)
 				.penaltyLog()
 				.build(),
 		)

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt

@@ -14,18 +14,21 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
 
 private const val MAX_PARALLELISM = 4
-private const val MATCH_THRESHOLD = 0.2f
+private const val MATCH_THRESHOLD_DEFAULT = 0.2f
 
 class AlternativesUseCase @Inject constructor(
 	private val sourcesRepository: MangaSourcesRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
 
-	suspend operator fun invoke(manga: Manga): Flow<Manga> {
+	suspend operator fun invoke(manga: Manga): Flow<Manga> = invoke(manga, MATCH_THRESHOLD_DEFAULT)
+
+	suspend operator fun invoke(manga: Manga, matchThreshold: Float): Flow<Manga> {
 		val sources = getSources(manga.source)
 		if (sources.isEmpty()) {
 			return emptyFlow()
@@ -34,17 +37,17 @@ class AlternativesUseCase @Inject constructor(
 		return channelFlow {
 			for (source in sources) {
 				val repository = mangaRepositoryFactory.create(source)
-				if (!repository.isSearchSupported) {
+				if (!repository.filterCapabilities.isSearchSupported) {
 					continue
 				}
 				launch {
 					val list = runCatchingCancellable {
 						semaphore.withPermit {
-							repository.getList(offset = 0, filter = MangaListFilter.Search(manga.title))
+							repository.getList(offset = 0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
 						}
 					}.getOrDefault(emptyList())
 					for (item in list) {
-						if (item.matches(manga)) {
+						if (item.matches(manga, matchThreshold)) {
 							send(item)
 						}
 					}
@@ -65,16 +68,16 @@ class AlternativesUseCase @Inject constructor(
 		return result
 	}
 
-	private fun Manga.matches(ref: Manga): Boolean {
-		return matchesTitles(title, ref.title) ||
-			matchesTitles(title, ref.altTitle) ||
-			matchesTitles(altTitle, ref.title) ||
-			matchesTitles(altTitle, ref.altTitle)
+	private fun Manga.matches(ref: Manga, threshold: Float): Boolean {
+		return matchesTitles(title, ref.title, threshold) ||
+			matchesTitles(title, ref.altTitle, threshold) ||
+			matchesTitles(altTitle, ref.title, threshold) ||
+			matchesTitles(altTitle, ref.altTitle, threshold)
 
 	}
 
-	private fun matchesTitles(a: String?, b: String?): Boolean {
-		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
+	private fun matchesTitles(a: String?, b: String?, threshold: Float): Boolean {
+		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, threshold)
 	}
 
 	private fun MangaSource.priority(ref: MangaSource): Int {

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt

@@ -0,0 +1,93 @@
+package org.koitharu.kotatsu.alternatives.domain
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.lastOrNull
+import kotlinx.coroutines.flow.runningFold
+import kotlinx.coroutines.flow.transformWhile
+import kotlinx.coroutines.flow.withIndex
+import kotlinx.coroutines.launch
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
+
+class AutoFixUseCase @Inject constructor(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val alternativesUseCase: AlternativesUseCase,
+	private val migrateUseCase: MigrateUseCase,
+	private val mangaDataRepository: MangaDataRepository,
+) {
+
+	suspend operator fun invoke(mangaId: Long): Pair<Manga, Manga?> {
+		val seed = checkNotNull(mangaDataRepository.findMangaById(mangaId)) { "Manga $mangaId not found" }
+			.getDetailsSafe()
+		if (seed.isHealthy()) {
+			return seed to null // no fix required
+		}
+		val replacement = alternativesUseCase(seed, matchThreshold = 0.02f)
+			.filter { it.isHealthy() }
+			.runningFold<Manga, Manga?>(null) { best, candidate ->
+				if (best == null || best < candidate) {
+					candidate
+				} else {
+					best
+				}
+			}.selectLastWithTimeout(4, 40, TimeUnit.SECONDS)
+		migrateUseCase(seed, replacement ?: throw NoAlternativesException(ParcelableManga(seed)))
+		return seed to replacement
+	}
+
+	private suspend fun Manga.isHealthy(): Boolean = runCatchingCancellable {
+		val repo = mangaRepositoryFactory.create(source)
+		val details = if (this.chapters != null) this else repo.getDetails(this)
+		val firstChapter = details.chapters?.firstOrNull() ?: return@runCatchingCancellable false
+		val pageUrl = repo.getPageUrl(repo.getPages(firstChapter).first())
+		pageUrl.toHttpUrlOrNull() != null
+	}.getOrDefault(false)
+
+	private suspend fun Manga.getDetailsSafe() = runCatchingCancellable {
+		mangaRepositoryFactory.create(source).getDetails(this)
+	}.getOrDefault(this)
+
+	private operator fun Manga.compareTo(other: Manga) = chaptersCount().compareTo(other.chaptersCount())
+
+	@Suppress("UNCHECKED_CAST", "OPT_IN_USAGE")
+	private suspend fun <T> Flow<T>.selectLastWithTimeout(
+		minCount: Int,
+		timeout: Long,
+		timeUnit: TimeUnit
+	): T? = channelFlow<T?> {
+		var lastValue: T? = null
+		launch {
+			delay(timeUnit.toMillis(timeout))
+			close(InternalTimeoutException(lastValue))
+		}
+		withIndex().transformWhile { (index, value) ->
+			lastValue = value
+			emit(value)
+			index < minCount && !isClosedForSend
+		}.collect {
+			send(it)
+		}
+	}.catch { e ->
+		if (e is InternalTimeoutException) {
+			emit(e.value as T?)
+		} else {
+			throw e
+		}
+	}.lastOrNull()
+
+	class NoAlternativesException(val seed: ParcelableManga) : NoSuchElementException()
+
+	private class InternalTimeoutException(val value: Any?) : CancellationException()
+}

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/MigrateUseCase.kt

@@ -7,8 +7,8 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
 import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.history.data.toMangaHistory
+import org.koitharu.kotatsu.list.domain.ReadingProgress.Companion.PROGRESS_NONE
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -136,7 +136,7 @@ constructor(
 			return HistoryEntity(
 				mangaId = newManga.id,
 				createdAt = history.createdAt,
-				updatedAt = System.currentTimeMillis(),
+				updatedAt = history.updatedAt,
 				chapterId = currentChapter.id,
 				page = history.page,
 				scroll = history.scroll,
@@ -173,7 +173,7 @@ constructor(
 		return HistoryEntity(
 			mangaId = newManga.id,
 			createdAt = history.createdAt,
-			updatedAt = System.currentTimeMillis(),
+			updatedAt = history.updatedAt,
 			chapterId = newChapterId,
 			page = history.page,
 			scroll = history.scroll,

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt

@@ -7,7 +7,7 @@ import androidx.core.text.inSpans
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.transform.CircleCropTransformation
+import coil.transform.RoundedCornersTransformation
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.getTitle
@@ -75,7 +75,7 @@ fun alternativeAD(
 				.fallback(R.drawable.ic_web)
 				.error(R.drawable.ic_web)
 				.source(item.manga.source)
-				.transformations(CircleCropTransformation())
+				.transformations(RoundedCornersTransformation(context.resources.getDimension(R.dimen.chip_icon_corner)))
 				.allowRgb565(true)
 				.enqueueWith(coil)
 		}

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt

@@ -9,7 +9,6 @@ import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import coil.ImageLoader
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
@@ -18,8 +17,8 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.DIALOG_THEME_CENTERED
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
@@ -31,7 +30,8 @@ import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.search.ui.SearchActivity
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -82,29 +82,37 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 
 	override fun onItemClick(item: MangaAlternativeModel, view: View) {
 		when (view.id) {
-			R.id.chip_source -> startActivity(SearchActivity.newIntent(this, item.manga.source, viewModel.manga.title))
+			R.id.chip_source -> startActivity(
+				MangaListActivity.newIntent(
+					this,
+					item.manga.source,
+					MangaListFilter(query = viewModel.manga.title),
+				),
+			)
+
 			R.id.button_migrate -> confirmMigration(item.manga)
 			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
 		}
 	}
 
 	private fun confirmMigration(target: Manga) {
-		MaterialAlertDialogBuilder(this, DIALOG_THEME_CENTERED)
-			.setIcon(R.drawable.ic_replace)
-			.setTitle(R.string.manga_migration)
-			.setMessage(
+		buildAlertDialog(this, isCentered = true) {
+			setIcon(R.drawable.ic_replace)
+			setTitle(R.string.manga_migration)
+			setMessage(
 				getString(
 					R.string.migrate_confirmation,
 					viewModel.manga.title,
-					viewModel.manga.source.getTitle(this),
+					viewModel.manga.source.getTitle(context),
 					target.title,
-					target.source.getTitle(this),
+					target.source.getTitle(context),
 				),
 			)
-			.setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.migrate) { _, _ ->
+			setNegativeButton(android.R.string.cancel, null)
+			setPositiveButton(R.string.migrate) { _, _ ->
 				viewModel.migrate(target)
-			}.show()
+			}
+		}.show()
 	}
 
 	companion object {

app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt

@@ -0,0 +1,196 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import androidx.core.app.NotificationChannelCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
+import coil.ImageLoader
+import coil.request.ImageRequest
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.runBlocking
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.domain.AutoFixUseCase
+import org.koitharu.kotatsu.core.ErrorReporterReceiver
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.ui.CoroutineIntentService
+import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
+import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+import com.google.android.material.R as materialR
+
+@AndroidEntryPoint
+class AutoFixService : CoroutineIntentService() {
+
+	@Inject
+	lateinit var autoFixUseCase: AutoFixUseCase
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private lateinit var notificationManager: NotificationManagerCompat
+
+	override fun onCreate() {
+		super.onCreate()
+		notificationManager = NotificationManagerCompat.from(applicationContext)
+	}
+
+	override suspend fun processIntent(startId: Int, intent: Intent) {
+		val ids = requireNotNull(intent.getLongArrayExtra(DATA_IDS))
+		startForeground(startId)
+		try {
+			for (mangaId in ids) {
+				val result = runCatchingCancellable {
+					autoFixUseCase.invoke(mangaId)
+				}
+				if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+					val notification = buildNotification(result)
+					notificationManager.notify(TAG, startId, notification)
+				}
+			}
+		} finally {
+			ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+		}
+	}
+
+	override fun onError(startId: Int, error: Throwable) {
+		if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+			val notification = runBlocking { buildNotification(Result.failure(error)) }
+			notificationManager.notify(TAG, startId, notification)
+		}
+	}
+
+	@SuppressLint("InlinedApi")
+	private fun startForeground(startId: Int) {
+		val title = applicationContext.getString(R.string.fixing_manga)
+		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_MIN)
+			.setName(title)
+			.setShowBadge(false)
+			.setVibrationEnabled(false)
+			.setSound(null, null)
+			.setLightsEnabled(false)
+			.build()
+		notificationManager.createNotificationChannel(channel)
+
+		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
+			.setContentTitle(title)
+			.setPriority(NotificationCompat.PRIORITY_MIN)
+			.setDefaults(0)
+			.setSilent(true)
+			.setOngoing(true)
+			.setProgress(0, 0, true)
+			.setSmallIcon(R.drawable.ic_stat_auto_fix)
+			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
+			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
+			.addAction(
+				materialR.drawable.material_ic_clear_black_24dp,
+				applicationContext.getString(android.R.string.cancel),
+				getCancelIntent(startId),
+			)
+			.build()
+
+		ServiceCompat.startForeground(
+			this,
+			FOREGROUND_NOTIFICATION_ID,
+			notification,
+			ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+		)
+	}
+
+	private suspend fun buildNotification(result: Result<Pair<Manga, Manga?>>): Notification {
+		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
+			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
+			.setDefaults(0)
+			.setSilent(true)
+			.setAutoCancel(true)
+		result.onSuccess { (seed, replacement) ->
+			if (replacement != null) {
+				notification.setLargeIcon(
+					coil.execute(
+						ImageRequest.Builder(applicationContext)
+							.data(replacement.coverUrl)
+							.tag(replacement.source)
+							.build(),
+					).toBitmapOrNull(),
+				)
+				notification.setSubText(replacement.title)
+				val intent = DetailsActivity.newIntent(applicationContext, replacement)
+				notification.setContentIntent(
+					PendingIntentCompat.getActivity(
+						applicationContext,
+						replacement.id.toInt(),
+						intent,
+						PendingIntent.FLAG_UPDATE_CURRENT,
+						false,
+					),
+				).setVisibility(
+					if (replacement.isNsfw) NotificationCompat.VISIBILITY_SECRET else NotificationCompat.VISIBILITY_PUBLIC,
+				)
+				notification
+					.setContentTitle(applicationContext.getString(R.string.fixed))
+					.setContentText(
+						applicationContext.getString(
+							R.string.manga_replaced,
+							seed.title,
+							seed.source.getTitle(applicationContext),
+							replacement.title,
+							replacement.source.getTitle(applicationContext),
+						),
+					)
+					.setSmallIcon(R.drawable.ic_stat_done)
+			} else {
+				notification
+					.setContentTitle(applicationContext.getString(R.string.fixing_manga))
+					.setContentText(applicationContext.getString(R.string.no_fix_required, seed.title))
+					.setSmallIcon(android.R.drawable.stat_sys_warning)
+			}
+		}.onFailure { error ->
+			notification
+				.setContentTitle(applicationContext.getString(R.string.error_occurred))
+				.setContentText(
+					if (error is AutoFixUseCase.NoAlternativesException) {
+						applicationContext.getString(R.string.no_alternatives_found, error.seed.manga.title)
+					} else {
+						error.getDisplayMessage(applicationContext.resources)
+					},
+				)
+				.setSmallIcon(android.R.drawable.stat_notify_error)
+				.addAction(
+					R.drawable.ic_alert_outline,
+					applicationContext.getString(R.string.report),
+					ErrorReporterReceiver.getPendingIntent(applicationContext, error),
+				)
+		}
+		return notification.build()
+	}
+
+	companion object {
+
+		private const val DATA_IDS = "ids"
+		private const val TAG = "auto_fix"
+		private const val CHANNEL_ID = "auto_fix"
+		private const val FOREGROUND_NOTIFICATION_ID = 38
+
+		fun start(context: Context, mangaIds: Collection<Long>): Boolean = try {
+			val intent = Intent(context, AutoFixService::class.java)
+			intent.putExtra(DATA_IDS, mangaIds.toLongArray())
+			ContextCompat.startForegroundService(context, intent)
+			true
+		} catch (e: Exception) {
+			e.printStackTraceDebug()
+			false
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.bookmarks.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
@@ -46,7 +47,7 @@ class AllBookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
-	ListSelectionController.Callback2,
+	ListSelectionController.Callback,
 	FastScroller.FastScrollListener, ListHeaderClickListener {
 
 	@Inject
@@ -129,7 +130,11 @@ class AllBookmarksFragment :
 	}
 
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.pageId) ?: false
+		return selectionController?.onItemLongClick(view, item.pageId) ?: false
+	}
+
+	override fun onItemContextClick(item: Bookmark, view: View): Boolean {
+		return selectionController?.onItemContextClick(view, item.pageId) ?: false
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -148,23 +153,23 @@ class AllBookmarksFragment :
 
 	override fun onCreateActionMode(
 		controller: ListSelectionController,
-		mode: ActionMode,
+		menuInflater: MenuInflater,
 		menu: Menu,
 	): Boolean {
-		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
+		menuInflater.inflate(R.menu.mode_bookmarks, menu)
 		return true
 	}
 
 	override fun onActionItemClicked(
 		controller: ListSelectionController,
-		mode: ActionMode,
+		mode: ActionMode?,
 		item: MenuItem,
 	): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
 				viewModel.removeBookmarks(ids)
-				mode.finish()
+				mode?.finish()
 				true
 			}
 

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkLargeAD.kt

@@ -22,10 +22,7 @@ fun bookmarkLargeAD(
 ) = adapterDelegateViewBinding<Bookmark, ListModel, ItemBookmarkLargeBinding>(
 	{ inflater, parent -> ItemBookmarkLargeBinding.inflate(inflater, parent, false) },
 ) {
-	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
-
-	binding.root.setOnClickListener(listener)
-	binding.root.setOnLongClickListener(listener)
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
 
 	bind {
 		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt

@@ -21,10 +21,7 @@ fun bookmarkListAD(
 ) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
 	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
 ) {
-	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
-
-	binding.root.setOnClickListener(listener)
-	binding.root.setOnLongClickListener(listener)
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
 
 	bind {
 		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {

app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -28,7 +29,6 @@ import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.TaggedActivityResult
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -180,13 +180,13 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		}
 	}
 
-	class Contract : ActivityResultContract<CloudFlareProtectedException, TaggedActivityResult>() {
+	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
 		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
 			return newIntent(context, input)
 		}
 
-		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
-			return TaggedActivityResult(TAG, resultCode)
+		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
+			return resultCode == Activity.RESULT_OK
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt

@@ -11,6 +11,7 @@ import androidx.work.Configuration
 import androidx.work.WorkManager
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.acra.ACRA
@@ -28,6 +29,9 @@ import org.koitharu.kotatsu.core.os.AppValidator
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import org.koitharu.kotatsu.local.data.LocalStorageChanges
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndex
+import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import java.security.Security
 import javax.inject.Inject
@@ -60,6 +64,13 @@ open class BaseApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workManagerProvider: Provider<WorkManager>
 
+	@Inject
+	lateinit var localMangaIndexProvider: Provider<LocalMangaIndex>
+
+	@Inject
+	@LocalStorageChanges
+	lateinit var localStorageChanges: MutableSharedFlow<LocalManga?>
+
 	override val workManagerConfiguration: Configuration
 		get() = Configuration.Builder()
 			.setWorkerFactory(workerFactory)
@@ -82,6 +93,7 @@ open class BaseApp : Application(), Configuration.Provider {
 		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
+			localStorageChanges.collect(localMangaIndexProvider.get())
 		}
 		workScheduleManager.init()
 		WorkServiceStopHelper(workManagerProvider).setup()

app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReportingAdmin.kt

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.core
-
-import android.content.Context
-import com.google.auto.service.AutoService
-import org.acra.builder.ReportBuilder
-import org.acra.config.CoreConfiguration
-import org.acra.config.ReportingAdministrator
-
-@AutoService(ReportingAdministrator::class)
-class ErrorReportingAdmin : ReportingAdministrator {
-
-	override fun shouldStartCollecting(
-		context: Context,
-		config: CoreConfiguration,
-		reportBuilder: ReportBuilder
-	): Boolean {
-		return reportBuilder.exception?.isDeadOs() != true
-	}
-
-	private fun Throwable.isDeadOs(): Boolean {
-		val className = javaClass.simpleName
-		return className == "DeadSystemException" || className == "DeadSystemRuntimeException" || cause?.isDeadOs() == true
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipInput.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
+import okhttp3.internal.closeQuietly
 import okio.Closeable
 import org.json.JSONArray
 import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
@@ -38,7 +39,7 @@ class BackupZipInput private constructor(val file: File) : Closeable {
 	fun cleanupAsync() {
 		processLifecycleScope.launch(Dispatchers.IO, CoroutineStart.ATOMIC) {
 			runCatching {
-				close()
+				closeQuietly()
 				file.delete()
 			}
 		}
@@ -46,14 +47,22 @@ class BackupZipInput private constructor(val file: File) : Closeable {
 
 	companion object {
 
-		fun from(file: File): BackupZipInput = try {
-			val res = BackupZipInput(file)
-			if (res.zipFile.getEntry("index") == null) {
-				throw BadBackupFormatException(null)
+		fun from(file: File): BackupZipInput {
+			var res: BackupZipInput? = null
+			return try {
+				res = BackupZipInput(file)
+				if (res.zipFile.getEntry("index") == null) {
+					throw BadBackupFormatException(null)
+				}
+				res
+			} catch (exception: Exception) {
+				res?.closeQuietly()
+				throw if (exception is ZipException) {
+					BadBackupFormatException(exception)
+				} else {
+					exception
+				}
 			}
-			res
-		} catch (e: ZipException) {
-			throw BadBackupFormatException(e)
 		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt

@@ -35,6 +35,7 @@ import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration20To21
 import org.koitharu.kotatsu.core.db.migrations.Migration21To22
+import org.koitharu.kotatsu.core.db.migrations.Migration22To23
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -50,6 +51,8 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.FavouritesDao
 import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndexDao
+import org.koitharu.kotatsu.local.data.index.LocalMangaIndexEntity
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
 import org.koitharu.kotatsu.stats.data.StatsDao
@@ -60,14 +63,14 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 22
+const val DATABASE_VERSION = 23
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -98,6 +101,8 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getSourcesDao(): MangaSourcesDao
 
 	abstract fun getStatsDao(): StatsDao
+
+	abstract fun getLocalMangaIndexDao(): LocalMangaIndexDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -122,6 +127,7 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration19To20(),
 	Migration20To21(),
 	Migration21To22(),
+	Migration22To23(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaQueryBuilder.kt

@@ -0,0 +1,113 @@
+package org.koitharu.kotatsu.core.db
+
+import androidx.sqlite.db.SimpleSQLiteQuery
+import org.koitharu.kotatsu.list.domain.ListFilterOption
+import java.util.LinkedList
+
+class MangaQueryBuilder(
+	private val table: String,
+	private val conditionCallback: ConditionCallback
+) {
+
+	private var filterOptions: Collection<ListFilterOption> = emptyList()
+	private var whereConditions = LinkedList<String>()
+	private var orderBy: String? = null
+	private var groupBy: String? = null
+	private var extraJoins: String? = null
+	private var limit: Int = 0
+
+	fun filters(options: Collection<ListFilterOption>) = apply {
+		filterOptions = options
+	}
+
+	fun where(condition: String) = apply {
+		whereConditions.add(condition)
+	}
+
+	fun orderBy(orderBy: String?) = apply {
+		this@MangaQueryBuilder.orderBy = orderBy
+	}
+
+	fun groupBy(groupBy: String?) = apply {
+		this@MangaQueryBuilder.groupBy = groupBy
+	}
+
+	fun limit(limit: Int) = apply {
+		this@MangaQueryBuilder.limit = limit
+	}
+
+	fun join(join: String?) = apply {
+		extraJoins = join
+	}
+
+	fun build() = buildString {
+		append("SELECT * FROM ")
+		append(table)
+		extraJoins?.let {
+			append(' ')
+			append(it)
+		}
+		if (whereConditions.isNotEmpty()) {
+			whereConditions.joinTo(
+				buffer = this,
+				prefix = " WHERE ",
+				separator = " AND ",
+			)
+		}
+		if (filterOptions.isNotEmpty()) {
+			if (whereConditions.isEmpty()) {
+				append(" WHERE")
+			} else {
+				append(" AND")
+			}
+			var isFirst = true
+			val groupedOptions = filterOptions.groupBy { it.groupKey }
+			for ((_, group) in groupedOptions) {
+				if (group.isEmpty()) {
+					continue
+				}
+				if (isFirst) {
+					isFirst = false
+					append(' ')
+				} else {
+					append(" AND ")
+				}
+				if (group.size > 1) {
+					group.joinTo(
+						buffer = this,
+						separator = " OR ",
+						prefix = "(",
+						postfix = ")",
+						transform = ::getConditionOrThrow,
+					)
+				} else {
+					append(getConditionOrThrow(group.single()))
+				}
+			}
+		}
+		groupBy?.let {
+			append(" GROUP BY ")
+			append(it)
+		}
+		orderBy?.let {
+			append(" ORDER BY ")
+			append(it)
+		}
+		if (limit > 0) {
+			append(" LIMIT ")
+			append(limit)
+		}
+	}.let { SimpleSQLiteQuery(it) }
+
+	private fun getConditionOrThrow(option: ListFilterOption): String = when (option) {
+		is ListFilterOption.Inverted -> "NOT(${getConditionOrThrow(option.option)})"
+		else -> requireNotNull(conditionCallback.getCondition(option)) {
+			"Unsupported filter option $option"
+		}
+	}
+
+	fun interface ConditionCallback {
+
+		fun getCondition(option: ListFilterOption): String?
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/PreferencesDao.kt

@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 
@@ -13,6 +15,9 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>
 
+	@Query("UPDATE preferences SET cf_brightness = 0, cf_contrast = 0, cf_invert = 0, cf_grayscale = 0")
+	abstract suspend fun resetColorFilters()
+
 	@Upsert
 	abstract suspend fun upsert(pref: MangaPrefsEntity)
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TrackLogsDao.kt

@@ -4,36 +4,59 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.RawQuery
 import androidx.room.Transaction
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.core.db.MangaQueryBuilder
+import org.koitharu.kotatsu.list.domain.ListFilterOption
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
 
 @Dao
-interface TrackLogsDao {
+abstract class TrackLogsDao : MangaQueryBuilder.ConditionCallback {
 
-	@Transaction
-	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
-	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
+	fun observeAll(
+		limit: Int,
+		filterOptions: Set<ListFilterOption>,
+	): Flow<List<TrackLogWithManga>> = observeAllImpl(
+		MangaQueryBuilder("track_logs", this)
+			.filters(filterOptions)
+			.limit(limit)
+			.orderBy("created_at DESC")
+			.build(),
+	)
 
 	@Query("SELECT COUNT(*) FROM track_logs WHERE unread = 1")
-	fun observeUnreadCount(): Flow<Int>
+	abstract fun observeUnreadCount(): Flow<Int>
 
 	@Query("DELETE FROM track_logs")
-	suspend fun clear()
+	abstract suspend fun clear()
 
 	@Query("UPDATE track_logs SET unread = 0 WHERE id = :id")
-	suspend fun markAsRead(id: Long)
+	abstract suspend fun markAsRead(id: Long)
 
 	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun insert(entity: TrackLogEntity): Long
+	abstract suspend fun insert(entity: TrackLogEntity): Long
 
 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
-	suspend fun gc()
+	abstract suspend fun gc()
 
 	@Query("DELETE FROM track_logs WHERE id IN (SELECT id FROM track_logs ORDER BY created_at DESC LIMIT 0 OFFSET :size)")
-	suspend fun trim(size: Int)
+	abstract suspend fun trim(size: Int)
 
 	@Query("SELECT COUNT(*) FROM track_logs")
-	suspend fun count(): Int
+	abstract suspend fun count(): Int
+
+	@Transaction
+	@RawQuery(observedEntities = [TrackLogEntity::class])
+	protected abstract fun observeAllImpl(query: SupportSQLiteQuery): Flow<List<TrackLogWithManga>>
+
+	override fun getCondition(option: ListFilterOption): String? = when (option) {
+		ListFilterOption.Macro.FAVORITE -> "EXISTS(SELECT * FROM favourites WHERE favourites.manga_id = track_logs.manga_id)"
+		is ListFilterOption.Favorite -> "EXISTS(SELECT * FROM favourites WHERE favourites.manga_id = track_logs.manga_id AND favourites.category_id = ${option.category.id})"
+		is ListFilterOption.Tag -> "EXISTS(SELECT * FROM manga_tags WHERE manga_tags.manga_id = track_logs.manga_id AND tag_id = ${option.tagId})"
+		ListFilterOption.Macro.NSFW -> "(SELECT nsfw FROM manga WHERE manga.manga_id = track_logs.manga_id) = 1"
+		else -> null
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt

@@ -39,6 +39,8 @@ fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 
 fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())
 
+fun Collection<MangaWithTags>.toMangaList() = map { it.toManga() }
+
 // Model to entity
 
 fun Manga.toEntity() = MangaEntity(

app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration22To23.kt

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration22To23 : Migration(22, 23) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS `local_index` (`manga_id` INTEGER NOT NULL, `path` TEXT NOT NULL, PRIMARY KEY(`manga_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/ProxyConfigException.kt

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import java.net.ProtocolException
+
+class ProxyConfigException : ProtocolException("Wrong proxy configuration")

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/TooManyRequestExceptions.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import okio.IOException
-import java.time.Instant
-import java.time.temporal.ChronoUnit
-
-class TooManyRequestExceptions(
-	val url: String,
-	val retryAt: Instant?,
-) : IOException() {
-	val retryAfter: Long
-		get() = retryAt?.until(Instant.now(), ChronoUnit.MILLIS) ?: 0
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt

@@ -2,67 +2,55 @@ package org.koitharu.kotatsu.core.exceptions.resolve
 
 import android.content.Context
 import android.widget.Toast
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.ActivityResultCaller
 import androidx.annotation.StringRes
 import androidx.collection.MutableScatterMap
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.EntryPointAccessors
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseActivity.BaseActivityEntryPoint
 import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
-import org.koitharu.kotatsu.core.util.TaggedActivityResult
 import org.koitharu.kotatsu.core.util.ext.findActivity
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.scrobbling.common.domain.ScrobblerAuthRequiredException
+import org.koitharu.kotatsu.scrobbling.common.ui.ScrobblerAuthHelper
+import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import java.security.cert.CertPathValidatorException
+import javax.inject.Provider
 import javax.net.ssl.SSLException
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
-
+class ExceptionResolver @AssistedInject constructor(
+	@Assisted private val host: Host,
+	private val settings: AppSettings,
+	private val scrobblerAuthHelperProvider: Provider<ScrobblerAuthHelper>,
+) {
 	private val continuations = MutableScatterMap<String, Continuation<Boolean>>(1)
-	private val activity: FragmentActivity?
-	private val fragment: Fragment?
-	private val sourceAuthContract: ActivityResultLauncher<MangaSource>
-	private val cloudflareContract: ActivityResultLauncher<CloudFlareProtectedException>
 
-	val context: Context?
-		get() = activity ?: fragment?.context
-
-	constructor(activity: FragmentActivity) {
-		this.activity = activity
-		fragment = null
-		sourceAuthContract = activity.registerForActivityResult(SourceAuthActivity.Contract(), this)
-		cloudflareContract = activity.registerForActivityResult(CloudFlareActivity.Contract(), this)
+	private val sourceAuthContract = host.registerForActivityResult(SourceAuthActivity.Contract()) {
+		handleActivityResult(SourceAuthActivity.TAG, it)
 	}
-
-	constructor(fragment: Fragment) {
-		this.fragment = fragment
-		activity = null
-		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
-		cloudflareContract = fragment.registerForActivityResult(CloudFlareActivity.Contract(), this)
-	}
-
-	override fun onActivityResult(result: TaggedActivityResult) {
-		continuations.remove(result.tag)?.resume(result.isSuccess)
+	private val cloudflareContract = host.registerForActivityResult(CloudFlareActivity.Contract()) {
+		handleActivityResult(CloudFlareActivity.TAG, it)
 	}
 
 	fun showDetails(e: Throwable, url: String?) {
-		ErrorDetailsDialog.show(getFragmentManager(), e, url)
+		ErrorDetailsDialog.show(host.getChildFragmentManager(), e, url)
 	}
 
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
@@ -74,6 +62,13 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			false
 		}
 
+		is ProxyConfigException -> {
+			host.withContext {
+				startActivity(SettingsActivity.newProxySettingsIntent(this))
+			}
+			false
+		}
+
 		is NotFoundException -> {
 			openInBrowser(e.url)
 			false
@@ -84,6 +79,20 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			false
 		}
 
+		is ScrobblerAuthRequiredException -> {
+			val authHelper = scrobblerAuthHelperProvider.get()
+			if (authHelper.isAuthorized(e.scrobbler)) {
+				true
+			} else {
+				host.withContext {
+					authHelper.startAuth(this, e.scrobbler).onFailure {
+						showDetails(it, null)
+					}
+				}
+				false
+			}
+		}
+
 		else -> false
 	}
 
@@ -97,21 +106,20 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 		sourceAuthContract.launch(source)
 	}
 
-	private fun openInBrowser(url: String) {
-		context?.run {
-			startActivity(BrowserActivity.newIntent(this, url, null, null))
-		}
+	private fun openInBrowser(url: String) = host.withContext {
+		startActivity(BrowserActivity.newIntent(this, url, null, null))
 	}
 
-	private fun openAlternatives(manga: Manga) {
-		context?.run {
-			startActivity(AlternativesActivity.newIntent(this, manga))
-		}
+	private fun openAlternatives(manga: Manga) = host.withContext {
+		startActivity(AlternativesActivity.newIntent(this, manga))
+	}
+
+	private fun handleActivityResult(tag: String, result: Boolean) {
+		continuations.remove(tag)?.resume(result)
 	}
 
 	private fun showSslErrorDialog() {
-		val ctx = context ?: return
-		val settings = getAppSettings(ctx)
+		val ctx = host.getContext() ?: return
 		if (settings.isSSLBypassEnabled) {
 			Toast.makeText(ctx, R.string.operation_not_supported, Toast.LENGTH_SHORT).show()
 			return
@@ -127,23 +135,38 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			.show()
 	}
 
-	private fun getAppSettings(context: Context): AppSettings {
-		return EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(context).settings
+	private inline fun Host.withContext(block: Context.() -> Unit) {
+		getContext()?.apply(block)
 	}
 
-	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
+	interface Host : ActivityResultCaller {
+
+		fun getChildFragmentManager(): FragmentManager
+
+		fun getContext(): Context?
+	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(host: Host): ExceptionResolver
+	}
 
 	companion object {
 
 		@StringRes
 		fun getResolveStringId(e: Throwable) = when (e) {
 			is CloudFlareProtectedException -> R.string.captcha_solve
+			is ScrobblerAuthRequiredException,
 			is AuthRequiredException -> R.string.sign_in
+
 			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
 			is UnsupportedSourceException -> if (e.manga != null) R.string.alternatives else 0
 			is SSLException,
 			is CertPathValidatorException -> R.string.fix
 
+			is ProxyConfigException -> R.string.settings
+
 			else -> 0
 		}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/model/GenericSortOrder.kt

@@ -0,0 +1,32 @@
+package org.koitharu.kotatsu.core.model
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.model.SortOrder
+
+@Deprecated("")
+enum class GenericSortOrder(
+	@StringRes val titleResId: Int,
+	val ascending: SortOrder,
+	val descending: SortOrder,
+) {
+
+	UPDATED(R.string.updated, SortOrder.UPDATED_ASC, SortOrder.UPDATED),
+	RATING(R.string.by_rating, SortOrder.RATING_ASC, SortOrder.RATING),
+	POPULARITY(R.string.popularity, SortOrder.POPULARITY_ASC, SortOrder.POPULARITY),
+	DATE(R.string.by_date, SortOrder.NEWEST_ASC, SortOrder.NEWEST),
+	NAME(R.string.by_name, SortOrder.ALPHABETICAL, SortOrder.ALPHABETICAL_DESC),
+	;
+
+	operator fun get(direction: SortDirection): SortOrder = when (direction) {
+		SortDirection.ASC -> ascending
+		SortDirection.DESC -> descending
+	}
+
+	companion object {
+
+		fun of(order: SortOrder): GenericSortOrder = entries.first { e ->
+			e.ascending == order || e.descending == order
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt

@@ -1,16 +1,21 @@
 package org.koitharu.kotatsu.core.model
 
 import android.net.Uri
+import android.text.SpannableStringBuilder
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.collection.MutableObjectIntMap
 import androidx.core.os.LocaleListCompat
+import androidx.core.text.buildSpannedString
+import androidx.core.text.strikeThrough
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.parsers.model.ContentRating
+import org.koitharu.kotatsu.parsers.model.Demographic
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.formatSimple
 import org.koitharu.kotatsu.parsers.util.mapToSet
@@ -68,6 +73,17 @@ val ContentRating.titleResId: Int
 		ContentRating.ADULT -> R.string.rating_adult
 	}
 
+@get:StringRes
+val Demographic.titleResId: Int
+	get() = when (this) {
+		Demographic.SHOUNEN -> R.string.demographic_shounen
+		Demographic.SHOUJO -> R.string.demographic_shoujo
+		Demographic.SEINEN -> R.string.demographic_seinen
+		Demographic.JOSEI -> R.string.demographic_josei
+		Demographic.KODOMO -> R.string.demographic_kodomo
+		Demographic.NONE -> R.string.none
+	}
+
 fun Manga.findChapter(id: Long): MangaChapter? {
 	return chapters?.findById(id)
 }
@@ -110,6 +126,9 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 val Manga.isLocal: Boolean
 	get() = source == LocalMangaSource
 
+val Manga.isBroken: Boolean
+	get() = source == UnknownMangaSource
+
 val Manga.appUrl: Uri
 	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
 		.appendQueryParameter("source", source.name)
@@ -138,3 +157,26 @@ fun Manga.chaptersCount(): Int {
 	}
 	return max
 }
+
+fun MangaListFilter.getSummary() = buildSpannedString {
+	if (!query.isNullOrEmpty()) {
+		append(query)
+		if (tags.isNotEmpty() || tagsExclude.isNotEmpty()) {
+			append(' ')
+			append('(')
+			appendTagsSummary(this@getSummary)
+			append(')')
+		}
+	} else {
+		appendTagsSummary(this@getSummary)
+	}
+}
+
+private fun SpannableStringBuilder.appendTagsSummary(filter: MangaListFilter) {
+	filter.tags.joinTo(this) { it.title }
+	if (filter.tagsExclude.isNotEmpty()) {
+		strikeThrough {
+			filter.tagsExclude.joinTo(this) { it.title }
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaHistory.kt

@@ -12,4 +12,5 @@ data class MangaHistory(
 	val page: Int,
 	val scroll: Int,
 	val percent: Float,
+	val chaptersCount: Int,
 ) : Parcelable

app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt

@@ -43,6 +43,8 @@ fun MangaSource(name: String?): MangaSource {
 	return UnknownMangaSource
 }
 
+fun Collection<String>.toMangaSources() = map(::MangaSource)
+
 fun MangaSource.isNsfw(): Boolean = when (this) {
 	is MangaSourceInfo -> mangaSource.isNsfw()
 	is MangaParserSource -> contentType == ContentType.HENTAI
@@ -56,13 +58,26 @@ val ContentType.titleResId
 		ContentType.HENTAI -> R.string.content_type_hentai
 		ContentType.COMICS -> R.string.content_type_comics
 		ContentType.OTHER -> R.string.content_type_other
+		ContentType.MANHWA -> R.string.content_type_manhwa
+		ContentType.MANHUA -> R.string.content_type_manhua
+		ContentType.NOVEL -> R.string.content_type_novel
+		ContentType.ONE_SHOT -> R.string.content_type_one_shot
+		ContentType.DOUJINSHI -> R.string.content_type_doujinshi
+		ContentType.IMAGE_SET -> R.string.content_type_image_set
+		ContentType.ARTIST_CG -> R.string.content_type_artist_cg
+		ContentType.GAME_CG -> R.string.content_type_game_cg
 	}
 
-fun MangaSource.getSummary(context: Context): String? = when (this) {
-	is MangaSourceInfo -> mangaSource.getSummary(context)
+tailrec fun MangaSource.unwrap(): MangaSource = if (this is MangaSourceInfo) {
+	mangaSource.unwrap()
+} else {
+	this
+}
+
+fun MangaSource.getSummary(context: Context): String? = when (val source = unwrap()) {
 	is MangaParserSource -> {
-		val type = context.getString(contentType.titleResId)
-		val locale = locale.toLocale().getDisplayName(context)
+		val type = context.getString(source.contentType.titleResId)
+		val locale = source.locale.toLocale().getDisplayName(context)
 		context.getString(R.string.source_summary_pattern, type, locale)
 	}
 
@@ -71,11 +86,10 @@ fun MangaSource.getSummary(context: Context): String? = when (this) {
 	else -> null
 }
 
-fun MangaSource.getTitle(context: Context): String = when (this) {
-	is MangaSourceInfo -> mangaSource.getTitle(context)
-	is MangaParserSource -> title
+fun MangaSource.getTitle(context: Context): String = when (val source = unwrap()) {
+	is MangaParserSource -> source.title
 	LocalMangaSource -> context.getString(R.string.local_storage)
-	is ExternalMangaSource -> resolveName(context)
+	is ExternalMangaSource -> source.resolveName(context)
 	else -> context.getString(R.string.unknown)
 }
 

app/src/main/kotlin/org/koitharu/kotatsu/core/model/SortDirection.kt

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.core.model
+
+enum class SortDirection {
+
+	ASC, DESC;
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaListFilter.kt

@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import kotlinx.parcelize.Parceler
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.koitharu.kotatsu.core.util.ext.readEnumSet
+import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.util.ext.writeEnumSet
+import org.koitharu.kotatsu.parsers.model.ContentRating
+import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.Demographic
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaState
+
+object MangaListFilterParceler : Parceler<MangaListFilter> {
+
+	override fun MangaListFilter.write(parcel: Parcel, flags: Int) {
+		parcel.writeString(query)
+		parcel.writeParcelable(ParcelableMangaTags(tags), 0)
+		parcel.writeParcelable(ParcelableMangaTags(tagsExclude), 0)
+		parcel.writeSerializable(locale)
+		parcel.writeSerializable(originalLocale)
+		parcel.writeEnumSet(states)
+		parcel.writeEnumSet(contentRating)
+		parcel.writeEnumSet(types)
+		parcel.writeEnumSet(demographics)
+		parcel.writeInt(year)
+		parcel.writeInt(yearFrom)
+		parcel.writeInt(yearTo)
+	}
+
+	override fun create(parcel: Parcel) = MangaListFilter(
+		query = parcel.readString(),
+		tags = parcel.readParcelableCompat<ParcelableMangaTags>()?.tags.orEmpty(),
+		tagsExclude = parcel.readParcelableCompat<ParcelableMangaTags>()?.tags.orEmpty(),
+		locale = parcel.readSerializableCompat(),
+		originalLocale = parcel.readSerializableCompat(),
+		states = parcel.readEnumSet<MangaState>().orEmpty(),
+		contentRating = parcel.readEnumSet<ContentRating>().orEmpty(),
+		types = parcel.readEnumSet<ContentType>().orEmpty(),
+		demographics = parcel.readEnumSet<Demographic>().orEmpty(),
+		year = parcel.readInt(),
+		yearFrom = parcel.readInt(),
+		yearTo = parcel.readInt(),
+	)
+}
+
+@Parcelize
+@TypeParceler<MangaListFilter, MangaListFilterParceler>
+data class ParcelableMangaListFilter(val filter: MangaListFilter) : Parcelable

app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt

@@ -1,8 +1,9 @@
 package org.koitharu.kotatsu.core.network
 
+import okio.IOException
+import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.ProxySelector
@@ -31,9 +32,12 @@ class AppProxySelector(
 		val type = settings.proxyType
 		val address = settings.proxyAddress
 		val port = settings.proxyPort
-		if (type == Proxy.Type.DIRECT || address.isNullOrEmpty() || port == 0) {
+		if (type == Proxy.Type.DIRECT) {
 			return Proxy.NO_PROXY
 		}
+		if (address.isNullOrEmpty() || port == 0) {
+			throw ProxyConfigException()
+		}
 		cachedProxy?.let {
 			val addr = it.address() as? InetSocketAddress
 			if (addr != null && it.type() == type && addr.port == port && addr.hostString == address) {

app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.network
 
 import android.content.Context
-import android.util.AndroidRuntimeException
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -19,6 +18,7 @@ import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.imageproxy.RealImageProxyInterceptor
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.assertNotInMainThread
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import java.util.concurrent.TimeUnit
 import javax.inject.Provider
@@ -40,9 +40,10 @@ interface NetworkModule {
 		@Singleton
 		fun provideCookieJar(
 			@ApplicationContext context: Context
-		): MutableCookieJar = try {
+		): MutableCookieJar = runCatching {
 			AndroidCookieJar()
-		} catch (e: AndroidRuntimeException) {
+		}.getOrElse { e ->
+			e.printStackTraceDebug()
 			// WebView is not available
 			PreferencesCookieJar(context)
 		}

app/src/main/kotlin/org/koitharu/kotatsu/core/network/RateLimitInterceptor.kt

@@ -3,28 +3,27 @@ package org.koitharu.kotatsu.core.network
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
-import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
-import java.time.Instant
+import org.koitharu.kotatsu.parsers.exception.TooManyRequestExceptions
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
+import java.util.concurrent.TimeUnit
 
 class RateLimitInterceptor : Interceptor {
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val response = chain.proceed(chain.request())
 		if (response.code == 429) {
-			val retryDate = response.header(CommonHeaders.RETRY_AFTER)?.parseRetryDate()
 			val request = response.request
 			response.closeQuietly()
 			throw TooManyRequestExceptions(
 				url = request.url.toString(),
-				retryAt = retryDate,
+				retryAfter = response.header(CommonHeaders.RETRY_AFTER)?.parseRetryAfter() ?: 0L,
 			)
 		}
 		return response
 	}
 
-	private fun String.parseRetryDate(): Instant? {
-		return toLongOrNull()?.let { Instant.now().plusSeconds(it) }
-			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant()
+	private fun String.parseRetryAfter(): Long {
+		return toLongOrNull()?.let { TimeUnit.SECONDS.toMillis(it) }
+			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant().toEpochMilli()
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt

@@ -180,7 +180,7 @@ class AppShortcutManager @Inject constructor(
 			.setLongLabel(title)
 			.setIcon(icon)
 			.setLongLived(true)
-			.setIntent(MangaListActivity.newIntent(context, source))
+			.setIntent(MangaListActivity.newIntent(context, source, null))
 			.build()
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkState.kt

@@ -17,6 +17,9 @@ class NetworkState(
 
 	private val callback = NetworkCallbackImpl()
 
+	override val value: Boolean
+		get() = connectivityManager.isOnline(settings)
+
 	@Synchronized
 	override fun onActive() {
 		invalidate()

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/BitmapWrapper.kt

@@ -9,7 +9,7 @@ import android.graphics.Rect as AndroidRect
 
 class BitmapWrapper private constructor(
 	private val androidBitmap: AndroidBitmap,
-) : Bitmap {
+) : Bitmap, AutoCloseable {
 
 	private val canvas by lazy { Canvas(androidBitmap) } // is not always used, so initialized lazily
 
@@ -24,17 +24,21 @@ class BitmapWrapper private constructor(
 		canvas.drawBitmap(androidSourceBitmap, src.toAndroidRect(), dst.toAndroidRect(), null)
 	}
 
+	override fun close() {
+		androidBitmap.recycle()
+	}
+
 	fun compressTo(output: OutputStream) {
 		androidBitmap.compress(AndroidBitmap.CompressFormat.PNG, 100, output)
 	}
 
 	companion object {
 
-		fun create(width: Int, height: Int): Bitmap = BitmapWrapper(
+		fun create(width: Int, height: Int) = BitmapWrapper(
 			AndroidBitmap.createBitmap(width, height, AndroidBitmap.Config.ARGB_8888),
 		)
 
-		fun create(bitmap: AndroidBitmap): Bitmap = BitmapWrapper(
+		fun create(bitmap: AndroidBitmap) = BitmapWrapper(
 			if (bitmap.isMutable) bitmap else bitmap.copy(AndroidBitmap.Config.ARGB_8888, true),
 		)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -7,9 +7,10 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
 
@@ -24,14 +25,17 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParse
 	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
 
+	override val filterCapabilities: MangaListFilterCapabilities
+		get() = MangaListFilterCapabilities()
+
+	override suspend fun getFilterOptions(): MangaListFilterOptions = stub(null)
+
 	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
 
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
+	override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List<Manga> = stub(null)
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
 
-	override suspend fun getAvailableTags(): Set<MangaTag> = stub(null)
-
 	private fun stub(manga: Manga?): Nothing {
 		throw UnsupportedSourceException("Usage of Dummy parser", manga)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/EmptyMangaRepository.kt

@@ -1,37 +1,29 @@
 package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
-import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
-import java.util.Locale
 
 class EmptyMangaRepository(override val source: MangaSource) : MangaRepository {
 
 	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
-	override val states: Set<MangaState>
-		get() = emptySet()
-	override val contentRatings: Set<ContentRating>
-		get() = emptySet()
+
 	override var defaultSortOrder: SortOrder
 		get() = SortOrder.NEWEST
 		set(value) = Unit
-	override val isMultipleTagsSupported: Boolean
-		get() = false
-	override val isTagsExclusionSupported: Boolean
-		get() = false
-	override val isSearchSupported: Boolean
-		get() = false
 
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
+	override val filterCapabilities: MangaListFilterCapabilities
+		get() = MangaListFilterCapabilities()
+
+	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> = stub(null)
 
 	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
 
@@ -39,9 +31,7 @@ class EmptyMangaRepository(override val source: MangaSource) : MangaRepository {
 
 	override suspend fun getPageUrl(page: MangaPage): String = stub(null)
 
-	override suspend fun getTags(): Set<MangaTag> = stub(null)
-
-	override suspend fun getLocales(): Set<Locale> = stub(null)
+	override suspend fun getFilterOptions(): MangaListFilterOptions = stub(null)
 
 	override suspend fun getRelated(seed: Manga): List<Manga> = stub(seed)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt

@@ -46,11 +46,16 @@ class MangaDataRepository @Inject constructor(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
 					cfInvert = colorFilter?.isInverted ?: false,
+					cfGrayscale = colorFilter?.isGrayscale ?: false,
 				),
 			)
 		}
 	}
 
+	suspend fun resetColorFilters() {
+		db.getPreferencesDao().resetColorFilters()
+	}
+
 	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
 		return db.getPreferencesDao().find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLinkResolver.kt

@@ -61,7 +61,7 @@ class MangaLinkResolver @Inject constructor(
 
 	private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
 		if (!title.isNullOrEmpty()) {
-			val list = getList(0, MangaListFilter.Search(title))
+			val list = getList(0, null, MangaListFilter(query = title))
 			if (url != null) {
 				list.find { it.url == url }?.let {
 					return it
@@ -80,7 +80,7 @@ class MangaLinkResolver @Inject constructor(
 			}.ifNullOrEmpty {
 				seed.author
 			} ?: return@runCatchingCancellable null
-			val seedList = getList(0, MangaListFilter.Search(seedTitle))
+			val seedList = getList(0, null, MangaListFilter(query = seedTitle))
 			seedList.first { x -> x.url == url }
 		}.getOrThrow()
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt

@@ -21,14 +21,15 @@ import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.requireBody
 import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
+import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.bitmap.Bitmap
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.network.UserAgents
+import org.koitharu.kotatsu.parsers.util.map
 import java.lang.ref.WeakReference
 import java.util.Locale
 import javax.inject.Inject
@@ -76,32 +77,25 @@ class MangaLoaderContextImpl @Inject constructor(
 	}
 
 	override fun redrawImageResponse(response: Response, redraw: (image: Bitmap) -> Bitmap): Response {
-		val image = response.requireBody().byteStream()
-
-		val opts = BitmapFactory.Options()
-		opts.inMutable = true
-		val bitmap = BitmapFactory.decodeStream(image, null, opts) ?: error("Cannot decode bitmap")
-		val result = redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper
-
-		val body = Buffer().also {
-			result.compressTo(it.outputStream())
-		}.asResponseBody("image/jpeg".toMediaType())
-
-		return response.newBuilder()
-			.body(body)
-			.build()
+		return response.map { body ->
+			val opts = BitmapFactory.Options()
+			opts.inMutable = true
+			BitmapFactory.decodeStream(body.byteStream(), null, opts)?.use { bitmap ->
+				(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
+					Buffer().also {
+						result.compressTo(it.outputStream())
+					}.asResponseBody("image/jpeg".toMediaType())
+				}
+			} ?: error("Cannot decode bitmap")
+		}
 	}
 
-	override fun createBitmap(width: Int, height: Int): Bitmap {
-		return BitmapWrapper.create(width, height)
-	}
+	override fun createBitmap(width: Int, height: Int): Bitmap = BitmapWrapper.create(width, height)
 
 	@MainThread
-	private fun obtainWebView(): WebView {
-		return webViewCached?.get() ?: WebView(androidContext).also {
-			it.configureForParser(null)
-			webViewCached = WeakReference(it)
-		}
+	private fun obtainWebView(): WebView = webViewCached?.get() ?: WebView(androidContext).also {
+		it.configureForParser(null)
+		webViewCached = WeakReference(it)
 	}
 
 	private fun obtainWebViewUserAgent(): String {

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaRepository.kt

@@ -13,18 +13,16 @@ import org.koitharu.kotatsu.core.parser.external.ExternalMangaRepository
 import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.lang.ref.WeakReference
-import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.set
@@ -35,19 +33,11 @@ interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
-	val states: Set<MangaState>
-
-	val contentRatings: Set<ContentRating>
-
 	var defaultSortOrder: SortOrder
 
-	val isMultipleTagsSupported: Boolean
+	val filterCapabilities: MangaListFilterCapabilities
 
-	val isTagsExclusionSupported: Boolean
-
-	val isSearchSupported: Boolean
-
-	suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga>
+	suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
 
@@ -55,14 +45,12 @@ interface MangaRepository {
 
 	suspend fun getPageUrl(page: MangaPage): String
 
-	suspend fun getTags(): Set<MangaTag>
-
-	suspend fun getLocales(): Set<Locale>
+	suspend fun getFilterOptions(): MangaListFilterOptions
 
 	suspend fun getRelated(seed: Manga): List<Manga>
 
 	suspend fun find(manga: Manga): Manga? {
-		val list = getList(0, MangaListFilter.Search(manga.title))
+		val list = getList(0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
 		return list.find { x -> x.id == manga.id }
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/ParserMangaRepository.kt

@@ -13,11 +13,14 @@ import org.koitharu.kotatsu.parsers.model.Favicons
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.parsers.util.domain
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.util.Locale
@@ -28,17 +31,20 @@ class ParserMangaRepository(
 	cache: MemoryContentCache,
 ) : CachingMangaRepository(cache), Interceptor {
 
+	private val filterOptionsLazy = SuspendLazy {
+		mirrorSwitchInterceptor.withMirrorSwitching {
+			parser.getFilterOptions()
+		}
+	}
+
 	override val source: MangaParserSource
 		get() = parser.source
 
 	override val sortOrders: Set<SortOrder>
 		get() = parser.availableSortOrders
 
-	override val states: Set<MangaState>
-		get() = parser.availableStates
-
-	override val contentRatings: Set<ContentRating>
-		get() = parser.availableContentRating
+	override val filterCapabilities: MangaListFilterCapabilities
+		get() = parser.filterCapabilities
 
 	override var defaultSortOrder: SortOrder
 		get() = getConfig().defaultSortOrder ?: sortOrders.first()
@@ -46,15 +52,6 @@ class ParserMangaRepository(
 			getConfig().defaultSortOrder = value
 		}
 
-	override val isMultipleTagsSupported: Boolean
-		get() = parser.isMultipleTagsSupported
-
-	override val isSearchSupported: Boolean
-		get() = parser.isSearchSupported
-
-	override val isTagsExclusionSupported: Boolean
-		get() = parser.isTagsExclusionSupported
-
 	var domain: String
 		get() = parser.domain
 		set(value) {
@@ -72,9 +69,9 @@ class ParserMangaRepository(
 		}
 	}
 
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
+	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> {
 		return mirrorSwitchInterceptor.withMirrorSwitching {
-			parser.getList(offset, filter)
+			parser.getList(offset, order ?: defaultSortOrder, filter ?: MangaListFilter.EMPTY)
 		}
 	}
 
@@ -88,13 +85,7 @@ class ParserMangaRepository(
 		parser.getPageUrl(page)
 	}
 
-	override suspend fun getTags(): Set<MangaTag> = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getAvailableTags()
-	}
-
-	override suspend fun getLocales(): Set<Locale> {
-		return parser.getAvailableLocales()
-	}
+	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptionsLazy.get()
 
 	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
 		parser.getFavicons()

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt

@@ -6,16 +6,15 @@ import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
 import org.koitharu.kotatsu.core.parser.CachingMangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import java.util.EnumSet
-import java.util.Locale
 
 class ExternalMangaRepository(
 	private val contentResolver: ContentResolver,
@@ -33,31 +32,23 @@ class ExternalMangaRepository(
 		}.getOrNull()
 	}
 
+	private val filterOptions = SuspendLazy(contentSource::getListFilterOptions)
+
 	override val sortOrders: Set<SortOrder>
-		get() = capabilities?.availableSortOrders ?: EnumSet.of(SortOrder.ALPHABETICAL)
+		get() = capabilities?.availableSortOrders ?: EnumSet.of(SortOrder.POPULARITY)
 
-	override val states: Set<MangaState>
-		get() = capabilities?.availableStates.orEmpty()
-
-	override val contentRatings: Set<ContentRating>
-		get() = capabilities?.availableContentRating.orEmpty()
+	override val filterCapabilities: MangaListFilterCapabilities
+		get() = capabilities?.listFilterCapabilities ?: MangaListFilterCapabilities()
 
 	override var defaultSortOrder: SortOrder
-		get() = capabilities?.defaultSortOrder ?: SortOrder.ALPHABETICAL
+		get() = capabilities?.availableSortOrders?.firstOrNull() ?: SortOrder.ALPHABETICAL
 		set(value) = Unit
 
-	override val isMultipleTagsSupported: Boolean
-		get() = capabilities?.isMultipleTagsSupported ?: true
+	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptions.get()
 
-	override val isTagsExclusionSupported: Boolean
-		get() = capabilities?.isTagsExclusionSupported ?: false
-
-	override val isSearchSupported: Boolean
-		get() = capabilities?.isSearchSupported ?: true
-
-	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> =
+	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> =
 		runInterruptible(Dispatchers.IO) {
-			contentSource.getList(offset, filter)
+			contentSource.getList(offset, order ?: defaultSortOrder, filter ?: MangaListFilter.EMPTY)
 		}
 
 	override suspend fun getDetailsImpl(manga: Manga): Manga = runInterruptible(Dispatchers.IO) {
@@ -68,13 +59,9 @@ class ExternalMangaRepository(
 		contentSource.getPages(chapter)
 	}
 
-	override suspend fun getPageUrl(page: MangaPage): String = page.url // TODO
-
-	override suspend fun getTags(): Set<MangaTag> = runInterruptible(Dispatchers.IO) {
-		contentSource.getTags()
+	override suspend fun getPageUrl(page: MangaPage): String = runInterruptible(Dispatchers.IO) {
+		contentSource.getPageUrl(page.url)
 	}
 
-	override suspend fun getLocales(): Set<Locale> = emptySet() // TODO
-
 	override suspend fun getRelatedMangaImpl(seed: Manga): List<Manga> = emptyList() // TODO
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginContentSource.kt

@@ -8,12 +8,14 @@ import androidx.core.net.toUri
 import org.jetbrains.annotations.Blocking
 import org.koitharu.kotatsu.core.exceptions.IncompatiblePluginException
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
-import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.Demographic
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
+import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
@@ -31,25 +33,29 @@ class ExternalPluginContentSource(
 
 	@Blocking
 	@WorkerThread
-	fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = runCatchingCompatibility {
+	fun getListFilterOptions() = MangaListFilterOptions(
+		availableTags = fetchTags(),
+		availableStates = fetchEnumSet(MangaState::class.java, "filter/states"),
+		availableContentRating = fetchEnumSet(ContentRating::class.java, "filter/content_ratings"),
+		availableContentTypes = fetchEnumSet(ContentType::class.java, "filter/content_types"),
+		availableDemographics = fetchEnumSet(Demographic::class.java, "filter/demographics"),
+		availableLocales = fetchLocales(),
+	)
+
+	@Blocking
+	@WorkerThread
+	fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
 		val uri = "content://${source.authority}/manga".toUri().buildUpon()
 		uri.appendQueryParameter("offset", offset.toString())
-		when (filter) {
-			is MangaListFilter.Advanced -> {
-				filter.tags.forEach { uri.appendQueryParameter("tag_include", it.key) }
-				filter.tagsExclude.forEach { uri.appendQueryParameter("tag_exclude", it.key) }
-				filter.states.forEach { uri.appendQueryParameter("state", it.name) }
-				filter.locale?.let { uri.appendQueryParameter("locale", it.language) }
-				filter.contentRating.forEach { uri.appendQueryParameter("content_rating", it.name) }
-			}
-
-			is MangaListFilter.Search -> {
-				uri.appendQueryParameter("query", filter.query)
-			}
-
-			null -> Unit
+		filter.tags.forEach { uri.appendQueryParameter("tags_include", "${it.key}=${it.title}") }
+		filter.tagsExclude.forEach { uri.appendQueryParameter("tags_exclude", "${it.key}=${it.title}") }
+		filter.states.forEach { uri.appendQueryParameter("state", it.name) }
+		filter.locale?.let { uri.appendQueryParameter("locale", it.language) }
+		filter.contentRating.forEach { uri.appendQueryParameter("content_rating", it.name) }
+		if (!filter.query.isNullOrEmpty()) {
+			uri.appendQueryParameter("query", filter.query)
 		}
-		contentResolver.query(uri.build(), null, null, null, filter?.sortOrder?.name)
+		return contentResolver.query(uri.build(), null, null, null, order.name)
 			.safe()
 			.use { cursor ->
 				val result = ArrayList<Manga>(cursor.count)
@@ -64,10 +70,10 @@ class ExternalPluginContentSource(
 
 	@Blocking
 	@WorkerThread
-	fun getDetails(manga: Manga) = runCatchingCompatibility {
+	fun getDetails(manga: Manga): Manga {
 		val chapters = queryChapters(manga.url)
 		val details = queryDetails(manga.url)
-		Manga(
+		return Manga(
 			id = manga.id,
 			title = details.title.ifBlank { manga.title },
 			altTitle = details.altTitle.ifNullOrEmpty { manga.altTitle },
@@ -88,12 +94,12 @@ class ExternalPluginContentSource(
 
 	@Blocking
 	@WorkerThread
-	fun getPages(chapter: MangaChapter): List<MangaPage> = runCatchingCompatibility {
+	fun getPages(chapter: MangaChapter): List<MangaPage> {
 		val uri = "content://${source.authority}/chapters".toUri()
 			.buildUpon()
 			.appendPath(chapter.url)
 			.build()
-		contentResolver.query(uri, null, null, null, null)
+		return contentResolver.query(uri, null, null, null, null)
 			.safe()
 			.use { cursor ->
 				val result = ArrayList<MangaPage>(cursor.count)
@@ -113,9 +119,9 @@ class ExternalPluginContentSource(
 
 	@Blocking
 	@WorkerThread
-	fun getTags(): Set<MangaTag> = runCatchingCompatibility {
-		val uri = "content://${source.authority}/tags".toUri()
-		contentResolver.query(uri, null, null, null, null)
+	private fun fetchTags(): Set<MangaTag> {
+		val uri = "content://${source.authority}/filter/tags".toUri()
+		return contentResolver.query(uri, null, null, null, null)
 			.safe()
 			.use { cursor ->
 				val result = ArraySet<MangaTag>(cursor.count)
@@ -132,6 +138,40 @@ class ExternalPluginContentSource(
 			}
 	}
 
+	@Blocking
+	@WorkerThread
+	fun getPageUrl(url: String): String {
+		val uri = "content://${source.authority}/pages/0".toUri().buildUpon()
+			.appendQueryParameter("url", url)
+			.build()
+		return contentResolver.query(uri, null, null, null, null)
+			.safe()
+			.use { cursor ->
+				if (cursor.moveToFirst()) {
+					cursor.getString(COLUMN_VALUE)
+				} else {
+					url
+				}
+			}
+	}
+
+	@Blocking
+	@WorkerThread
+	private fun fetchLocales(): Set<Locale> {
+		val uri = "content://${source.authority}/filter/locales".toUri()
+		return contentResolver.query(uri, null, null, null, null)
+			.safe()
+			.use { cursor ->
+				val result = ArraySet<Locale>(cursor.count)
+				if (cursor.moveToFirst()) {
+					do {
+						result += Locale(cursor.getString(COLUMN_NAME))
+					} while (cursor.moveToNext())
+				}
+				result
+			}
+	}
+
 	fun getCapabilities(): MangaSourceCapabilities? {
 		val uri = "content://${source.authority}/capabilities".toUri()
 		return contentResolver.query(uri, null, null, null, null)
@@ -144,26 +184,18 @@ class ExternalPluginContentSource(
 							?.mapNotNullTo(EnumSet.noneOf(SortOrder::class.java)) {
 								SortOrder.entries.find(it)
 							}.orEmpty(),
-						availableStates = cursor.getStringOrNull(COLUMN_STATES)
-							?.split(',')
-							?.mapNotNullTo(EnumSet.noneOf(MangaState::class.java)) {
-								MangaState.entries.find(it)
-							}.orEmpty(),
-						availableContentRating = cursor.getStringOrNull(COLUMN_CONTENT_RATING)
-							?.split(',')
-							?.mapNotNullTo(EnumSet.noneOf(ContentRating::class.java)) {
-								ContentRating.entries.find(it)
-							}.orEmpty(),
-						isMultipleTagsSupported = cursor.getBooleanOrDefault(COLUMN_MULTIPLE_TAGS_SUPPORTED, true),
-						isTagsExclusionSupported = cursor.getBooleanOrDefault(COLUMN_TAGS_EXCLUSION_SUPPORTED, false),
-						isSearchSupported = cursor.getBooleanOrDefault(COLUMN_SEARCH_SUPPORTED, true),
-						contentType = cursor.getStringOrNull(COLUMN_CONTENT_TYPE)?.let {
-							ContentType.entries.find(it)
-						} ?: ContentType.OTHER,
-						defaultSortOrder = cursor.getStringOrNull(COLUMN_DEFAULT_SORT_ORDER)?.let {
-							SortOrder.entries.find(it)
-						} ?: SortOrder.ALPHABETICAL,
-						sourceLocale = cursor.getStringOrNull(COLUMN_LOCALE)?.toLocale() ?: Locale.ROOT,
+						listFilterCapabilities = MangaListFilterCapabilities(
+							isMultipleTagsSupported = cursor.getBooleanOrDefault(COLUMN_MULTIPLE_TAGS, false),
+							isTagsExclusionSupported = cursor.getBooleanOrDefault(COLUMN_TAGS_EXCLUSION, false),
+							isSearchSupported = cursor.getBooleanOrDefault(COLUMN_SEARCH, false),
+							isSearchWithFiltersSupported = cursor.getBooleanOrDefault(
+								COLUMN_SEARCH_WITH_FILTERS,
+								false,
+							),
+							isYearSupported = cursor.getBooleanOrDefault(COLUMN_YEAR, false),
+							isYearRangeSupported = cursor.getBooleanOrDefault(COLUMN_YEAR_RANGE, false),
+							isOriginalLocaleSupported = cursor.getBooleanOrDefault(COLUMN_ORIGINAL_LOCALE, false),
+						),
 					)
 				} else {
 					null
@@ -212,7 +244,7 @@ class ExternalPluginContentSource(
 			}
 	}
 
-	private fun SafeCursor.getManga() = Manga(
+	private fun ExternalPluginCursor.getManga() = Manga(
 		id = getLong(COLUMN_ID),
 		title = getString(COLUMN_TITLE),
 		altTitle = getStringOrNull(COLUMN_ALT_TITLE),
@@ -233,39 +265,46 @@ class ExternalPluginContentSource(
 		source = source,
 	)
 
-	private inline fun <R> runCatchingCompatibility(block: () -> R): R = try {
-		block()
-	} catch (e: NoSuchElementException) { // unknown column name
-		throw IncompatiblePluginException(source.name, e)
-	} catch (e: IllegalArgumentException) {
-		throw IncompatiblePluginException(source.name, e)
+	private fun <E : Enum<E>> fetchEnumSet(cls: Class<E>, path: String): EnumSet<E> {
+		val uri = "content://${source.authority}/$path".toUri()
+		return contentResolver.query(uri, null, null, null, null)
+			.safe()
+			.use { cursor ->
+				val result = EnumSet.noneOf(cls)
+				val enumConstants = cls.enumConstants ?: return@use result
+				if (cursor.moveToFirst()) {
+					do {
+						val name = cursor.getString(COLUMN_NAME)
+						val enumValue = enumConstants.find { it.name == name }
+						if (enumValue != null) {
+							result.add(enumValue)
+						}
+					} while (cursor.moveToNext())
+				}
+				result
+			}
 	}
 
-	private fun Cursor?.safe() = SafeCursor(this ?: throw IncompatiblePluginException(source.name, null))
+	private fun Cursor?.safe() = ExternalPluginCursor(
+		source = source,
+		cursor = this ?: throw IncompatiblePluginException(source.name, null),
+	)
 
 	class MangaSourceCapabilities(
 		val availableSortOrders: Set<SortOrder>,
-		val availableStates: Set<MangaState>,
-		val availableContentRating: Set<ContentRating>,
-		val isMultipleTagsSupported: Boolean,
-		val isTagsExclusionSupported: Boolean,
-		val isSearchSupported: Boolean,
-		val contentType: ContentType,
-		val defaultSortOrder: SortOrder,
-		val sourceLocale: Locale,
+		val listFilterCapabilities: MangaListFilterCapabilities,
 	)
 
 	private companion object {
 
 		const val COLUMN_SORT_ORDERS = "sort_orders"
-		const val COLUMN_STATES = "states"
-		const val COLUMN_CONTENT_RATING = "content_rating"
-		const val COLUMN_MULTIPLE_TAGS_SUPPORTED = "multiple_tags_supported"
-		const val COLUMN_TAGS_EXCLUSION_SUPPORTED = "tags_exclusion_supported"
-		const val COLUMN_SEARCH_SUPPORTED = "search_supported"
-		const val COLUMN_CONTENT_TYPE = "content_type"
-		const val COLUMN_DEFAULT_SORT_ORDER = "default_sort_order"
-		const val COLUMN_LOCALE = "locale"
+		const val COLUMN_MULTIPLE_TAGS = "multiple_tags"
+		const val COLUMN_TAGS_EXCLUSION = "tags_exclusion"
+		const val COLUMN_SEARCH = "search"
+		const val COLUMN_SEARCH_WITH_FILTERS = "search_with_filters"
+		const val COLUMN_YEAR = "year"
+		const val COLUMN_YEAR_RANGE = "year_range"
+		const val COLUMN_ORIGINAL_LOCALE = "original_locale"
 		const val COLUMN_ID = "id"
 		const val COLUMN_NAME = "name"
 		const val COLUMN_NUMBER = "number"
@@ -287,5 +326,6 @@ class ExternalPluginContentSource(
 		const val COLUMN_DESCRIPTION = "description"
 		const val COLUMN_PREVIEW = "preview"
 		const val COLUMN_KEY = "key"
+		const val COLUMN_VALUE = "value"
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginCursor.kt

@@ -2,14 +2,19 @@ package org.koitharu.kotatsu.core.parser.external
 
 import android.database.Cursor
 import android.database.CursorWrapper
+import org.koitharu.kotatsu.core.exceptions.IncompatiblePluginException
 import org.koitharu.kotatsu.core.util.ext.getBoolean
 
-class SafeCursor(cursor: Cursor) : CursorWrapper(cursor) {
+class ExternalPluginCursor(private val source: ExternalMangaSource, cursor: Cursor) : CursorWrapper(cursor) {
 
-	fun getString(columnName: String): String {
-		return getString(getColumnIndexOrThrow(columnName))
+	override fun getColumnIndexOrThrow(columnName: String?): Int = try {
+		super.getColumnIndexOrThrow(columnName)
+	} catch (e: Exception) {
+		throw IncompatiblePluginException(source.name, e)
 	}
 
+	fun getString(columnName: String): String = getString(getColumnIndexOrThrow(columnName))
+
 	fun getStringOrNull(columnName: String): String? {
 		val columnIndex = getColumnIndex(columnName)
 		return when {
@@ -19,9 +24,7 @@ class SafeCursor(cursor: Cursor) : CursorWrapper(cursor) {
 		}
 	}
 
-	fun getBoolean(columnName: String): Boolean {
-		return getBoolean(getColumnIndexOrThrow(columnName))
-	}
+	fun getBoolean(columnName: String): Boolean = getBoolean(getColumnIndexOrThrow(columnName))
 
 	fun getBooleanOrDefault(columnName: String, defaultValue: Boolean): Boolean {
 		val columnIndex = getColumnIndex(columnName)
@@ -32,9 +35,7 @@ class SafeCursor(cursor: Cursor) : CursorWrapper(cursor) {
 		}
 	}
 
-	fun getInt(columnName: String): Int {
-		return getInt(getColumnIndexOrThrow(columnName))
-	}
+	fun getInt(columnName: String): Int = getInt(getColumnIndexOrThrow(columnName))
 
 	fun getIntOrDefault(columnName: String, defaultValue: Int): Int {
 		val columnIndex = getColumnIndex(columnName)
@@ -45,9 +46,7 @@ class SafeCursor(cursor: Cursor) : CursorWrapper(cursor) {
 		}
 	}
 
-	fun getLong(columnName: String): Long {
-		return getLong(getColumnIndexOrThrow(columnName))
-	}
+	fun getLong(columnName: String): Long = getLong(getColumnIndexOrThrow(columnName))
 
 	fun getLongOrDefault(columnName: String, defaultValue: Long): Long {
 		val columnIndex = getColumnIndex(columnName)
@@ -58,9 +57,7 @@ class SafeCursor(cursor: Cursor) : CursorWrapper(cursor) {
 		}
 	}
 
-	fun getFloat(columnName: String): Float {
-		return getFloat(getColumnIndexOrThrow(columnName))
-	}
+	fun getFloat(columnName: String): Float = getFloat(getColumnIndexOrThrow(columnName))
 
 	fun getFloatOrDefault(columnName: String, defaultValue: Float): Float {
 		val columnIndex = getColumnIndex(columnName)

app/src/main/kotlin/org/koitharu/kotatsu/core/parser/favicon/FaviconFetcher.kt

@@ -37,12 +37,12 @@ import org.koitharu.kotatsu.core.parser.EmptyMangaRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.ParserMangaRepository
 import org.koitharu.kotatsu.core.parser.external.ExternalMangaRepository
-import org.koitharu.kotatsu.core.util.ext.requireBody
 import org.koitharu.kotatsu.core.util.ext.writeAllCancellable
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.util.withExtraCloseable
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.requireBody
 import java.net.HttpURLConnection
 import kotlin.coroutines.coroutineContext
 
@@ -114,6 +114,7 @@ class FaviconFetcher(
 			.url(url)
 			.get()
 			.tag(MangaSource::class.java, source)
+		request.tag(MangaSource::class.java, source)
 		@Suppress("UNCHECKED_CAST")
 		options.tags.asMap().forEach { request.tag(it.key as Class<Any>, it.value) }
 		val response = okHttpClient.newCall(request.build()).await()

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt

@@ -85,6 +85,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_GRID_SIZE_PAGES, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE_PAGES, value) }
 
+	val isQuickFilterEnabled: Boolean
+		get() = prefs.getBoolean(KEY_QUICK_FILTER, true)
+
 	var historyListMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE_HISTORY, listMode)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_HISTORY, value) }
@@ -157,6 +160,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isTrackerNsfwDisabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_NO_NSFW, false)
 
+	val trackerDownloadStrategy: TrackerDownloadStrategy
+		get() = prefs.getEnumValue(KEY_TRACKER_DOWNLOAD, TrackerDownloadStrategy.DISABLED)
+
 	var notificationSound: Uri
 		get() = prefs.getString(KEY_NOTIFICATIONS_SOUND, null)?.toUriOrNull()
 			?: Settings.System.DEFAULT_NOTIFICATION_URI
@@ -597,6 +603,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_TRACK_WARNING = "track_warning"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
 		const val KEY_TRACKER_NO_NSFW = "tracker_no_nsfw"
+		const val KEY_TRACKER_DOWNLOAD = "tracker_download"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
@@ -666,7 +673,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_AUTOSCROLL_SPEED = "as_speed"
 		const val KEY_MIRROR_SWITCHING = "mirror_switching"
 		const val KEY_PROXY = "proxy"
-		const val KEY_PROXY_TYPE = "proxy_type"
+		const val KEY_PROXY_TYPE = "proxy_type_2"
 		const val KEY_PROXY_ADDRESS = "proxy_address"
 		const val KEY_PROXY_PORT = "proxy_port"
 		const val KEY_PROXY_AUTH = "proxy_auth"
@@ -696,6 +703,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
 		const val KEY_SOURCES_VERSION = "sources_version"
+		const val KEY_QUICK_FILTER = "quick_filter"
 
 		// keys for non-persistent preferences
 		const val KEY_APP_VERSION = "app_version"

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt

@@ -1,11 +1,13 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import com.google.android.material.color.DynamicColors
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.util.find
 
+@Keep
 enum class ColorScheme(
 	@StyleRes val styleResId: Int,
 	@StringRes val titleResId: Int,

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class DownloadFormat {
 
 	AUTOMATIC,

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ListMode.kt

@@ -1,6 +1,9 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ListMode {
 
 	LIST, DETAILED_LIST, GRID;
-}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NavItem.kt

@@ -2,9 +2,11 @@ package org.koitharu.kotatsu.core.prefs
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
+import androidx.annotation.Keep
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.R
 
+@Keep
 enum class NavItem(
 	@IdRes val id: Int,
 	@StringRes val title: Int,

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/NetworkPolicy.kt

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.core.prefs
 
 import android.net.ConnectivityManager
+import androidx.annotation.Keep
 
+@Keep
 enum class NetworkPolicy(
 	private val key: Int,
 ) {

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ProgressIndicatorMode.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ProgressIndicatorMode {
 
 	NONE, PERCENT_READ, PERCENT_LEFT, CHAPTERS_READ, CHAPTERS_LEFT;

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderAnimation.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ReaderAnimation {
 
 	// Do not rename this

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt

@@ -2,11 +2,13 @@ package org.koitharu.kotatsu.core.prefs
 
 import android.content.Context
 import android.view.ContextThemeWrapper
+import androidx.annotation.Keep
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
 import com.google.android.material.R as materialR
 
+@Keep
 enum class ReaderBackground {
 
 	DEFAULT, LIGHT, DARK, WHITE, BLACK;

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderMode.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ReaderMode(val id: Int) {
 
 	STANDARD(1),

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ScreenshotsPolicy.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
+
+@Keep
 enum class ScreenshotsPolicy {
 
 	// Do not rename this

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/SearchSuggestionType.kt

@@ -1,8 +1,10 @@
 package org.koitharu.kotatsu.core.prefs
 
+import androidx.annotation.Keep
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.R
 
+@Keep
 enum class SearchSuggestionType(
 	@StringRes val titleResId: Int,
 ) {

app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/TrackerDownloadStrategy.kt

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.prefs
+
+import androidx.annotation.Keep
+
+@Keep
+enum class TrackerDownloadStrategy {
+
+	DISABLED, DOWNLOADED;
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/AlertDialogFragment.kt

@@ -16,10 +16,6 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 	var viewBinding: B? = null
 		private set
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
-	protected val binding: B
-		get() = requireViewBinding()
-
 	final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		val binding = onCreateViewBinding(layoutInflater, null)
 		viewBinding = binding
@@ -51,9 +47,6 @@ abstract class AlertDialogFragment<B : ViewBinding> : DialogFragment() {
 
 	open fun onDialogCreated(dialog: AlertDialog) = Unit
 
-	@Deprecated("", ReplaceWith("viewBinding"))
-	protected fun bindingOrNull() = viewBinding
-
 	fun requireViewBinding(): B = checkNotNull(viewBinding) {
 		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.ui
 import android.content.Intent
 import android.content.res.Configuration
 import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -14,25 +13,22 @@ import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
 import androidx.core.view.WindowCompat
+import androidx.fragment.app.FragmentManager
 import androidx.viewbinding.ViewBinding
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
-import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
 import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 
-@Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
+	ExceptionResolver.Host,
 	ScreenshotPolicyHelper.ContentContainer,
 	WindowInsetsDelegate.WindowInsetsListener {
 
@@ -41,8 +37,8 @@ abstract class BaseActivity<B : ViewBinding> :
 	lateinit var viewBinding: B
 		private set
 
-	@JvmField
-	protected val exceptionResolver = ExceptionResolver(this)
+	protected lateinit var exceptionResolver: ExceptionResolver
+		private set
 
 	@JvmField
 	protected val insetsDelegate = WindowInsetsDelegate()
@@ -53,13 +49,15 @@ abstract class BaseActivity<B : ViewBinding> :
 	private var defaultStatusBarColor = Color.TRANSPARENT
 
 	override fun onCreate(savedInstanceState: Bundle?) {
-		val settings = EntryPointAccessors.fromApplication(this, BaseActivityEntryPoint::class.java).settings
+		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(this)
+		val settings = entryPoint.settings
 		isAmoledTheme = settings.isAmoledTheme
 		setTheme(settings.colorScheme.styleResId)
 		if (isAmoledTheme) {
 			setTheme(R.style.ThemeOverlay_Kotatsu_Amoled)
 		}
 		putDataToExtras(intent)
+		exceptionResolver = entryPoint.exceptionResolverFactory.create(this)
 		super.onCreate(savedInstanceState)
 		WindowCompat.setDecorFitsSystemWindows(window, false)
 		insetsDelegate.handleImeInsets = true
@@ -88,6 +86,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		setupToolbar()
 	}
 
+	override fun getContext() = this
+
+	override fun getChildFragmentManager(): FragmentManager = supportFragmentManager
+
 	protected fun setContentView(binding: B) {
 		this.viewBinding = binding
 		super.setContentView(binding.root)
@@ -97,11 +99,6 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onSupportNavigateUp(): Boolean {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-			// TODO fix behavior on Android 14
-			dispatchNavigateUp()
-			return true
-		}
 		val fm = supportFragmentManager
 		if (fm.isStateSaved) {
 			return false
@@ -178,12 +175,6 @@ abstract class BaseActivity<B : ViewBinding> :
 
 	protected fun hasViewBinding() = ::viewBinding.isInitialized
 
-	@EntryPoint
-	@InstallIn(SingletonComponent::class)
-	interface BaseActivityEntryPoint {
-		val settings: AppSettings
-	}
-
 	companion object {
 
 		const val EXTRA_DATA = "data"

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivityEntryPoint.kt

@@ -0,0 +1,16 @@
+package org.koitharu.kotatsu.core.ui
+
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface BaseActivityEntryPoint {
+
+	val settings: AppSettings
+
+	val exceptionResolverFactory: ExceptionResolver.Factory
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseFragment.kt

@@ -1,29 +1,27 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 
-@Suppress("LeakingThis")
 abstract class BaseFragment<B : ViewBinding> :
 	Fragment(),
+	ExceptionResolver.Host,
 	WindowInsetsDelegate.WindowInsetsListener {
 
 	var viewBinding: B? = null
 		private set
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
-	protected val binding: B
-		get() = requireViewBinding()
-
-	@JvmField
-	protected val exceptionResolver = ExceptionResolver(this)
+	protected lateinit var exceptionResolver: ExceptionResolver
+		private set
 
 	@JvmField
 	protected val insetsDelegate = WindowInsetsDelegate()
@@ -31,6 +29,12 @@ abstract class BaseFragment<B : ViewBinding> :
 	protected val actionModeDelegate: ActionModeDelegate
 		get() = (requireActivity() as BaseActivity<*>).actionModeDelegate
 
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(context)
+		exceptionResolver = entryPoint.exceptionResolverFactory.create(this)
+	}
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -59,9 +63,6 @@ abstract class BaseFragment<B : ViewBinding> :
 		"Fragment $this did not return a ViewBinding from onCreateView() or this was called before onCreateView()."
 	}
 
-	@Deprecated("", ReplaceWith("viewBinding"))
-	protected fun bindingOrNull() = viewBinding
-
 	protected abstract fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): B
 
 	protected open fun onViewBindingCreated(binding: B, savedInstanceState: Bundle?) = Unit

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BasePreferenceFragment.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.ui
 
 import android.content.ActivityNotFoundException
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
@@ -12,7 +13,9 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
@@ -25,7 +28,11 @@ import javax.inject.Inject
 abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	PreferenceFragmentCompat(),
 	WindowInsetsDelegate.WindowInsetsListener,
-	RecyclerViewOwner {
+	RecyclerViewOwner,
+	ExceptionResolver.Host {
+
+	protected lateinit var exceptionResolver: ExceptionResolver
+		private set
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -36,6 +43,12 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 	override val recyclerView: RecyclerView
 		get() = listView
 
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(context)
+		exceptionResolver = entryPoint.exceptionResolverFactory.create(this)
+	}
+
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		val themedContext = (view.parentView ?: view).context

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseViewModel.kt

@@ -65,6 +65,7 @@ abstract class BaseViewModel : ViewModel() {
 	}
 
 	protected fun <T> Flow<T>.withErrorHandling() = catch { error ->
+		error.printStackTraceDebug()
 		errorEvent.call(error)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/CoroutineIntentService.kt

@@ -1,12 +1,21 @@
 package org.koitharu.kotatsu.core.ui
 
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
+import android.os.PatternMatcher
 import androidx.annotation.AnyThread
 import androidx.annotation.WorkerThread
+import androidx.core.app.PendingIntentCompat
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -20,7 +29,15 @@ abstract class CoroutineIntentService : BaseService() {
 
 	final override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
-		launchCoroutine(intent, startId)
+		val job = launchCoroutine(intent, startId)
+		val receiver = CancelReceiver(job)
+		ContextCompat.registerReceiver(
+			this,
+			receiver,
+			createIntentFilter(this, startId),
+			ContextCompat.RECEIVER_NOT_EXPORTED,
+		)
+		job.invokeOnCompletion { unregisterReceiver(receiver) }
 		return START_REDELIVER_INTENT
 	}
 
@@ -47,8 +64,45 @@ abstract class CoroutineIntentService : BaseService() {
 	@AnyThread
 	protected abstract fun onError(startId: Int, error: Throwable)
 
+	protected fun getCancelIntent(startId: Int) = PendingIntentCompat.getBroadcast(
+		this,
+		0,
+		createCancelIntent(this, startId),
+		PendingIntent.FLAG_UPDATE_CURRENT,
+		false,
+	)
+
 	private fun errorHandler(startId: Int) = CoroutineExceptionHandler { _, throwable ->
 		throwable.printStackTraceDebug()
 		onError(startId, throwable)
 	}
+
+	private class CancelReceiver(
+		private val job: Job
+	) : BroadcastReceiver() {
+
+		override fun onReceive(context: Context?, intent: Intent?) {
+			job.cancel()
+		}
+	}
+
+	private companion object {
+
+		private const val SCHEME = "startid"
+		private const val ACTION_SUFFIX_CANCEL = ".ACTION_CANCEL"
+
+		fun createIntentFilter(service: CoroutineIntentService, startId: Int): IntentFilter {
+			val intentFilter = IntentFilter(cancelAction(service))
+			intentFilter.addDataScheme(SCHEME)
+			intentFilter.addDataPath(startId.toString(), PatternMatcher.PATTERN_LITERAL)
+			return intentFilter
+		}
+
+		fun createCancelIntent(service: CoroutineIntentService, startId: Int): Intent {
+			return Intent(cancelAction(service))
+				.setData("$SCHEME://$startId".toUri())
+		}
+
+		private fun cancelAction(service: CoroutineIntentService) = service.javaClass.name + ACTION_SUFFIX_CANCEL
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/OnContextClickListenerCompat.kt

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.ui
+
+import android.view.View
+
+fun interface OnContextClickListenerCompat {
+
+	fun onContextClick(v: View): Boolean
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/ReorderableListAdapter.kt

@@ -52,8 +52,8 @@ open class ReorderableListAdapter<T : ListModel> : ListDelegationAdapter<List<T>
 	}
 
 	protected class DiffCallback<T : ListModel>(
-		val oldList: List<T>,
-		val newList: List<T>,
+		private val oldList: List<T>,
+		private val newList: List<T>,
 	) : DiffUtil.Callback() {
 
 		override fun getOldListSize(): Int = oldList.size
@@ -71,5 +71,11 @@ open class ReorderableListAdapter<T : ListModel> : ListDelegationAdapter<List<T>
 			val newItem = newList[newItemPosition]
 			return newItem == oldItem
 		}
+
+		override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
+			val oldItem = oldList[oldItemPosition]
+			val newItem = newList[newItemPosition]
+			return newItem.getChangePayload(oldItem)
+		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/AlertDialogs.kt

@@ -0,0 +1,67 @@
+package org.koitharu.kotatsu.core.ui.dialog
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.CompoundButton.OnCheckedChangeListener
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.updatePadding
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
+import com.hannesdorfmann.adapterdelegates4.AdapterDelegatesManager
+import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
+import com.google.android.material.R as materialR
+
+inline fun buildAlertDialog(
+	context: Context,
+	isCentered: Boolean = false,
+	block: MaterialAlertDialogBuilder.() -> Unit,
+): AlertDialog = MaterialAlertDialogBuilder(
+	context,
+	if (isCentered) materialR.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered else 0,
+).apply(block).create()
+
+fun <B : AlertDialog.Builder> B.setCheckbox(
+	@StringRes textResId: Int,
+	isChecked: Boolean,
+	onCheckedChangeListener: OnCheckedChangeListener
+) = apply {
+	val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
+	binding.checkbox.setText(textResId)
+	binding.checkbox.isChecked = isChecked
+	binding.checkbox.setOnCheckedChangeListener(onCheckedChangeListener)
+	setView(binding.root)
+}
+
+fun <B : AlertDialog.Builder, T> B.setRecyclerViewList(
+	list: List<T>,
+	delegate: AdapterDelegate<List<T>>,
+) = apply {
+	val delegatesManager = AdapterDelegatesManager<List<T>>()
+	delegatesManager.addDelegate(delegate)
+	setRecyclerViewList(ListDelegationAdapter(delegatesManager).also { it.items = list })
+}
+
+fun <B : AlertDialog.Builder, T> B.setRecyclerViewList(
+	list: List<T>,
+	vararg delegates: AdapterDelegate<List<T>>,
+) = apply {
+	val delegatesManager = AdapterDelegatesManager<List<T>>()
+	delegates.forEach { delegatesManager.addDelegate(it) }
+	setRecyclerViewList(ListDelegationAdapter(delegatesManager).also { it.items = list })
+}
+
+fun <B : AlertDialog.Builder> B.setRecyclerViewList(adapter: RecyclerView.Adapter<*>) = apply {
+	val recyclerView = RecyclerView(context)
+	recyclerView.layoutManager = LinearLayoutManager(context)
+	recyclerView.updatePadding(
+		top = context.resources.getDimensionPixelOffset(R.dimen.list_spacing),
+	)
+	recyclerView.clipToPadding = false
+	recyclerView.adapter = adapter
+	setView(recyclerView)
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/CheckBoxAlertDialog.kt

@@ -1,80 +0,0 @@
-package org.koitharu.kotatsu.core.ui.dialog
-
-import android.content.Context
-import android.content.DialogInterface
-import android.view.LayoutInflater
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.koitharu.kotatsu.databinding.DialogCheckboxBinding
-
-class CheckBoxAlertDialog private constructor(private val delegate: AlertDialog) :
-	DialogInterface by delegate {
-
-	fun show() = delegate.show()
-
-	class Builder(context: Context) {
-
-		private val binding = DialogCheckboxBinding.inflate(LayoutInflater.from(context))
-
-		private val delegate = MaterialAlertDialogBuilder(context)
-			.setView(binding.root)
-
-		fun setTitle(@StringRes titleResId: Int): Builder {
-			delegate.setTitle(titleResId)
-			return this
-		}
-
-		fun setTitle(title: CharSequence): Builder {
-			delegate.setTitle(title)
-			return this
-		}
-
-		fun setMessage(@StringRes messageId: Int): Builder {
-			delegate.setMessage(messageId)
-			return this
-		}
-
-		fun setMessage(message: CharSequence): Builder {
-			delegate.setMessage(message)
-			return this
-		}
-
-		fun setCheckBoxText(@StringRes textId: Int): Builder {
-			binding.checkbox.setText(textId)
-			return this
-		}
-
-		fun setCheckBoxChecked(isChecked: Boolean): Builder {
-			binding.checkbox.isChecked = isChecked
-			return this
-		}
-
-		fun setIcon(@DrawableRes iconId: Int): Builder {
-			delegate.setIcon(iconId)
-			return this
-		}
-
-		fun setPositiveButton(
-			@StringRes textId: Int,
-			listener: (DialogInterface, Boolean) -> Unit
-		): Builder {
-			delegate.setPositiveButton(textId) { dialog, _ ->
-				listener(dialog, binding.checkbox.isChecked)
-			}
-			return this
-		}
-
-		fun setNegativeButton(
-			@StringRes textId: Int,
-			listener: DialogInterface.OnClickListener? = null
-		): Builder {
-			delegate.setNegativeButton(textId, listener)
-			return this
-		}
-
-		fun create() = CheckBoxAlertDialog(delegate.create())
-
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RecyclerViewAlertDialog.kt

@@ -1,101 +0,0 @@
-package org.koitharu.kotatsu.core.ui.dialog
-
-import android.content.Context
-import android.content.DialogInterface
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
-import com.hannesdorfmann.adapterdelegates4.AdapterDelegatesManager
-import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import org.koitharu.kotatsu.R
-
-class RecyclerViewAlertDialog private constructor(
-	private val delegate: AlertDialog
-) : DialogInterface by delegate {
-
-	fun show() = delegate.show()
-
-	class Builder<T>(context: Context) {
-
-		private val recyclerView = RecyclerView(context)
-		private val delegatesManager = AdapterDelegatesManager<List<T>>()
-		private var items: List<T>? = null
-
-		private val delegate = MaterialAlertDialogBuilder(context)
-			.setView(recyclerView)
-
-		init {
-			recyclerView.layoutManager = LinearLayoutManager(context)
-			recyclerView.updatePadding(
-				top = context.resources.getDimensionPixelOffset(R.dimen.list_spacing),
-			)
-			recyclerView.clipToPadding = false
-		}
-
-		fun setTitle(@StringRes titleResId: Int): Builder<T> {
-			delegate.setTitle(titleResId)
-			return this
-		}
-
-		fun setTitle(title: CharSequence): Builder<T> {
-			delegate.setTitle(title)
-			return this
-		}
-
-		fun setIcon(@DrawableRes iconId: Int): Builder<T> {
-			delegate.setIcon(iconId)
-			return this
-		}
-
-		fun setPositiveButton(
-			@StringRes textId: Int,
-			listener: DialogInterface.OnClickListener,
-		): Builder<T> {
-			delegate.setPositiveButton(textId, listener)
-			return this
-		}
-
-		fun setNegativeButton(
-			@StringRes textId: Int,
-			listener: DialogInterface.OnClickListener? = null
-		): Builder<T> {
-			delegate.setNegativeButton(textId, listener)
-			return this
-		}
-
-		fun setNeutralButton(
-			@StringRes textId: Int,
-			listener: DialogInterface.OnClickListener,
-		): Builder<T> {
-			delegate.setNeutralButton(textId, listener)
-			return this
-		}
-
-		fun setCancelable(isCancelable: Boolean): Builder<T> {
-			delegate.setCancelable(isCancelable)
-			return this
-		}
-
-		fun addAdapterDelegate(subject: AdapterDelegate<List<T>>): Builder<T> {
-			delegatesManager.addDelegate(subject)
-			return this
-		}
-
-		fun setItems(list: List<T>): Builder<T> {
-			items = list
-			return this
-		}
-
-		fun create(): RecyclerViewAlertDialog {
-			recyclerView.adapter = ListDelegationAdapter(delegatesManager).also {
-				it.items = items
-			}
-			return RecyclerViewAlertDialog(delegate.create())
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt

@@ -0,0 +1,16 @@
+package org.koitharu.kotatsu.core.ui.dialog
+
+import android.widget.CompoundButton
+import android.widget.CompoundButton.OnCheckedChangeListener
+
+class RememberCheckListener(
+	initialValue: Boolean,
+) : OnCheckedChangeListener {
+
+	var isChecked: Boolean = initialValue
+		private set
+
+	override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
+		this.isChecked = isChecked
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/AdapterDelegateClickListenerAdapter.kt

@@ -3,18 +3,46 @@ package org.koitharu.kotatsu.core.ui.list
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.View.OnLongClickListener
+import androidx.core.util.Function
 import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
+import org.koitharu.kotatsu.core.ui.OnContextClickListenerCompat
+import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 
-class AdapterDelegateClickListenerAdapter<I>(
+class AdapterDelegateClickListenerAdapter<I, O>(
 	private val adapterDelegate: AdapterDelegateViewBindingViewHolder<out I, *>,
-	private val clickListener: OnListItemClickListener<I>,
-) : OnClickListener, OnLongClickListener {
+	private val clickListener: OnListItemClickListener<O>,
+	private val itemMapper: Function<I, O>,
+) : OnClickListener, OnLongClickListener, OnContextClickListenerCompat {
 
 	override fun onClick(v: View) {
-		clickListener.onItemClick(adapterDelegate.item, v)
+		clickListener.onItemClick(mappedItem(), v)
 	}
 
 	override fun onLongClick(v: View): Boolean {
-		return clickListener.onItemLongClick(adapterDelegate.item, v)
+		return clickListener.onItemLongClick(mappedItem(), v)
+	}
+
+	override fun onContextClick(v: View): Boolean {
+		return clickListener.onItemContextClick(mappedItem(), v)
+	}
+
+	private fun mappedItem(): O = itemMapper.apply(adapterDelegate.item)
+
+	fun attach(itemView: View) {
+		itemView.setOnClickListener(this)
+		itemView.setOnLongClickListener(this)
+		itemView.setOnContextClickListenerCompat(this)
+	}
+
+	companion object {
+
+		operator fun <T> invoke(
+			adapterDelegate: AdapterDelegateViewBindingViewHolder<out T, *>,
+			clickListener: OnListItemClickListener<T>
+		): AdapterDelegateClickListenerAdapter<T, T> = AdapterDelegateClickListenerAdapter(
+			adapterDelegate = adapterDelegate,
+			clickListener = clickListener,
+			itemMapper = { x -> x },
+		)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/BaseListSelectionCallback.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.ui.list
+
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class BaseListSelectionCallback(
+	protected val recyclerView: RecyclerView,
+) : ListSelectionController.Callback {
+
+	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
+		recyclerView.invalidateItemDecorations()
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/ListSelectionController.kt

@@ -2,10 +2,14 @@ package org.koitharu.kotatsu.core.ui.list
 
 import android.os.Bundle
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.PopupMenu
 import androidx.collection.LongSet
+import androidx.collection.longSetOf
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
@@ -25,22 +29,25 @@ class ListSelectionController(
 	private val appCompatDelegate: AppCompatDelegate,
 	private val decoration: AbstractSelectionItemDecoration,
 	private val registryOwner: SavedStateRegistryOwner,
-	private val callback: Callback2,
+	private val callback: Callback,
 ) : ActionMode.Callback, SavedStateRegistry.SavedStateProvider {
 
 	private var actionMode: ActionMode? = null
+	private var focusedItemId: LongSet? = null
+
+	var useActionMode: Boolean = true
 
 	val count: Int
-		get() = decoration.checkedItemsCount
+		get() = if (focusedItemId != null) 1 else decoration.checkedItemsCount
 
 	init {
 		registryOwner.lifecycle.addObserver(StateEventObserver())
 	}
 
-	fun snapshot(): Set<Long> = peekCheckedIds().toSet()
+	fun snapshot(): Set<Long> = (focusedItemId ?: peekCheckedIds()).toSet()
 
 	fun peekCheckedIds(): LongSet {
-		return decoration.checkedItemsIds
+		return focusedItemId ?: decoration.checkedItemsIds
 	}
 
 	fun clear() {
@@ -52,6 +59,7 @@ class ListSelectionController(
 		if (ids.isEmpty()) {
 			return
 		}
+		startActionMode()
 		decoration.checkAll(ids)
 		notifySelectionChanged()
 	}
@@ -80,15 +88,42 @@ class ListSelectionController(
 		return false
 	}
 
-	fun onItemLongClick(id: Long): Boolean {
-		return startActionMode()?.also {
-			decoration.setItemIsChecked(id, true)
-			notifySelectionChanged()
-		} != null
+	fun onItemLongClick(view: View, id: Long): Boolean {
+		return if (useActionMode) {
+			startSelection(id)
+		} else {
+			onItemContextClick(view, id)
+		}
 	}
 
+	fun onItemContextClick(view: View, id: Long): Boolean {
+		focusedItemId = longSetOf(id)
+		val menu = PopupMenu(view.context, view)
+		callback.onCreateActionMode(this, menu.menuInflater, menu.menu)
+		callback.onPrepareActionMode(this, null, menu.menu)
+		menu.setForceShowIcon(true)
+		if (menu.menu.hasVisibleItems()) {
+			menu.setOnMenuItemClickListener { menuItem ->
+				callback.onActionItemClicked(this, null, menuItem)
+			}
+			menu.setOnDismissListener {
+				focusedItemId = null
+			}
+			menu.show()
+			return true
+		} else {
+			focusedItemId = null
+			return false
+		}
+	}
+
+	fun startSelection(id: Long): Boolean = startActionMode()?.also {
+		decoration.setItemIsChecked(id, true)
+		notifySelectionChanged()
+	} != null
+
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-		return callback.onCreateActionMode(this, mode, menu)
+		return callback.onCreateActionMode(this, mode.menuInflater, menu)
 	}
 
 	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
@@ -106,6 +141,7 @@ class ListSelectionController(
 	}
 
 	private fun startActionMode(): ActionMode? {
+		focusedItemId = null
 		return actionMode ?: appCompatDelegate.startSupportActionMode(this).also {
 			actionMode = it
 		}
@@ -130,54 +166,18 @@ class ListSelectionController(
 		notifySelectionChanged()
 	}
 
-	@Deprecated("")
-	interface Callback : Callback2 {
-
-		fun onSelectionChanged(count: Int)
-
-		fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean
-
-		fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean
-
-		fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean
-
-		fun onDestroyActionMode(mode: ActionMode) = Unit
-
-		override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-			onSelectionChanged(count)
-		}
-
-		override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			return onCreateActionMode(mode, menu)
-		}
-
-		override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			return onPrepareActionMode(mode, menu)
-		}
-
-		override fun onActionItemClicked(
-			controller: ListSelectionController,
-			mode: ActionMode,
-			item: MenuItem,
-		): Boolean = onActionItemClicked(mode, item)
-
-		override fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) {
-			onDestroyActionMode(mode)
-		}
-	}
-
-	interface Callback2 {
+	interface Callback {
 
 		fun onSelectionChanged(controller: ListSelectionController, count: Int)
 
-		fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean
+		fun onCreateActionMode(controller: ListSelectionController, menuInflater: MenuInflater, menu: Menu): Boolean
 
-		fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
-			mode.title = controller.count.toString()
+		fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode?, menu: Menu): Boolean {
+			mode?.title = controller.count.toString()
 			return true
 		}
 
-		fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean
+		fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode?, item: MenuItem): Boolean
 
 		fun onDestroyActionMode(controller: ListSelectionController, mode: ActionMode) = Unit
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/OnListItemClickListener.kt

@@ -6,5 +6,7 @@ fun interface OnListItemClickListener<I> {
 
 	fun onItemClick(item: I, view: View)
 
-	fun onItemLongClick(item: I, view: View) = false
+	fun onItemLongClick(item: I, view: View): Boolean = false
+
+	fun onItemContextClick(item: I, view: View): Boolean = onItemLongClick(item, view)
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/lifecycle/PagerLifecycleDispatcher.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.ui.list.lifecycle
 
+import android.view.View
 import androidx.core.view.children
 import androidx.viewpager2.widget.ViewPager2
 import org.koitharu.kotatsu.core.util.ext.recyclerView
@@ -8,16 +9,63 @@ class PagerLifecycleDispatcher(
 	private val pager: ViewPager2,
 ) : ViewPager2.OnPageChangeCallback() {
 
+	private var pendingUpdate: OneShotLayoutListener? = null
+
 	override fun onPageSelected(position: Int) {
-		super.onPageSelected(position)
-		val rv = pager.recyclerView ?: return
-		for (child in rv.children) {
-			val wh = rv.getChildViewHolder(child) ?: continue
-			(wh as? LifecycleAwareViewHolder)?.setIsCurrent(wh.absoluteAdapterPosition == position)
-		}
+		setResumedPage(position)
 	}
 
 	fun invalidate() {
-		onPageSelected(pager.currentItem)
+		setResumedPage(pager.currentItem)
+	}
+
+	fun postInvalidate() = pager.post {
+		invalidate()
+	}
+
+	private fun setResumedPage(position: Int) {
+		pendingUpdate?.cancel()
+		pendingUpdate = null
+		var hasResumedItem = false
+		val rv = pager.recyclerView ?: return
+		if (rv.childCount == 0) {
+			return
+		}
+		for (child in rv.children) {
+			val wh = rv.getChildViewHolder(child) ?: continue
+			val isCurrent = wh.absoluteAdapterPosition == position
+			(wh as? LifecycleAwareViewHolder)?.setIsCurrent(isCurrent)
+			if (isCurrent) {
+				hasResumedItem = true
+			}
+		}
+		if (!hasResumedItem) {
+			rv.addOnLayoutChangeListener(OneShotLayoutListener(rv, position).also { pendingUpdate = it })
+		}
+	}
+
+	private inner class OneShotLayoutListener(
+		private val view: View,
+		private val targetPosition: Int,
+	) : View.OnLayoutChangeListener {
+
+		override fun onLayoutChange(
+			v: View?,
+			left: Int,
+			top: Int,
+			right: Int,
+			bottom: Int,
+			oldLeft: Int,
+			oldTop: Int,
+			oldRight: Int,
+			oldBottom: Int
+		) {
+			view.removeOnLayoutChangeListener(this)
+			setResumedPage(targetPosition)
+		}
+
+		fun cancel() {
+			view.removeOnLayoutChangeListener(this)
+		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/SortOrder.kt

@@ -2,15 +2,69 @@ package org.koitharu.kotatsu.core.ui.model
 
 import androidx.annotation.StringRes
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.SortDirection
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.model.SortOrder.ADDED
+import org.koitharu.kotatsu.parsers.model.SortOrder.ADDED_ASC
+import org.koitharu.kotatsu.parsers.model.SortOrder.ALPHABETICAL
+import org.koitharu.kotatsu.parsers.model.SortOrder.ALPHABETICAL_DESC
+import org.koitharu.kotatsu.parsers.model.SortOrder.NEWEST
+import org.koitharu.kotatsu.parsers.model.SortOrder.NEWEST_ASC
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_ASC
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_HOUR
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_MONTH
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_TODAY
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_WEEK
+import org.koitharu.kotatsu.parsers.model.SortOrder.POPULARITY_YEAR
+import org.koitharu.kotatsu.parsers.model.SortOrder.RATING
+import org.koitharu.kotatsu.parsers.model.SortOrder.RATING_ASC
+import org.koitharu.kotatsu.parsers.model.SortOrder.RELEVANCE
+import org.koitharu.kotatsu.parsers.model.SortOrder.UPDATED
+import org.koitharu.kotatsu.parsers.model.SortOrder.UPDATED_ASC
 
 @get:StringRes
 val SortOrder.titleRes: Int
 	get() = when (this) {
-		SortOrder.UPDATED -> R.string.updated
-		SortOrder.POPULARITY -> R.string.popular
-		SortOrder.RATING -> R.string.by_rating
-		SortOrder.NEWEST -> R.string.newest
-		SortOrder.ALPHABETICAL -> R.string.by_name
-		SortOrder.ALPHABETICAL_DESC -> R.string.by_name_reverse
+		UPDATED -> R.string.updated
+		POPULARITY -> R.string.popular
+		RATING -> R.string.by_rating
+		NEWEST -> R.string.newest
+		ALPHABETICAL -> R.string.by_name
+		ALPHABETICAL_DESC -> R.string.by_name_reverse
+		UPDATED_ASC -> R.string.updated_long_ago
+		POPULARITY_ASC -> R.string.unpopular
+		RATING_ASC -> R.string.low_rating
+		NEWEST_ASC -> R.string.order_oldest
+		ADDED -> R.string.recently_added
+		ADDED_ASC -> R.string.added_long_ago
+		RELEVANCE -> R.string.by_relevance
+		POPULARITY_HOUR -> R.string.popular_in_hour
+		POPULARITY_TODAY -> R.string.popular_today
+		POPULARITY_WEEK -> R.string.popular_in_week
+		POPULARITY_MONTH -> R.string.popular_in_month
+		POPULARITY_YEAR -> R.string.popular_in_year
+	}
+
+val SortOrder.direction: SortDirection
+	get() = when (this) {
+		UPDATED_ASC,
+		POPULARITY_ASC,
+		RATING_ASC,
+		NEWEST_ASC,
+		ADDED_ASC,
+		ALPHABETICAL -> SortDirection.ASC
+
+		UPDATED,
+		POPULARITY,
+		POPULARITY_HOUR,
+		POPULARITY_TODAY,
+		POPULARITY_WEEK,
+		POPULARITY_MONTH,
+		POPULARITY_YEAR,
+		RATING,
+		NEWEST,
+		ADDED,
+		RELEVANCE,
+		ALPHABETICAL_DESC -> SortDirection.DESC
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/sheet/BaseAdaptiveSheet.kt

@@ -21,22 +21,24 @@ import androidx.viewbinding.ViewBinding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.sidesheet.SideSheetDialog
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.BaseActivityEntryPoint
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import com.google.android.material.R as materialR
 
-abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
+abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment(), ExceptionResolver.Host {
 
 	private var waitingForDismissAllowingStateLoss = false
 	private var isFitToContentsDisabled = false
 
-	var viewBinding: B? = null
+	protected lateinit var exceptionResolver: ExceptionResolver
 		private set
 
-	@Deprecated("", ReplaceWith("requireViewBinding()"))
-	protected val binding: B
-		get() = requireViewBinding()
+	var viewBinding: B? = null
+		private set
 
 	protected val behavior: AdaptiveSheetBehavior?
 		get() = AdaptiveSheetBehavior.from(this)
@@ -54,6 +56,12 @@ abstract class BaseAdaptiveSheet<B : ViewBinding> : AppCompatDialogFragment() {
 		private set
 	private var lockCounter = 0
 
+	override fun onAttach(context: Context) {
+		super.onAttach(context)
+		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(context)
+		exceptionResolver = entryPoint.exceptionResolverFactory.create(this)
+	}
+
 	final override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/FadingAppbarMediator.kt

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.core.ui.util
+
+import android.view.View
+import com.google.android.material.appbar.AppBarLayout
+
+class FadingAppbarMediator(
+	private val appBarLayout: AppBarLayout,
+	private val target: View
+) : AppBarLayout.OnOffsetChangedListener {
+
+	private var isBound: Boolean = false
+
+	fun bind() {
+		if (!isBound) {
+			appBarLayout.addOnOffsetChangedListener(this)
+			isBound = true
+		}
+	}
+
+	fun unbind() {
+		if (isBound) {
+			appBarLayout.removeOnOffsetChangedListener(this)
+			isBound = false
+		}
+		target.alpha = 1f
+	}
+
+	override fun onOffsetChanged(appBarLayout: AppBarLayout?, verticalOffset: Int) {
+		val scrollRange = (appBarLayout ?: return).totalScrollRange
+		if (scrollRange <= 0) {
+			return
+		}
+
+		target.alpha = 1f + verticalOffset / (scrollRange / 2f)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/MenuInvalidator.kt

@@ -7,7 +7,5 @@ class MenuInvalidator(
 	private val host: MenuHost,
 ) : FlowCollector<Any?> {
 
-	override suspend fun emit(value: Any?) {
-		host.invalidateMenu()
-	}
+	override suspend fun emit(value: Any?) = host.invalidateMenu()
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/PopupMenuMediator.kt

@@ -4,11 +4,15 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.MenuProvider
+import org.koitharu.kotatsu.core.ui.OnContextClickListenerCompat
 import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
 
 class PopupMenuMediator(
 	private val provider: MenuProvider,
-) : View.OnLongClickListener, PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
+) : View.OnLongClickListener, OnContextClickListenerCompat, PopupMenu.OnMenuItemClickListener,
+	PopupMenu.OnDismissListener {
+
+	override fun onContextClick(v: View): Boolean = onLongClick(v)
 
 	override fun onLongClick(v: View): Boolean {
 		val menu = PopupMenu(v.context, v)

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/util/ReversibleHandle.kt

@@ -5,9 +5,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 
 fun interface ReversibleHandle {
 
@@ -23,8 +23,3 @@ fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.D
 		it.printStackTraceDebug()
 	}
 }
-
-operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {
-	this.reverse()
-	other.reverse()
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/ChipsView.kt

@@ -2,29 +2,41 @@ package org.koitharu.kotatsu.core.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.View
 import android.view.View.OnClickListener
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.core.view.children
+import coil.ImageLoader
+import coil.request.Disposable
+import coil.request.ImageRequest
+import coil.transform.RoundedCornersTransformation
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.castOrNull
-
+import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.setProgressIcon
+import org.koitharu.kotatsu.parsers.util.ifZero
+import javax.inject.Inject
 import com.google.android.material.R as materialR
 
+@AndroidEntryPoint
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
 	defStyleAttr: Int = com.google.android.material.R.attr.chipGroupStyle,
 ) : ChipGroup(context, attrs, defStyleAttr) {
 
+	@Inject
+	lateinit var coil: ImageLoader
+
 	private var isLayoutSuppressedCompat = false
 	private var isLayoutCalledOnSuppressed = false
-	private val chipOnClickListener = OnClickListener {
-		onChipClickListener?.onChipClick(it as Chip, it.tag)
-	}
+	private val chipOnClickListener = InternalChipClickListener()
 	private val chipOnCloseListener = OnClickListener {
 		val chip = it as Chip
 		val data = it.tag
@@ -38,11 +50,6 @@ class ChipsView @JvmOverloads constructor(
 			children.forEach { it.isClickable = isChipClickable }
 		}
 	var onChipCloseClickListener: OnChipCloseClickListener? = null
-		set(value) {
-			field = value
-			val isCloseIconVisible = value != null
-			children.forEach { (it as? Chip)?.isCloseIconVisible = isCloseIconVisible }
-		}
 
 	init {
 		val ta = context.obtainStyledAttributes(attrs, R.styleable.ChipsView, defStyleAttr, 0)
@@ -70,8 +77,8 @@ class ChipsView @JvmOverloads constructor(
 		suppressLayoutCompat(true)
 		try {
 			for ((i, model) in items.withIndex()) {
-				val chip = getChildAt(i) as Chip? ?: addChip()
-				bindChip(chip, model)
+				val chip = getChildAt(i) as DataChip? ?: addChip()
+				chip.bind(model)
 			}
 			if (childCount > items.size) {
 				removeViews(items.size, childCount - items.size)
@@ -81,52 +88,7 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	fun <T> getCheckedData(cls: Class<T>): Set<T> {
-		val result = LinkedHashSet<T>(childCount)
-		for (child in children) {
-			if (child is Chip && child.isChecked) {
-				result += cls.castOrNull(child.tag) ?: continue
-			}
-		}
-		return result
-	}
-
-	private fun bindChip(chip: Chip, model: ChipModel) {
-		chip.text = model.title
-		chip.isClickable = onChipClickListener != null || model.isCheckable
-		chip.isCheckable = model.isCheckable
-		if (model.icon == 0) {
-			chip.chipIcon = null
-			chip.isChipIconVisible = false
-		} else {
-			chip.setChipIconResource(model.icon)
-			chip.isChipIconVisible = true
-		}
-		chip.isChecked = model.isChecked
-		chip.isCheckedIconVisible = chip.isCheckable && model.icon == 0
-		chip.isCloseIconVisible = if (onChipCloseClickListener != null || model.isDropdown) {
-			chip.setCloseIconResource(
-				if (model.isDropdown) R.drawable.ic_expand_more else materialR.drawable.ic_m3_chip_close,
-			)
-			true
-		} else {
-			false
-		}
-		chip.tag = model.data
-	}
-
-	private fun addChip(): Chip {
-		val chip = Chip(context)
-		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
-		chip.setChipDrawable(drawable)
-		chip.isChipIconVisible = false
-		chip.setOnCloseIconClickListener(chipOnCloseListener)
-		chip.setEnsureMinTouchTargetSize(false)
-		chip.setOnClickListener(chipOnClickListener)
-		chip.isElegantTextHeight = false
-		addView(chip)
-		return chip
-	}
+	private fun addChip() = DataChip(context).also { addView(it) }
 
 	private fun suppressLayoutCompat(suppress: Boolean) {
 		isLayoutSuppressedCompat = suppress
@@ -139,15 +101,123 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	data class ChipModel(
-		val title: CharSequence,
+		val title: CharSequence? = null,
+		@StringRes val titleResId: Int = 0,
 		@DrawableRes val icon: Int = 0,
-		val isCheckable: Boolean = false,
+		val iconData: Any? = null,
 		@ColorRes val tint: Int = 0,
 		val isChecked: Boolean = false,
+		val isLoading: Boolean = false,
 		val isDropdown: Boolean = false,
+		val isCloseable: Boolean = false,
 		val data: Any? = null,
 	)
 
+	private inner class DataChip(context: Context) : Chip(context) {
+
+		private var model: ChipModel? = null
+		private var imageRequest: Disposable? = null
+
+		init {
+			val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
+			setChipDrawable(drawable)
+			isChipIconVisible = false
+			setOnCloseIconClickListener(chipOnCloseListener)
+			setEnsureMinTouchTargetSize(false)
+			setOnClickListener(chipOnClickListener)
+			isElegantTextHeight = false
+		}
+
+		fun bind(model: ChipModel) {
+			if (this.model == model) {
+				return
+			}
+			this.model = model
+
+			if (model.titleResId == 0) {
+				text = model.title
+			} else {
+				setText(model.titleResId)
+			}
+			isClickable = onChipClickListener != null
+			if (model.isChecked) {
+				isCheckable = true
+				isChecked = true
+			} else {
+				isChecked = false
+				isCheckable = false
+			}
+			bindIcon(model)
+			isCheckedIconVisible = model.isChecked
+			isCloseIconVisible = if (model.isCloseable || model.isDropdown) {
+				setCloseIconResource(
+					if (model.isDropdown) R.drawable.ic_expand_more else materialR.drawable.ic_m3_chip_close,
+				)
+				true
+			} else {
+				false
+			}
+			tag = model.data
+		}
+
+		override fun toggle() = Unit
+
+		private fun bindIcon(model: ChipModel) {
+			when {
+				model.isChecked -> {
+					imageRequest?.dispose()
+					imageRequest = null
+					chipIcon = null
+					isChipIconVisible = false
+				}
+
+				model.isLoading -> {
+					imageRequest?.dispose()
+					imageRequest = null
+					isChipIconVisible = true
+					setProgressIcon()
+				}
+
+				model.iconData != null -> {
+					val placeholder = model.icon.ifZero { materialR.drawable.navigation_empty_icon }
+					imageRequest = ImageRequest.Builder(context)
+						.data(model.iconData)
+						.crossfade(false)
+						.size(resources.getDimensionPixelSize(materialR.dimen.m3_chip_icon_size))
+						.target(ChipIconTarget(this))
+						.placeholder(placeholder)
+						.fallback(placeholder)
+						.error(placeholder)
+						.transformations(RoundedCornersTransformation(resources.getDimension(R.dimen.chip_icon_corner)))
+						.allowRgb565(true)
+						.enqueueWith(coil)
+					isChipIconVisible = true
+				}
+
+				model.icon != 0 -> {
+					imageRequest?.dispose()
+					imageRequest = null
+					setChipIconResource(model.icon)
+					isChipIconVisible = true
+				}
+
+				else -> {
+					imageRequest?.dispose()
+					imageRequest = null
+					chipIcon = null
+					isChipIconVisible = false
+				}
+			}
+		}
+	}
+
+	private inner class InternalChipClickListener : OnClickListener {
+		override fun onClick(v: View?) {
+			val chip = v as? DataChip ?: return
+			onChipClickListener?.onChipClick(chip, chip.tag)
+		}
+	}
+
 	fun interface OnChipClickListener {
 
 		fun onChipClick(chip: Chip, data: Any?)

app/src/main/kotlin/org/koitharu/kotatsu/core/util/MediatorStateFlow.kt

@@ -13,7 +13,7 @@ abstract class MediatorStateFlow<T>(initialValue: T) : StateFlow<T> {
 	final override val replayCache: List<T>
 		get() = delegate.replayCache
 
-	final override val value: T
+	override val value: T
 		get() = delegate.value
 
 	final override suspend fun collect(collector: FlowCollector<T>): Nothing {

app/src/main/kotlin/org/koitharu/kotatsu/core/util/MultiMutex.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
-class MultiMutex<T : Any> : Set<T> {
+open class MultiMutex<T : Any> : Set<T> {
 
 	private val delegates = ArrayMap<T, Mutex>()
 
@@ -20,19 +20,26 @@ class MultiMutex<T : Any> : Set<T> {
 		elements.all { x -> delegates.containsKey(x) }
 	}
 
-	override fun isEmpty(): Boolean {
-		return delegates.isEmpty()
+	override fun isEmpty(): Boolean = delegates.isEmpty()
+
+	override fun iterator(): Iterator<T> = synchronized(delegates) {
+		delegates.keys.toList()
+	}.iterator()
+
+	fun isLocked(element: T): Boolean = synchronized(delegates) {
+		delegates[element]?.isLocked == true
 	}
 
-	override fun iterator(): Iterator<T> {
-		return delegates.keys.iterator()
+	fun tryLock(element: T): Boolean {
+		val mutex = synchronized(delegates) {
+			delegates.getOrPut(element, ::Mutex)
+		}
+		return mutex.tryLock()
 	}
 
 	suspend fun lock(element: T) {
 		val mutex = synchronized(delegates) {
-			delegates.getOrPut(element) {
-				Mutex()
-			}
+			delegates.getOrPut(element, ::Mutex)
 		}
 		mutex.lock()
 	}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/TaggedActivityResult.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import android.app.Activity
-
-class TaggedActivityResult(
-	val tag: String,
-	val result: Int,
-) {
-
-	val isSuccess: Boolean
-		get() = result == Activity.RESULT_OK
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Android.kt

@@ -20,7 +20,6 @@ import android.database.SQLException
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.ConnectivityManager
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
@@ -31,7 +30,6 @@ import android.view.Window
 import android.webkit.WebView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
-import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDialog
@@ -79,8 +77,6 @@ val Context.powerManager: PowerManager?
 val Context.connectivityManager: ConnectivityManager
 	get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
-
 suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatchingCancellable {
 	val info = getForegroundInfo()
 	setForeground(info)
@@ -131,8 +127,7 @@ fun SyncResult.onError(error: Throwable) {
 	when (error) {
 		is IOException -> stats.numIoExceptions++
 		is OperationApplicationException,
-		is SQLException,
-		-> databaseError = true
+		is SQLException -> databaseError = true
 
 		is JSONException -> stats.numParseExceptions++
 		else -> if (BuildConfig.DEBUG) throw error
@@ -253,7 +248,6 @@ fun Context.checkNotificationPermission(channelId: String?): Boolean {
 	return hasPermission
 }
 
-@WorkerThread
 suspend fun Bitmap.compressToPNG(output: File) = runInterruptible(Dispatchers.IO) {
 	output.outputStream().use { os ->
 		if (!compress(Bitmap.CompressFormat.PNG, 100, os)) {

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/BottomSheet.kt

@@ -1,23 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-import android.view.View
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
-
-fun BottomSheetBehavior<*>.doOnExpansionsChanged(callback: (isExpanded: Boolean) -> Unit) {
-	var isExpended = state == BottomSheetBehavior.STATE_EXPANDED
-	callback(isExpended)
-	addBottomSheetCallback(
-		object : BottomSheetCallback() {
-			override fun onStateChanged(bottomSheet: View, newState: Int) {
-				val expanded = newState == BottomSheetBehavior.STATE_EXPANDED
-				if (expanded != isExpended) {
-					isExpended = expanded
-					callback(expanded)
-				}
-			}
-
-			override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
-		},
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Bundle.kt

@@ -12,6 +12,7 @@ import androidx.core.os.BundleCompat
 import androidx.core.os.ParcelCompat
 import androidx.lifecycle.SavedStateHandle
 import java.io.Serializable
+import java.util.EnumSet
 
 // https://issuetracker.google.com/issues/240585930
 
@@ -53,6 +54,31 @@ inline fun <reified T : Serializable> Bundle.requireSerializable(key: String): T
 	}
 }
 
+fun <E : Enum<E>> Parcel.writeEnumSet(set: Set<E>?) {
+	if (set == null) {
+		writeValue(null)
+	} else {
+		val array = IntArray(set.size)
+		set.forEachIndexed { i, e -> array[i] = e.ordinal }
+		writeIntArray(array)
+	}
+}
+
+inline fun <reified E : Enum<E>> Parcel.readEnumSet(): Set<E>? = readEnumSet(E::class.java)
+
+fun <E : Enum<E>> Parcel.readEnumSet(cls: Class<E>): Set<E>? {
+	val array = createIntArray() ?: return null
+	if (array.isEmpty()) {
+		return emptySet()
+	}
+	val enumValues = cls.enumConstants ?: return null
+	val set = EnumSet.noneOf(cls)
+	array.forEach { e ->
+		set.add(enumValues[e])
+	}
+	return set
+}
+
 fun <T> SavedStateHandle.require(key: String): T {
 	return checkNotNull(get(key)) {
 		"Value $key not found in SavedStateHandle or has a wrong type"

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Coil.kt

@@ -57,10 +57,6 @@ fun ImageResult.toBitmapOrNull() = when (this) {
 	is ErrorResult -> null
 }
 
-fun ImageRequest.Builder.indicator(indicator: BaseProgressIndicator<*>): ImageRequest.Builder {
-	return addListener(ImageRequestIndicatorListener(listOf(indicator)))
-}
-
 fun ImageRequest.Builder.indicator(indicators: List<BaseProgressIndicator<*>>): ImageRequest.Builder {
 	return addListener(ImageRequestIndicatorListener(indicators))
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Collections.kt

@@ -25,6 +25,12 @@ fun <T> Collection<T>.asArrayList(): ArrayList<T> = if (this is ArrayList<*>) {
 	ArrayList(this)
 }
 
+fun <E : Enum<E>> Set<E>.asEnumSet(cls: Class<E>): EnumSet<E> = if (this is EnumSet<*>) {
+	this as EnumSet<E>
+} else {
+	EnumSet.noneOf(cls).apply { addAll(this@asEnumSet) }
+}
+
 fun <K, V> Map<K, V>.findKeyByValue(value: V): K? {
 	for ((k, v) in entries) {
 		if (v == value) {
@@ -91,3 +97,14 @@ fun LongSet.toSet(): Set<Long> = toCollection(ArraySet<Long>(size))
 fun <R : MutableCollection<Long>> LongSet.toCollection(out: R): R = out.also { result ->
 	forEach(result::add)
 }
+
+fun <T, R> Collection<T>.mapSortedByCount(isDescending: Boolean = true, mapper: (T) -> R): List<R> {
+	val grouped = groupBy(mapper).toList()
+	val sortSelector: (Pair<R, List<T>>) -> Int = { it.second.size }
+	val sorted = if (isDescending) {
+		grouped.sortedByDescending(sortSelector)
+	} else {
+		grouped.sortedBy(sortSelector)
+	}
+	return sorted.map { it.first }
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Date.kt

@@ -1,11 +1,14 @@
 package org.koitharu.kotatsu.core.util.ext
 
+import android.content.res.Resources
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
 import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.temporal.ChronoUnit
+import java.util.concurrent.TimeUnit
 
 fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo {
 	// TODO: Use Java 9's LocalDate.ofInstant().
@@ -33,3 +36,17 @@ fun calculateTimeAgo(instant: Instant, showMonths: Boolean = false): DateTimeAgo
 }
 
 fun Long.toInstantOrNull() = if (this == 0L) null else Instant.ofEpochMilli(this)
+
+fun Resources.formatDurationShort(millis: Long): String? {
+	val hours = TimeUnit.MILLISECONDS.toHours(millis).toInt()
+	val minutes = (TimeUnit.MILLISECONDS.toMinutes(millis) % 60).toInt()
+	val seconds = (TimeUnit.MILLISECONDS.toSeconds(millis) % 60).toInt()
+	return when {
+		hours == 0 && minutes == 0 && seconds == 0 -> null
+		hours != 0 && minutes != 0 -> getString(R.string.hours_minutes_short, hours, minutes)
+		hours != 0 -> getString(R.string.hours_short, hours)
+		minutes != 0 && seconds != 0 -> getString(R.string.minutes_seconds_short, minutes, seconds)
+		minutes != 0 -> getString(R.string.minutes_short, minutes)
+		else -> getString(R.string.seconds_short, seconds)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/File.kt

@@ -10,10 +10,13 @@ import android.provider.OpenableColumns
 import androidx.core.database.getStringOrNull
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
+import okhttp3.internal.closeQuietly
+import org.jetbrains.annotations.Blocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.fs.FileSequence
 import java.io.File
 import java.io.FileFilter
+import java.io.InputStream
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
@@ -32,10 +35,19 @@ fun File.takeIfWriteable() = takeIf { it.exists() && it.canWrite() }
 
 fun File.isNotEmpty() = length() != 0L
 
+@Blocking
 fun ZipFile.readText(entry: ZipEntry) = getInputStream(entry).bufferedReader().use {
 	it.readText()
 }
 
+@Blocking
+fun ZipFile.getInputStreamOrClose(entry: ZipEntry): InputStream = try {
+	getInputStream(entry)
+} catch (e: Throwable) {
+	closeQuietly()
+	throw e
+}
+
 fun File.getStorageName(context: Context): String = runCatching {
 	val manager = context.getSystemService(Context.STORAGE_SERVICE) as StorageManager
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {