Fix CloudFlare protection detection (close #1129)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Serbian)

Currently translated at 96.4% (703 of 729 strings)

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

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
     - name: ⚠️ Source issue
       url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new
-      about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead
+      about: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -60,7 +60,7 @@ body:
       attributes:
           label: Acknowledgements
           options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
                 required: true
-              - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
+              - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
                 required: true

.github/ISSUE_TEMPLATE/request_feature.yml

@@ -20,5 +20,5 @@ body:
           label: Acknowledgements
           description: Read this carefully, we will close and ignore your issue if you skimmed through this.
           options:
-              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+              - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one.
-                required: true
+                required: true

.gitignore

@@ -24,3 +24,5 @@
 /captures
 .externalNativeBuild
 .cxx
+/.idea/deviceManager.xml
+/.kotlin/

.idea/.gitignore

@@ -2,3 +2,4 @@
 /shelf/
 /workspace.xml
 /migrations.xml
+/runConfigurations.xml

.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

@@ -1,8 +1,8 @@
 # Kotatsu
 
-Kotatsu is a free and open source manga reader for Android.
+Kotatsu is a free and open-source manga reader for Android with built-in online content sources.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+[![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
 
 ### Download
 
@@ -12,16 +12,15 @@ Kotatsu is a free and open source manga reader for Android.
 ### Main Features
 
 * Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
-* Search manga by name and genres
+* Search manga by name, genres, and more filters
 * Reading history and bookmarks
-* Favourites organized by user-defined categories
+* Favorites organized by user-defined categories
 * Downloading manga and reading it offline. Third-party CBZ archives also supported
 * Tablet-optimized Material You UI
-* Standard and Webtoon-optimized reader
+* Standard and Webtoon-optimized customizable reader
 * Notifications about new chapters with updates feed
 * Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
-* Password/fingerprint protect access to the app
+* Password/fingerprint-protected access to the app
-* History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 
 ### Screenshots
 
@@ -53,5 +52,5 @@ install instructions.
 
 ### DMCA disclaimer
 
-The developers of this application does not have any affiliation with the content available in the app.
+The developers of this application do not have any affiliation with the content available in the app.
-It is collecting from the sources freely available through any web browser.
+It collects content from sources that are freely available through any web browser

app/build.gradle

@@ -8,16 +8,16 @@ plugins {
 }
 
 android {
-	compileSdk = 34
+	compileSdk = 35
-	buildToolsVersion = '34.0.0'
+	buildToolsVersion = '35.0.0'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
-		targetSdk = 34
+		targetSdk = 35
-		versionCode = 630
+		versionCode = 676
-		versionName = '6.8'
+		versionName = '7.6.3'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -48,14 +48,15 @@ android {
 	}
 	compileOptions {
 		coreLibraryDesugaringEnabled true
-		sourceCompatibility JavaVersion.VERSION_1_8
+		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_1_8
+		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',
@@ -63,7 +64,7 @@ android {
 	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
+		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -81,36 +82,36 @@ afterEvaluate {
 	}
 }
 dependencies {
-	//noinspection GradleDependency
+	implementation('com.github.KotatsuApp:kotatsu-parsers:1ebb298cd7') {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:639895f511') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.20'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
 
-	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.appcompat:appcompat:1.7.0'
-	implementation 'androidx.core:core-ktx:1.12.0'
+	implementation 'androidx.core:core-ktx:1.13.1'
-	implementation 'androidx.activity:activity-ktx:1.8.2'
+	implementation 'androidx.activity:activity-ktx:1.9.2'
-	implementation 'androidx.fragment:fragment-ktx:1.6.2'
+	implementation 'androidx.fragment:fragment-ktx:1.8.4'
-	implementation 'androidx.collection:collection-ktx:1.4.0'
+	implementation 'androidx.transition:transition-ktx:1.5.1'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+	implementation 'androidx.collection:collection-ktx:1.4.4'
-	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
-	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
+	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'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0'
 	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-alpha03'
+	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.6'
-	implementation 'androidx.webkit:webkit:1.10.0'
+	implementation 'androidx.webkit:webkit:1.11.0'
 
-	implementation 'androidx.work:work-runtime:2.9.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'
@@ -121,46 +122,46 @@ dependencies {
 	ksp 'androidx.room:room-compiler:2.6.1'
 
 	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'
+	implementation 'com.google.dagger:hilt-android:2.52'
-	kapt 'com.google.dagger:hilt-compiler:2.51'
+	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.6.0'
+	implementation 'io.coil-kt:coil-base:2.7.0'
-	implementation 'io.coil-kt:coil-svg:2.6.0'
+	implementation 'io.coil-kt:coil-svg:2.7.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:e04098de68'
 	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-http:5.11.4'
-	implementation 'ch.acra:acra-dialog:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.4'
-	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
-	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
 	implementation 'org.conscrypt:conscrypt-android:2.5.2'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
+	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.0'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0'
 
-	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:runner:1.6.1'
-	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test:rules:1.6.1'
-	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.6.1'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
+	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'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.52'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51'
+	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) }
-		repository.syncWithHistory(mangaFull, chapter.id)
-
-		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
-
-		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
-		repository.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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu
 
 import android.content.Context
+import android.os.Build
 import android.os.StrictMode
 import androidx.fragment.app.strictmode.FragmentStrictMode
 import org.koitharu.kotatsu.core.BaseApp
@@ -8,38 +9,65 @@ 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() {
 
-	override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		enableStrictMode()
 	}
 
 	private fun enableStrictMode() {
+		val notifier = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+			StrictModeNotifier(this)
+		} else {
+			null
+		}
 		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
+			StrictMode.ThreadPolicy.Builder().apply {
-				.detectAll()
+				detectNetwork()
-				.penaltyLog()
+				detectDiskWrites()
-				.build(),
+				detectCustomSlowCalls()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectUnbufferedIo()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) detectResourceMismatches()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) detectExplicitGc()
+				penaltyLog()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
+					penaltyListener(notifier.executor, notifier)
+				}
+			}.build(),
 		)
 		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
+			StrictMode.VmPolicy.Builder().apply {
-				.detectAll()
+				detectActivityLeaks()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				detectLeakedSqlLiteObjects()
-				.setClassInstanceLimit(PagesCache::class.java, 1)
+				detectLeakedClosableObjects()
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				detectLeakedRegistrationObjects()
-				.setClassInstanceLimit(PageLoader::class.java, 1)
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectContentUriWithoutPermission()
-				.penaltyLog()
+				detectFileUriExposure()
-				.build(),
+				setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				setClassInstanceLimit(PagesCache::class.java, 1)
+				setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				setClassInstanceLimit(PageLoader::class.java, 1)
+				setClassInstanceLimit(ReaderViewModel::class.java, 1)
+				penaltyLog()
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
+					penaltyListener(notifier.executor, notifier)
+				}
+			}.build()
 		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
-			.penaltyDeath()
+			detectWrongFragmentContainer()
-			.detectFragmentReuse()
+			detectFragmentTagUsage()
-			.detectWrongFragmentContainer()
+			detectRetainInstanceUsage()
-			.detectRetainInstanceUsage()
+			detectSetUserVisibleHint()
-			.detectSetUserVisibleHint()
+			detectWrongNestedHierarchy()
-			.detectFragmentTagUsage()
+			detectFragmentReuse()
-			.build()
+			penaltyLog()
+			if (notifier != null) {
+				penaltyListener(notifier)
+			}
+		}.build()
 	}
 }

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

@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu
+
+import android.app.Notification
+import android.app.Notification.BigTextStyle
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import android.os.StrictMode
+import android.os.strictmode.Violation
+import androidx.annotation.RequiresApi
+import androidx.core.content.getSystemService
+import androidx.fragment.app.strictmode.FragmentStrictMode
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+import org.koitharu.kotatsu.core.ErrorReporterReceiver
+import kotlin.math.absoluteValue
+import androidx.fragment.app.strictmode.Violation as FragmentViolation
+
+@RequiresApi(Build.VERSION_CODES.P)
+class StrictModeNotifier(
+	private val context: Context,
+) : StrictMode.OnVmViolationListener, StrictMode.OnThreadViolationListener, FragmentStrictMode.OnViolationListener {
+
+	val executor = Dispatchers.Default.asExecutor()
+
+	private val notificationManager by lazy {
+		val nm = checkNotNull(context.getSystemService<NotificationManager>())
+		val channel = NotificationChannel(
+			CHANNEL_ID,
+			context.getString(R.string.strict_mode),
+			NotificationManager.IMPORTANCE_LOW,
+		)
+		nm.createNotificationChannel(channel)
+		nm
+	}
+
+	override fun onVmViolation(v: Violation) = showNotification(v)
+
+	override fun onThreadViolation(v: Violation) = showNotification(v)
+
+	override fun onViolation(violation: FragmentViolation) = showNotification(violation)
+
+	private fun showNotification(violation: Throwable) = Notification.Builder(context, CHANNEL_ID)
+		.setSmallIcon(android.R.drawable.stat_notify_error)
+		.setContentTitle(context.getString(R.string.strict_mode))
+		.setContentText(violation.message)
+		.setStyle(
+			BigTextStyle()
+				.setBigContentTitle(context.getString(R.string.strict_mode))
+				.setSummaryText(violation.message)
+				.bigText(violation.stackTraceToString()),
+		).setShowWhen(true)
+		.setContentIntent(ErrorReporterReceiver.getPendingIntent(context, violation))
+		.setAutoCancel(true)
+		.setGroup(CHANNEL_ID)
+		.build()
+		.let { notificationManager.notify(CHANNEL_ID, violation.hashCode().absoluteValue, it) }
+
+	private companion object {
+
+		const val CHANNEL_ID = "strict_mode"
+	}
+}

app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/Debug.kt

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.util.ext
+
+import android.os.Looper
+
+fun Throwable.printStackTraceDebug() = printStackTrace()
+
+fun assertNotInMainThread() = check(Looper.myLooper() != Looper.getMainLooper()) {
+	"Calling this from the main thread is prohibited"
+}

app/src/debug/kotlin/org/koitharu/kotatsu/core/util/ext/DebugExt.kt

@@ -1,3 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-fun Throwable.printStackTraceDebug() = printStackTrace()

app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.settings
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import leakcanary.LeakCanary
+import org.koitharu.kotatsu.R
+import org.koitharu.workinspector.WorkInspector
+
+class SettingsMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_settings, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_leaks -> {
+			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
+			true
+		}
+
+		R.id.action_works -> {
+			context.startActivity(WorkInspector.getIntent(context))
+			true
+		}
+
+		else -> false
+	}
+}

app/src/debug/res/menu/opt_settings.xml

@@ -8,4 +8,9 @@
 		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />
 
-</menu>
+	<item
+		android:id="@id/action_works"
+		android:title="@string/wi_lib_name"
+		app:showAsAction="never" />
+
+</menu>

app/src/debug/res/values/bools.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<bool name="leak_canary_add_launcher_icon" tools:node="replace">false</bool>
+	<bool name="wi_launcher_icon_enabled" tools:node="replace">false</bool>
 </resources>

app/src/debug/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
 	<string name="app_name" translatable="false">Kotatsu Dev</string>
-</resources>
+	<string name="strict_mode">Strict mode</string>
+</resources>

app/src/main/assets/isrgrootx1.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----

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

@@ -12,19 +12,23 @@ import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 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()
@@ -33,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)
 						}
 					}
@@ -57,29 +61,31 @@ class AlternativesUseCase @Inject constructor(
 	}
 
 	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
-		val result = ArrayList<MangaSource>(MangaSource.entries.size - 2)
+		val result = ArrayList<MangaSource>(MangaParserSource.entries.size - 2)
 		result.addAll(sourcesRepository.getEnabledSources())
 		result.sortByDescending { it.priority(ref) }
 		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
 		return result
 	}
 
-	private fun Manga.matches(ref: Manga): Boolean {
+	private fun Manga.matches(ref: Manga, threshold: Float): Boolean {
-		return matchesTitles(title, ref.title) ||
+		return matchesTitles(title, ref.title, threshold) ||
-			matchesTitles(title, ref.altTitle) ||
+			matchesTitles(title, ref.altTitle, threshold) ||
-			matchesTitles(altTitle, ref.title) ||
+			matchesTitles(altTitle, ref.title, threshold) ||
-			matchesTitles(altTitle, ref.altTitle)
+			matchesTitles(altTitle, ref.altTitle, threshold)
 
 	}
 
-	private fun matchesTitles(a: String?, b: String?): Boolean {
+	private fun matchesTitles(a: String?, b: String?, threshold: Float): Boolean {
-		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
+		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, threshold)
 	}
 
 	private fun MangaSource.priority(ref: MangaSource): Int {
 		var res = 0
-		if (locale == ref.locale) res += 2
+		if (this is MangaParserSource && ref is MangaParserSource) {
-		if (contentType == ref.contentType) res++
+			if (locale == ref.locale) res += 2
+			if (contentType == ref.contentType) res++
+		}
 		return res
 	}
 }

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

@@ -5,63 +5,115 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.details.domain.DetailsLoadUseCase
 import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 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
+import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
+import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingStatus
+import org.koitharu.kotatsu.tracker.data.TrackEntity
 import javax.inject.Inject
 
-class MigrateUseCase @Inject constructor(
+class MigrateUseCase
+@Inject
+constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val mangaDataRepository: MangaDataRepository,
 	private val database: MangaDatabase,
 	private val progressUpdateUseCase: ProgressUpdateUseCase,
-	private val useCase: DetailsLoadUseCase
+	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
 ) {
-
+	suspend operator fun invoke(
-	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
+		oldManga: Manga,
-		val oldDetails = if (oldManga.chapters.isNullOrEmpty()) {
+		newManga: Manga,
-			runCatchingCancellable {
+	) {
-				mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
+		val oldDetails =
-			}.getOrDefault(oldManga)
+			if (oldManga.chapters.isNullOrEmpty()) {
-		} else {
+				runCatchingCancellable {
-			oldManga
+					mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
-		}
+				}.getOrDefault(oldManga)
-		val newDetails = if (newManga.chapters.isNullOrEmpty()) {
+			} else {
-			mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+				oldManga
-		} else {
+			}
-			newManga
+		val newDetails =
-		}
+			if (newManga.chapters.isNullOrEmpty()) {
+				mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+			} else {
+				newManga
+			}
 		mangaDataRepository.storeManga(newDetails)
 		database.withTransaction {
 			// replace favorites
 			val favoritesDao = database.getFavouritesDao()
-			val oldFavourite = favoritesDao.find(oldDetails.id)
+			val oldFavourites = favoritesDao.findAllRaw(oldDetails.id)
-			if (oldFavourite != null) {
+			if (oldFavourites.isNotEmpty()) {
 				favoritesDao.delete(oldManga.id)
-				for (f in oldFavourite.categories) {
+				for (f in oldFavourites) {
-					val e = FavouriteEntity(
+					val e =
-						mangaId = newManga.id,
+						f.copy(
-						categoryId = f.categoryId.toLong(),
+							mangaId = newManga.id,
-						sortKey = f.sortKey,
+						)
-						createdAt = f.createdAt,
-						deletedAt = 0,
-					)
 					favoritesDao.upsert(e)
 				}
 			}
 			// replace history
 			val historyDao = database.getHistoryDao()
 			val oldHistory = historyDao.find(oldDetails.id)
-			if (oldHistory != null) {
+			val newHistory =
-				val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
+				if (oldHistory != null) {
-				historyDao.delete(oldDetails.id)
+					val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
-				historyDao.upsert(newHistory)
+					historyDao.delete(oldDetails.id)
+					historyDao.upsert(newHistory)
+					newHistory
+				} else {
+					null
+				}
+			// track
+			val tracksDao = database.getTracksDao()
+			val oldTrack = tracksDao.find(oldDetails.id)
+			if (oldTrack != null) {
+				val lastChapter = newDetails.chapters?.lastOrNull()
+				val newTrack =
+					TrackEntity(
+						mangaId = newDetails.id,
+						lastChapterId = lastChapter?.id ?: 0L,
+						newChapters = 0,
+						lastCheckTime = System.currentTimeMillis(),
+						lastChapterDate = lastChapter?.uploadDate ?: 0L,
+						lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+						lastError = null,
+					)
+				tracksDao.delete(oldDetails.id)
+				tracksDao.upsert(newTrack)
+			}
+			// scrobbling
+			for (scrobbler in scrobblers) {
+				if (!scrobbler.isEnabled) {
+					continue
+				}
+				val prevInfo = scrobbler.getScrobblingInfoOrNull(oldDetails.id) ?: continue
+				scrobbler.unregisterScrobbling(oldDetails.id)
+				scrobbler.linkManga(newDetails.id, prevInfo.targetId)
+				scrobbler.updateScrobblingInfo(
+					mangaId = newDetails.id,
+					rating = prevInfo.rating,
+					status =
+					prevInfo.status ?: when {
+						newHistory == null -> ScrobblingStatus.PLANNED
+						newHistory.percent == 1f -> ScrobblingStatus.COMPLETED
+						else -> ScrobblingStatus.READING
+					},
+					comment = prevInfo.comment,
+				)
+				if (newHistory != null) {
+					scrobbler.scrobble(
+						manga = newDetails,
+						chapterId = newHistory.chapterId,
+					)
+				}
 			}
 		}
 		progressUpdateUseCase(newManga)
@@ -75,48 +127,53 @@ class MigrateUseCase @Inject constructor(
 		if (oldManga.chapters.isNullOrEmpty()) { // probably broken manga/source
 			val branch = newManga.getPreferredBranch(null)
 			val chapters = checkNotNull(newManga.getChapters(branch))
-			val currentChapter = if (history.percent in 0f..1f) {
+			val currentChapter =
-				chapters[(chapters.lastIndex * history.percent).toInt()]
+				if (history.percent in 0f..1f) {
-			} else {
+					chapters[(chapters.lastIndex * history.percent).toInt()]
-				chapters.first()
+				} else {
-			}
+					chapters.first()
+				}
 			return HistoryEntity(
 				mangaId = newManga.id,
 				createdAt = history.createdAt,
-				updatedAt = System.currentTimeMillis(),
+				updatedAt = history.updatedAt,
 				chapterId = currentChapter.id,
 				page = history.page,
 				scroll = history.scroll,
 				percent = history.percent,
 				deletedAt = 0,
-				chaptersCount = chapters.size,
+				chaptersCount = chapters.count { it.branch == currentChapter.branch },
 			)
 		}
 		val branch = oldManga.getPreferredBranch(history.toMangaHistory())
 		val oldChapters = checkNotNull(oldManga.getChapters(branch))
 		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
 		if (index < 0) {
-			index = if (history.percent in 0f..1f) {
+			index =
-				(oldChapters.lastIndex * history.percent).toInt()
+				if (history.percent in 0f..1f) {
-			} else {
+					(oldChapters.lastIndex * history.percent).toInt()
-				0
+				} else {
-			}
+					0
+				}
 		}
 		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
-		val newBranch = if (newChapters.containsKey(branch)) {
+		val newBranch =
-			branch
+			if (newChapters.containsKey(branch)) {
-		} else {
+				branch
-			newManga.getPreferredBranch(null)
+			} else {
-		}
+				newManga.getPreferredBranch(null)
-		val newChapterId = checkNotNull(newChapters[newBranch]).let {
+			}
-			val oldChapter = oldChapters[index]
+		val newChapterId =
-			it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
+			checkNotNull(newChapters[newBranch])
-		}.id
+				.let {
+					val oldChapter = oldChapters[index]
+					it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
+				}.id
 
 		return HistoryEntity(
 			mangaId = newManga.id,
 			createdAt = history.createdAt,
-			updatedAt = System.currentTimeMillis(),
+			updatedAt = history.updatedAt,
 			chapterId = newChapterId,
 			page = history.page,
 			scroll = history.scroll,
@@ -126,11 +183,13 @@ class MigrateUseCase @Inject constructor(
 		)
 	}
 
-	private fun List<MangaChapter>.findByNumber(volume: Int, number: Float): MangaChapter? {
+	private fun List<MangaChapter>.findByNumber(
-		return if (number <= 0f) {
+		volume: Int,
+		number: Float,
+	): MangaChapter? =
+		if (number <= 0f) {
 			null
 		} else {
 			firstOrNull { it.volume == volume && it.number == number }
 		}
-	}
 }

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

@@ -7,15 +7,17 @@ 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
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -60,9 +62,9 @@ fun alternativeAD(
 				}
 			}
 		}
-		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
+		binding.progressView.setProgress(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.title
+			chip.text = item.manga.source.getTitle(chip.context)
 			ImageRequest.Builder(context)
 				.data(item.manga.source.faviconUri())
 				.lifecycle(lifecycleOwner)
@@ -73,15 +75,13 @@ 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)
 		}
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
 			size(CoverSizeResolver(binding.imageViewCover))
-			placeholder(R.drawable.ic_placeholder)
+			defaultPlaceholders(context)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
 			transformations(TrimTransformation())
 			allowRgb565(true)
 			tag(item.manga)

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

@@ -9,16 +9,16 @@ 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
+import org.koitharu.kotatsu.core.model.getTitle
 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
@@ -30,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
@@ -81,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)
+		buildAlertDialog(this, isCentered = true) {
-			.setIcon(R.drawable.ic_replace)
+			setIcon(R.drawable.ic_replace)
-			.setTitle(R.string.manga_migration)
+			setTitle(R.string.manga_migration)
-			.setMessage(
+			setMessage(
 				getString(
 					R.string.migrate_confirmation,
 					viewModel.manga.title,
-					viewModel.manga.source.title,
+					viewModel.manga.source.getTitle(context),
 					target.title,
-					target.source.title,
+					target.source.getTitle(context),
 				),
 			)
-			.setNegativeButton(android.R.string.cancel, null)
+			setNegativeButton(android.R.string.cancel, null)
-			.setPositiveButton(R.string.migrate) { _, _ ->
+			setPositiveButton(R.string.migrate) { _, _ ->
 				viewModel.migrate(target)
-			}.show()
+			}
+		}.show()
 	}
 
 	companion object {

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

@@ -15,11 +15,13 @@ import org.koitharu.kotatsu.core.model.chaptersCount
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.list.domain.ReadingProgress
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingFooter
@@ -34,7 +36,8 @@ class AlternativesViewModel @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val alternativesUseCase: AlternativesUseCase,
 	private val migrateUseCase: MigrateUseCase,
-	private val extraProvider: ListExtraProvider,
+	private val historyRepository: HistoryRepository,
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
@@ -53,7 +56,7 @@ class AlternativesViewModel @Inject constructor(
 				.map {
 					MangaAlternativeModel(
 						manga = it,
-						progress = extraProvider.getProgress(it.id),
+						progress = getProgress(it.id),
 						referenceChapters = refCount,
 					)
 				}.runningFold<MangaAlternativeModel, List<ListModel>>(listOf(LoadingState)) { acc, item ->
@@ -86,13 +89,7 @@ class AlternativesViewModel @Inject constructor(
 		}
 	}
 
-	private suspend fun mapList(list: List<Manga>, refCount: Int): List<MangaAlternativeModel> {
+	private suspend fun getProgress(mangaId: Long): ReadingProgress? {
-		return list.map {
+		return historyRepository.getProgress(mangaId, settings.progressIndicatorMode)
-			MangaAlternativeModel(
-				manga = it,
-				progress = extraProvider.getProgress(it.id),
-				referenceChapters = refCount,
-			)
-		}
 	}
 }

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

@@ -0,0 +1,197 @@
+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)
+			ErrorReporterReceiver.getPendingIntent(applicationContext, error)?.let { reportIntent ->
+				notification.addAction(
+					R.drawable.ic_alert_outline,
+					applicationContext.getString(R.string.report),
+					reportIntent,
+				)
+			}
+		}
+		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/alternatives/ui/MangaAlternativeModel.kt

@@ -1,12 +1,13 @@
 package org.koitharu.kotatsu.alternatives.ui
 
 import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.list.domain.ReadingProgress
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
 data class MangaAlternativeModel(
 	val manga: Manga,
-	val progress: Float,
+	val progress: ReadingProgress?,
 	private val referenceChapters: Int,
 ) : ListModel {
 

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt

@@ -12,9 +12,6 @@ import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 @Dao
 abstract class BookmarksDao {
 
-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
-
 	@Query("SELECT * FROM bookmarks WHERE page_id = :pageId")
 	abstract suspend fun find(pageId: Long): BookmarkEntity?
 
@@ -42,9 +39,6 @@ abstract class BookmarksDao {
 	@Delete
 	abstract suspend fun delete(entity: BookmarkEntity)
 
-	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
-	abstract suspend fun delete(mangaId: Long, pageId: Long): Int
-
 	@Query("DELETE FROM bookmarks WHERE page_id = :pageId")
 	abstract suspend fun delete(pageId: Long): Int
 

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/domain/Bookmark.kt

@@ -17,9 +17,6 @@ data class Bookmark(
 	val percent: Float,
 ) : ListModel {
 
-	val directImageUrl: String?
-		get() = if (isImageUrlDirect()) imageUrl else null
-
 	val imageLoadData: Any
 		get() = if (isImageUrlDirect()) imageUrl else toMangaPage()
 

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

@@ -16,7 +16,7 @@ import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 
 @AndroidEntryPoint
-class BookmarksActivity :
+class AllBookmarksActivity :
 	BaseActivity<ActivityContainerBinding>(),
 	AppBarOwner,
 	SnackbarOwner {
@@ -35,7 +35,7 @@ class BookmarksActivity :
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
 				setReorderingAllowed(true)
-				replace(R.id.container, BookmarksFragment::class.java, null)
+				replace(R.id.container, AllBookmarksFragment::class.java, null)
 			}
 		}
 	}
@@ -49,6 +49,6 @@ class BookmarksActivity :
 
 	companion object {
 
-		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+		fun newIntent(context: Context) = Intent(context, AllBookmarksActivity::class.java)
 	}
 }

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
@@ -17,7 +18,7 @@ import coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
@@ -25,11 +26,12 @@ import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.list.ui.GridSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -41,11 +43,11 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class BookmarksFragment :
+class AllBookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
-	ListSelectionController.Callback2,
+	ListSelectionController.Callback,
 	FastScroller.FastScrollListener, ListHeaderClickListener {
 
 	@Inject
@@ -54,7 +56,7 @@ class BookmarksFragment :
 	@Inject
 	lateinit var settings: AppSettings
 
-	private val viewModel by viewModels<BookmarksViewModel>()
+	private val viewModel by viewModels<AllBookmarksViewModel>()
 	private var bookmarksAdapter: BookmarksAdapter? = null
 	private var selectionController: ListSelectionController? = null
 
@@ -71,7 +73,7 @@ class BookmarksFragment :
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		selectionController = ListSelectionController(
-			activity = requireActivity(),
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
 			decoration = BookmarksSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
@@ -85,7 +87,7 @@ class BookmarksFragment :
 		val spanSizeLookup = SpanSizeLookup()
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
-			val spanResolver = MangaListSpanResolver(resources)
+			val spanResolver = GridSpanResolver(resources)
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
@@ -100,7 +102,7 @@ class BookmarksFragment :
 		}
 		viewModel.onError.observeEvent(
 			viewLifecycleOwner,
-			SnackbarErrorObserver(binding.recyclerView, this)
+			SnackbarErrorObserver(binding.recyclerView, this),
 		)
 		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}
@@ -128,7 +130,11 @@ class BookmarksFragment :
 	}
 
 	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
@@ -147,23 +153,23 @@ class BookmarksFragment :
 
 	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
 			}
 
@@ -206,11 +212,12 @@ class BookmarksFragment :
 	companion object {
 
 		@Deprecated(
-			"", ReplaceWith(
+			"",
+			ReplaceWith(
 				"BookmarksFragment()",
-				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment"
+				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment",
-			)
+			),
 		)
-		fun newInstance() = BookmarksFragment()
+		fun newInstance() = AllBookmarksFragment()
 	}
 }

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

@@ -25,7 +25,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import javax.inject.Inject
 
 @HiltViewModel
-class BookmarksViewModel @Inject constructor(
+class AllBookmarksViewModel @Inject constructor(
 	private val repository: BookmarksRepository,
 ) : BaseViewModel() {
 

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

@@ -1,14 +1,14 @@
-package org.koitharu.kotatsu.bookmarks.ui.sheet
+package org.koitharu.kotatsu.bookmarks.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.decodeRegion
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -22,23 +22,18 @@ fun bookmarkLargeAD(
 ) = adapterDelegateViewBinding<Bookmark, ListModel, ItemBookmarkLargeBinding>(
 	{ inflater, parent -> ItemBookmarkLargeBinding.inflate(inflater, parent, false) },
 ) {
-	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
-
-	binding.root.setOnClickListener(listener)
-	binding.root.setOnLongClickListener(listener)
 
 	bind {
 		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
 			size(CoverSizeResolver(binding.imageViewThumb))
-			placeholder(R.drawable.ic_placeholder)
+			defaultPlaceholders(context)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
 			tag(item)
 			decodeRegion(item.scroll)
 			source(item.manga.source)
 			enqueueWith(coil)
 		}
-		binding.progressView.percent = item.percent
+		binding.progressView.setProgress(item.percent, false)
 	}
 }

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

@@ -3,12 +3,12 @@ package org.koitharu.kotatsu.bookmarks.ui.adapter
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.decodeRegion
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -21,17 +21,12 @@ fun bookmarkListAD(
 ) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
 	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
 ) {
-	val listener = AdapterDelegateClickListenerAdapter(this, clickListener)
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
-
-	binding.root.setOnClickListener(listener)
-	binding.root.setOnLongClickListener(listener)
 
 	bind {
 		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
 			size(CoverSizeResolver(binding.imageViewThumb))
-			placeholder(R.drawable.ic_placeholder)
+			defaultPlaceholders(context)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
 			tag(item)
 			decodeRegion(item.scroll)

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

@@ -1,19 +1,36 @@
 package org.koitharu.kotatsu.bookmarks.ui.adapter
 
+import android.content.Context
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
 
 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : BaseListAdapter<Bookmark>() {
+	headerClickListener: ListHeaderClickListener?,
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		addDelegate(ListItemType.PAGE_THUMB, bookmarkListAD(coil, lifecycleOwner, clickListener))
+		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
+		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
+		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
+	}
+
+	override fun getSectionText(context: Context, position: Int): CharSequence? {
+		return findHeader(position)?.getText(context)
 	}
 }

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

@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.sheet
-
-import android.content.Context
-import androidx.lifecycle.LifecycleOwner
-import coil.ImageLoader
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
-import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
-import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-class BookmarksAdapter(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	clickListener: OnListItemClickListener<Bookmark>,
-	headerClickListener: ListHeaderClickListener?,
-) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
-
-	init {
-		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
-		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
-		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
-		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
-	}
-
-	override fun getSectionText(context: Context, position: Int): CharSequence? {
-		return findHeader(position)?.getText(context)
-	}
-}

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

@@ -1,169 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.sheet
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.GridLayoutManager
-import coil.ImageLoader
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetBehavior
-import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
-import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
-import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.plus
-import org.koitharu.kotatsu.core.util.ext.showDistinct
-import org.koitharu.kotatsu.core.util.ext.withArgs
-import org.koitharu.kotatsu.databinding.SheetPagesBinding
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
-import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
-import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
-import javax.inject.Inject
-import kotlin.math.roundToInt
-
-@AndroidEntryPoint
-class BookmarksSheet :
-	BaseAdaptiveSheet<SheetPagesBinding>(),
-	AdaptiveSheetCallback,
-	OnListItemClickListener<Bookmark> {
-
-	private val viewModel by viewModels<BookmarksSheetViewModel>()
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	private var bookmarksAdapter: BookmarksAdapter? = null
-	private var spanResolver: MangaListSpanResolver? = null
-
-	private val spanSizeLookup = SpanSizeLookup()
-	private val listCommitCallback = Runnable {
-		spanSizeLookup.invalidateCache()
-	}
-
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetPagesBinding {
-		return SheetPagesBinding.inflate(inflater, container, false)
-	}
-
-	override fun onViewBindingCreated(binding: SheetPagesBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		addSheetCallback(this)
-		spanResolver = MangaListSpanResolver(binding.root.resources)
-		bookmarksAdapter = BookmarksAdapter(
-			coil = coil,
-			lifecycleOwner = viewLifecycleOwner,
-			clickListener = this@BookmarksSheet,
-			headerClickListener = null,
-		)
-		viewBinding?.headerBar?.setTitle(R.string.bookmarks)
-		with(binding.recyclerView) {
-			addItemDecoration(TypedListSpacingDecoration(context, false))
-			adapter = bookmarksAdapter
-			addOnLayoutChangeListener(spanResolver)
-			spanResolver?.setGridSize(settings.gridSize / 100f, this)
-			(layoutManager as GridLayoutManager).spanSizeLookup = spanSizeLookup
-		}
-		viewModel.content.observe(viewLifecycleOwner, ::onThumbnailsChanged)
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
-	}
-
-	override fun onDestroyView() {
-		spanResolver = null
-		bookmarksAdapter = null
-		spanSizeLookup.invalidateCache()
-		super.onDestroyView()
-	}
-
-	override fun onItemClick(item: Bookmark, view: View) {
-		val listener = (parentFragment as? OnPageSelectListener) ?: (activity as? OnPageSelectListener)
-		if (listener != null) {
-			listener.onPageSelected(ReaderPage(item.toMangaPage(), item.page, item.chapterId))
-		} else {
-			val intent = IntentBuilder(view.context)
-				.manga(viewModel.manga)
-				.bookmark(item)
-				.incognito(true)
-				.build()
-			startActivity(intent)
-		}
-		dismiss()
-	}
-
-	override fun onStateChanged(sheet: View, newState: Int) {
-		viewBinding?.recyclerView?.isFastScrollerEnabled = newState == AdaptiveSheetBehavior.STATE_EXPANDED
-	}
-
-	private fun onThumbnailsChanged(list: List<ListModel>) {
-		val adapter = bookmarksAdapter ?: return
-		if (adapter.itemCount == 0) {
-			var position = list.indexOfFirst { it is PageThumbnail && it.isCurrent }
-			if (position > 0) {
-				val spanCount = spanResolver?.spanCount ?: 0
-				val offset = if (position > spanCount + 1) {
-					(resources.getDimensionPixelSize(R.dimen.manga_list_details_item_height) * 0.6).roundToInt()
-				} else {
-					position = 0
-					0
-				}
-				val scrollCallback = RecyclerViewScrollCallback(requireViewBinding().recyclerView, position, offset)
-				adapter.setItems(list, listCommitCallback + scrollCallback)
-			} else {
-				adapter.setItems(list, listCommitCallback)
-			}
-		} else {
-			adapter.setItems(list, listCommitCallback)
-		}
-	}
-
-	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup() {
-
-		init {
-			isSpanIndexCacheEnabled = true
-			isSpanGroupIndexCacheEnabled = true
-		}
-
-		override fun getSpanSize(position: Int): Int {
-			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
-			return when (bookmarksAdapter?.getItemViewType(position)) {
-				ListItemType.PAGE_THUMB.ordinal -> 1
-				else -> total
-			}
-		}
-
-		fun invalidateCache() {
-			invalidateSpanGroupIndexCache()
-			invalidateSpanIndexCache()
-		}
-	}
-
-	companion object {
-
-		const val ARG_MANGA = "manga"
-
-		private const val TAG = "BookmarksSheet"
-
-		fun show(fm: FragmentManager, manga: Manga) {
-			BookmarksSheet().withArgs(1) {
-				putParcelable(ARG_MANGA, ParcelableManga(manga))
-			}.showDistinct(fm, TAG)
-		}
-	}
-}

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

@@ -1,55 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.sheet
-
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
-import javax.inject.Inject
-
-@HiltViewModel
-class BookmarksSheetViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
-	mangaRepositoryFactory: MangaRepository.Factory,
-	bookmarksRepository: BookmarksRepository,
-) : BaseViewModel() {
-
-	val manga = savedStateHandle.require<ParcelableManga>(BookmarksSheet.ARG_MANGA).manga
-	private val chaptersLazy = SuspendLazy {
-		requireNotNull(manga.chapters ?: mangaRepositoryFactory.create(manga.source).getDetails(manga).chapters)
-	}
-
-	val content: StateFlow<List<ListModel>> = bookmarksRepository.observeBookmarks(manga)
-		.map { mapList(it) }
-		.withErrorHandling()
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingFooter()))
-
-	private suspend fun mapList(bookmarks: List<Bookmark>): List<ListModel> {
-		val chapters = chaptersLazy.get()
-		val bookmarksMap = bookmarks.groupBy { it.chapterId }
-		val result = ArrayList<ListModel>(bookmarks.size + bookmarksMap.size)
-		for (chapter in chapters) {
-			val b = bookmarksMap[chapter.id]
-			if (b.isNullOrEmpty()) {
-				continue
-			}
-			result += ListHeader(chapter.name)
-			result.addAll(b)
-		}
-		return result
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.browser
 
-import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -12,18 +11,28 @@ import android.webkit.CookieManager
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.ParserMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
 import com.google.android.material.R as materialR
 
-@SuppressLint("SetJavaScriptEnabled")
+@AndroidEntryPoint
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
 	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
 
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
@@ -33,7 +42,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		viewBinding.webView.configureForParser(null)
+		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
+		val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
+		viewBinding.webView.configureForParser(userAgent)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
@@ -54,16 +66,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 	}
 
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		super.onCreateOptionsMenu(menu)
 		menuInflater.inflate(R.menu.opt_browser, menu)
@@ -105,8 +107,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onDestroy() {
 		super.onDestroy()
-		viewBinding.webView.stopLoading()
+		if (hasViewBinding()) {
-		viewBinding.webView.destroy()
+			viewBinding.webView.stopLoading()
+			viewBinding.webView.destroy()
+		}
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
@@ -136,11 +140,13 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	companion object {
 
 		private const val EXTRA_TITLE = "title"
+		private const val EXTRA_SOURCE = "source"
 
-		fun newIntent(context: Context, url: String, title: String?): Intent {
+		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
 			return Intent(context, BrowserActivity::class.java)
 				.setData(Uri.parse(url))
 				.putExtra(EXTRA_TITLE, title)
+				.putExtra(EXTRA_SOURCE, source?.name)
 		}
 	}
 }

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

@@ -1,6 +1,9 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
 import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.Settings
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -11,8 +14,9 @@ import coil.request.ErrorResult
 import coil.request.ImageRequest
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.model.getTitle
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CaptchaNotifier(
@@ -20,7 +24,7 @@ class CaptchaNotifier(
 ) : EventListener {
 
 	fun notify(exception: CloudFlareProtectedException) {
-		if (!context.checkNotificationPermission()) {
+		if (!context.checkNotificationPermission(CHANNEL_ID)) {
 			return
 		}
 		val manager = NotificationManagerCompat.from(context)
@@ -33,16 +37,17 @@ class CaptchaNotifier(
 			.build()
 		manager.createNotificationChannel(channel)
 
-		val intent = CloudFlareActivity.newIntent(context, exception.url, exception.headers)
+		val intent = CloudFlareActivity.newIntent(context, exception)
 			.setData(exception.url.toUri())
 		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
 			.setContentTitle(channel.name)
 			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
 			.setDefaults(NotificationCompat.DEFAULT_SOUND)
 			.setSmallIcon(android.R.drawable.stat_notify_error)
+			.setGroup(GROUP_CAPTCHA)
 			.setAutoCancel(true)
 			.setVisibility(
-				if (exception.source?.contentType == ContentType.HENTAI) {
+				if (exception.source?.isNsfw() == true) {
 					NotificationCompat.VISIBILITY_SECRET
 				} else {
 					NotificationCompat.VISIBILITY_PUBLIC
@@ -51,12 +56,25 @@ class CaptchaNotifier(
 			.setContentText(
 				context.getString(
 					R.string.captcha_required_summary,
-					exception.source?.title ?: context.getString(R.string.app_name),
+					exception.source?.getTitle(context) ?: context.getString(R.string.app_name),
 				),
 			)
 			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))
-			.build()
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-		manager.notify(TAG, exception.source.hashCode(), notification)
+			val actionIntent = PendingIntentCompat.getActivity(
+				context, SETTINGS_ACTION_CODE,
+				Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+					.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+					.putExtra(Settings.EXTRA_CHANNEL_ID, CHANNEL_ID),
+				0, false,
+			)
+			notification.addAction(
+				R.drawable.ic_settings,
+				context.getString(R.string.notifications_settings),
+				actionIntent,
+			)
+		}
+		manager.notify(TAG, exception.source.hashCode(), notification.build())
 	}
 
 	fun dismiss(source: MangaSource) {
@@ -82,5 +100,7 @@ class CaptchaNotifier(
 		private const val PARAM_IGNORE_CAPTCHA = "ignore_captcha"
 		private const val CHANNEL_ID = "captcha"
 		private const val TAG = CHANNEL_ID
+		private const val GROUP_CAPTCHA = "org.koitharu.kotatsu.CAPTCHA"
+		private const val SETTINGS_ACTION_CODE = 3
 	}
 }

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
@@ -23,12 +24,15 @@ import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+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
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -52,7 +56,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val url = intent?.dataString.orEmpty()
+		val url = intent?.dataString
+		if (url.isNullOrEmpty()) {
+			finishAfterTransition()
+			return
+		}
 		cfClient = CloudFlareClient(cookieJar, this, url)
 		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
 		viewBinding.webView.webViewClient = cfClient
@@ -60,12 +68,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			onBackPressedDispatcher.addCallback(it)
 		}
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
-		if (savedInstanceState != null) {
+		if (savedInstanceState == null) {
-			return
-		}
-		if (url.isEmpty()) {
-			finishAfterTransition()
-		} else {
 			onTitleChanged(getString(R.string.loading_), url)
 			viewBinding.webView.loadUrl(url)
 		}
@@ -81,16 +84,6 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		super.onDestroy()
 	}
 
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
 	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
 		menuInflater.inflate(R.menu.opt_captcha, menu)
 		return super.onCreateOptionsMenu(menu)
@@ -147,6 +140,10 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
+		val source = intent?.getStringExtra(ARG_SOURCE)
+		if (source != null) {
+			CaptchaNotifier(this).dismiss(MangaSource(source))
+		}
 		finishAfterTransition()
 	}
 
@@ -179,18 +176,17 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
 		cookieJar.removeCookies(url) { cookie ->
-			val name = cookie.name
+			CloudFlareHelper.isCloudFlareCookie(cookie.name)
-			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf") || name == "csrftoken"
 		}
 	}
 
-	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {
+	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
-		override fun createIntent(context: Context, input: Pair<String, Headers?>): Intent {
+		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
-			return newIntent(context, input.first, input.second)
+			return newIntent(context, input)
 		}
 
-		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
+		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
-			return TaggedActivityResult(TAG, resultCode)
+			return resultCode == Activity.RESULT_OK
 		}
 	}
 
@@ -198,13 +194,23 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 		const val TAG = "CloudFlareActivity"
 		private const val ARG_UA = "ua"
+		private const val ARG_SOURCE = "_source"
 
-		fun newIntent(
+		fun newIntent(context: Context, exception: CloudFlareProtectedException) = newIntent(
+			context = context,
+			url = exception.url,
+			source = exception.source,
+			headers = exception.headers,
+		)
+
+		private fun newIntent(
 			context: Context,
 			url: String,
+			source: MangaSource?,
 			headers: Headers?,
 		) = Intent(context, CloudFlareActivity::class.java).apply {
 			data = url.toUri()
+			putExtra(ARG_SOURCE, source?.name)
 			headers?.get(CommonHeaders.USER_AGENT)?.let {
 				putExtra(ARG_UA, it)
 			}

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

@@ -2,11 +2,10 @@ package org.koitharu.kotatsu.browser.cloudflare
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
 
-private const val CF_CLEARANCE = "cf_clearance"
 private const val LOOP_COUNTER = 3
 
 class CloudFlareClient(
@@ -50,8 +49,5 @@ class CloudFlareClient(
 		}
 	}
 
-	private fun getClearance(): String? {
+	private fun getClearance() = CloudFlareHelper.getClearanceCookie(cookieJar, targetUrl)
-		return cookieJar.loadForRequest(targetUrl.toHttpUrl())
-			.find { it.name == CF_CLEARANCE }?.value
-	}
 }

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

@@ -26,35 +26,35 @@ import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
-import org.koitharu.kotatsu.core.cache.ContentCache
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.cache.StubContentCache
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.AcraScreenLogger
-import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageFetcher
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageKeyer
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
 import org.koitharu.kotatsu.sync.domain.SyncController
 import org.koitharu.kotatsu.widget.WidgetUpdater
+import javax.inject.Provider
 import javax.inject.Singleton
 
 @Module
@@ -72,8 +72,9 @@ interface AppModule {
 		@Provides
 		@Singleton
 		fun provideNetworkState(
-			@ApplicationContext context: Context
+			@ApplicationContext context: Context,
-		) = NetworkState(context.connectivityManager)
+			settings: AppSettings,
+		) = NetworkState(context.connectivityManager, settings)
 
 		@Provides
 		@Singleton
@@ -87,7 +88,7 @@ interface AppModule {
 		@Singleton
 		fun provideCoil(
 			@ApplicationContext context: Context,
-			@MangaHttpClient okHttpClient: OkHttpClient,
+			@MangaHttpClient okHttpClientProvider: Provider<OkHttpClient>,
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
@@ -99,13 +100,18 @@ interface AppModule {
 					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
 					.build()
 			}
+			val okHttpClientLazy = lazy {
+				okHttpClientProvider.get().newBuilder().cache(null).build()
+			}
 			return ImageLoader.Builder(context)
-				.okHttpClient(okHttpClient.newBuilder().cache(null).build())
+				.okHttpClient { okHttpClientLazy.value }
 				.interceptorDispatcher(Dispatchers.Default)
-				.fetcherDispatcher(Dispatchers.IO)
+				.fetcherDispatcher(Dispatchers.Default)
-				.decoderDispatcher(Dispatchers.Default)
+				.decoderDispatcher(Dispatchers.IO)
 				.transformationDispatcher(Dispatchers.Default)
 				.diskCache(diskCacheFactory)
+				.respectCacheHeaders(false)
+				.networkObserverEnabled(false)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
 				.allowRgb565(context.isLowRamDevice())
 				.eventListener(CaptchaNotifier(context))
@@ -113,7 +119,8 @@ interface AppModule {
 					ComponentRegistry.Builder()
 						.add(SvgDecoder.Factory())
 						.add(CbzFetcher.Factory())
-						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
+						.add(FaviconFetcher.Factory(context, okHttpClientLazy, mangaRepositoryFactory))
+						.add(MangaPageKeyer())
 						.add(pageFetcherFactory)
 						.add(imageProxyInterceptor)
 						.add(coverRestoreInterceptor)
@@ -147,27 +154,15 @@ interface AppModule {
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
-			incognitoModeIndicator: IncognitoModeIndicator,
 			acraScreenLogger: AcraScreenLogger,
+			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
-			incognitoModeIndicator,
 			acraScreenLogger,
+			screenshotPolicyHelper,
 		)
 
-		@Provides
-		@Singleton
-		fun provideContentCache(
-			application: Application,
-		): ContentCache {
-			return if (application.isLowRamDevice()) {
-				StubContentCache()
-			} else {
-				MemoryContentCache(application)
-			}
-		}
-
 		@Provides
 		@Singleton
 		@LocalStorageChanges

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
@@ -37,7 +41,7 @@ import javax.inject.Provider
 open class BaseApp : Application(), Configuration.Provider {
 
 	@Inject
-	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
+	lateinit var databaseObserversProvider: Provider<Set<@JvmSuppressWildcards InvalidationTracker.Observer>>
 
 	@Inject
 	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
@@ -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,12 +93,13 @@ open class BaseApp : Application(), Configuration.Provider {
 		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
+			localStorageChanges.collect(localMangaIndexProvider.get())
 		}
 		workScheduleManager.init()
 		WorkServiceStopHelper(workManagerProvider).setup()
 	}
 
-	override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
@@ -123,7 +135,7 @@ open class BaseApp : Application(), Configuration.Provider {
 	@WorkerThread
 	private fun setupDatabaseObservers() {
 		val tracker = database.get().invalidationTracker
-		databaseObservers.forEach {
+		databaseObserversProvider.get().forEach {
 			tracker.addObserver(it)
 		}
 	}

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

@@ -5,9 +5,11 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.BadParcelableException
 import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.report
 
 class ErrorReporterReceiver : BroadcastReceiver() {
@@ -22,12 +24,15 @@ class ErrorReporterReceiver : BroadcastReceiver() {
 		private const val EXTRA_ERROR = "err"
 		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"
 
-		fun getPendingIntent(context: Context, e: Throwable): PendingIntent {
+		fun getPendingIntent(context: Context, e: Throwable): PendingIntent? = try {
 			val intent = Intent(context, ErrorReporterReceiver::class.java)
 			intent.setAction(ACTION_REPORT)
 			intent.setData(Uri.parse("err://${e.hashCode()}"))
 			intent.putExtra(EXTRA_ERROR, e)
-			return checkNotNull(PendingIntentCompat.getBroadcast(context, 0, intent, 0, false))
+			PendingIntentCompat.getBroadcast(context, 0, intent, 0, false)
+		} catch (e: BadParcelableException) {
+			e.printStackTraceDebug()
+			null
 		}
 	}
 }

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,14 +4,17 @@ 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
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import java.io.File
 import java.util.EnumSet
+import java.util.zip.ZipException
 import java.util.zip.ZipFile
 
-class BackupZipInput(val file: File) : Closeable {
+class BackupZipInput private constructor(val file: File) : Closeable {
 
 	private val zipFile = ZipFile(file)
 
@@ -36,9 +39,30 @@ class BackupZipInput(val file: File) : Closeable {
 	fun cleanupAsync() {
 		processLifecycleScope.launch(Dispatchers.IO, CoroutineStart.ATOMIC) {
 			runCatching {
-				close()
+				closeQuietly()
 				file.delete()
 			}
 		}
 	}
+
+	companion object {
+
+		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
+				}
+			}
+		}
+	}
 }

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

@@ -39,7 +39,7 @@ suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptibl
 	val filename = buildString {
 		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
 		append('_')
-		append(LocalDate.now().format(DateTimeFormatter.ofPattern("ddMMyyyy")))
+		append(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")))
 		append(".bk.zip")
 	}
 	BackupZipOutput(File(dir, filename))

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

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
 
 class JsonDeserializer(private val json: JSONObject) {
@@ -84,6 +85,9 @@ class JsonDeserializer(private val json: JSONObject) {
 		source = json.getString("source"),
 		isEnabled = json.getBoolean("enabled"),
 		sortKey = json.getInt("sort_key"),
+		addedIn = json.getIntOrDefault("added_in", 0),
+		lastUsedAt = json.getLongOrDefault("used_at", 0L),
+		isPinned = json.getBooleanOrDefault("pinned", false),
 	)
 
 	fun toMap(): Map<String, Any?> {

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

@@ -89,6 +89,9 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("source", e.source)
 			put("enabled", e.isEnabled)
 			put("sort_key", e.sortKey)
+			put("added_in", e.addedIn)
+			put("used_at", e.lastUsedAt)
+			put("pinned", e.isPinned)
 		},
 	)
 

app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ContentCache.kt

@@ -1,29 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-interface ContentCache {
-
-	val isCachingEnabled: Boolean
-
-	suspend fun getDetails(source: MangaSource, url: String): Manga?
-
-	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>)
-
-	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>?
-
-	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
-
-	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>?
-
-	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
-
-	fun clear(source: MangaSource)
-
-	data class Key(
-		val source: MangaSource,
-		val url: String,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt

@@ -2,18 +2,19 @@ package org.koitharu.kotatsu.core.cache
 
 import androidx.collection.LruCache
 import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.cache.MemoryContentCache.Key as CacheKey
 
 class ExpiringLruCache<T>(
 	val maxSize: Int,
 	private val lifetime: Long,
 	private val timeUnit: TimeUnit,
-) : Iterable<ContentCache.Key> {
+) : Iterable<CacheKey> {
 
-	private val cache = LruCache<ContentCache.Key, ExpiringValue<T>>(maxSize)
+	private val cache = LruCache<CacheKey, ExpiringValue<T>>(maxSize)
 
-	override fun iterator(): Iterator<ContentCache.Key> = cache.snapshot().keys.iterator()
+	override fun iterator(): Iterator<CacheKey> = cache.snapshot().keys.iterator()
 
-	operator fun get(key: ContentCache.Key): T? {
+	operator fun get(key: CacheKey): T? {
 		val value = cache[key] ?: return null
 		if (value.isExpired) {
 			cache.remove(key)
@@ -21,7 +22,7 @@ class ExpiringLruCache<T>(
 		return value.get()
 	}
 
-	operator fun set(key: ContentCache.Key, value: T) {
+	operator fun set(key: CacheKey, value: T) {
 		cache.put(key, ExpiringValue(value, lifetime, timeUnit))
 	}
 
@@ -33,7 +34,7 @@ class ExpiringLruCache<T>(
 		cache.trimToSize(size)
 	}
 
-	fun remove(key: ContentCache.Key) {
+	fun remove(key: CacheKey) {
 		cache.remove(key)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt

@@ -3,48 +3,54 @@ package org.koitharu.kotatsu.core.cache
 import android.app.Application
 import android.content.ComponentCallbacks2
 import android.content.res.Configuration
+import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class MemoryContentCache(application: Application) : ContentCache, ComponentCallbacks2 {
+@Singleton
+class MemoryContentCache @Inject constructor(application: Application) : ComponentCallbacks2 {
+
+	private val isLowRam = application.isLowRamDevice()
+
+	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(if (isLowRam) 1 else 4, 5, TimeUnit.MINUTES)
+	private val pagesCache =
+		ExpiringLruCache<SafeDeferred<List<MangaPage>>>(if (isLowRam) 1 else 4, 10, TimeUnit.MINUTES)
+	private val relatedMangaCache =
+		ExpiringLruCache<SafeDeferred<List<Manga>>>(if (isLowRam) 1 else 3, 10, TimeUnit.MINUTES)
 
 	init {
 		application.registerComponentCallbacks(this)
 	}
 
-	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(4, 5, TimeUnit.MINUTES)
+	suspend fun getDetails(source: MangaSource, url: String): Manga? {
-	private val pagesCache = ExpiringLruCache<SafeDeferred<List<MangaPage>>>(4, 10, TimeUnit.MINUTES)
+		return detailsCache[Key(source, url)]?.awaitOrNull()
-	private val relatedMangaCache = ExpiringLruCache<SafeDeferred<List<Manga>>>(4, 10, TimeUnit.MINUTES)
-
-	override val isCachingEnabled: Boolean = true
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? {
-		return detailsCache[ContentCache.Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
+	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
-		detailsCache[ContentCache.Key(source, url)] = details
+		detailsCache[Key(source, url)] = details
 	}
 
-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
+	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
-		return pagesCache[ContentCache.Key(source, url)]?.awaitOrNull()
+		return pagesCache[Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
+	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
-		pagesCache[ContentCache.Key(source, url)] = pages
+		pagesCache[Key(source, url)] = pages
 	}
 
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
+	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
-		return relatedMangaCache[ContentCache.Key(source, url)]?.awaitOrNull()
+		return relatedMangaCache[Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
+	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
-		relatedMangaCache[ContentCache.Key(source, url)] = related
+		relatedMangaCache[Key(source, url)] = related
 	}
 
-	override fun clear(source: MangaSource) {
+	fun clear(source: MangaSource) {
 		clearCache(detailsCache, source)
 		clearCache(pagesCache, source)
 		clearCache(relatedMangaCache, source)
@@ -81,4 +87,9 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 			}
 		}
 	}
+
+	data class Key(
+		val source: MangaSource,
+		val url: String,
+	)
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/cache/StubContentCache.kt

@@ -1,24 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class StubContentCache : ContentCache {
-
-	override val isCachingEnabled: Boolean = false
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? = null
-
-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) = Unit
-
-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
-
-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
-
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
-
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
-
-	override fun clear(source: MangaSource) = Unit
-}

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

@@ -31,7 +31,11 @@ import org.koitharu.kotatsu.core.db.migrations.Migration15To16
 import org.koitharu.kotatsu.core.db.migrations.Migration16To17
 import org.koitharu.kotatsu.core.db.migrations.Migration17To18
 import org.koitharu.kotatsu.core.db.migrations.Migration18To19
+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
@@ -47,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
@@ -57,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 = 19
+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,
 )
@@ -95,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(
@@ -116,6 +124,10 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration16To17(context),
 	Migration17To18(),
 	Migration18To19(),
+	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/MangaDao.kt

@@ -28,6 +28,9 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE source = :source")
 	abstract suspend fun findAllBySource(source: String): List<MangaWithTags>
 
+	@Query("SELECT author FROM manga WHERE author LIKE :query GROUP BY author ORDER BY COUNT(author) DESC LIMIT :limit")
+	abstract suspend fun findAuthors(query: String, limit: Int): List<String>
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
@@ -37,7 +40,7 @@ abstract class MangaDao {
 	abstract suspend fun searchByTitle(query: String, source: String, limit: Int): List<MangaWithTags>
 
 	@Upsert
-	abstract suspend fun upsert(manga: MangaEntity)
+	protected abstract suspend fun upsert(manga: MangaEntity)
 
 	@Update(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun update(manga: MangaEntity): Int

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

@@ -11,22 +11,26 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
 @Dao
 abstract class MangaSourcesDao {
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 0 ORDER BY sort_key")
+	@Query("SELECT source FROM sources WHERE enabled = 1")
-	abstract suspend fun findAllDisabled(): List<MangaSourceEntity>
+	abstract suspend fun findAllEnabledNames(): List<String>
 
-	@Query("SELECT * FROM sources WHERE enabled = 0")
+	@Query("SELECT * FROM sources WHERE added_in >= :version")
-	abstract fun observeDisabled(): Flow<List<MangaSourceEntity>>
+	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources ORDER BY used_at DESC LIMIT :limit")
+	abstract suspend fun findLastUsed(limit: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT enabled FROM sources WHERE source = :source")
@@ -41,6 +45,12 @@ abstract class MangaSourcesDao {
 	@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
 	abstract suspend fun setSortKey(source: String, sortKey: Int)
 
+	@Query("UPDATE sources SET used_at = :value WHERE source = :source")
+	abstract suspend fun setLastUsed(source: String, value: Long)
+
+	@Query("UPDATE sources SET pinned = :isPinned WHERE source = :source")
+	abstract suspend fun setPinned(source: String, isPinned: Boolean)
+
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	@Transaction
 	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
@@ -48,11 +58,14 @@ abstract class MangaSourcesDao {
 	@Upsert
 	abstract suspend fun upsert(entry: MangaSourceEntity)
 
+	@Query("SELECT * FROM sources WHERE pinned = 1")
+	abstract suspend fun findAllPinned(): List<MangaSourceEntity>
+
 	fun observeEnabled(order: SourcesSortOrder): Flow<List<MangaSourceEntity>> {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return observeImpl(query)
 	}
 
@@ -60,7 +73,7 @@ abstract class MangaSourcesDao {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return findAllImpl(query)
 	}
 
@@ -71,6 +84,9 @@ abstract class MangaSourcesDao {
 				source = source,
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
+				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
 			)
 			upsert(entity)
 		}
@@ -89,5 +105,6 @@ abstract class MangaSourcesDao {
 		SourcesSortOrder.ALPHABETIC -> "source ASC"
 		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
 		SourcesSortOrder.MANUAL -> "sort_key ASC"
+		SourcesSortOrder.LAST_USED -> "used_at DESC"
 	}
 }

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

@@ -1,29 +1,62 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.*
+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
+	fun observeAll(
-	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
+		limit: Int,
-	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
+		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")
+	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")
+	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 = :mangaId")
-	suspend fun removeAll(mangaId: 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)")
+	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/entity/MangaSourceEntity.kt

@@ -14,4 +14,7 @@ data class MangaSourceEntity(
 	val source: String,
 	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
 	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
+	@ColumnInfo(name = "added_in") val addedIn: Int,
+	@ColumnInfo(name = "used_at") val lastUsedAt: Long,
+	@ColumnInfo(name = "pinned") val isPinned: Boolean,
 )

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

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 
 class Migration16To17(context: Context) : Migration(16, 17) {
 
@@ -15,11 +15,8 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 		db.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
 		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
 		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
-		val sources = MangaSource.entries
+		val sources = MangaParserSource.entries
 		for (source in sources) {
-			if (source == MangaSource.LOCAL) {
-				continue
-			}
 			val name = source.name
 			val isHidden = name in hiddenSources
 			var sortKey = order.indexOf(name)

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

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration19To20 : Migration(19, 20) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE tracks_bk (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id))")
+		db.execSQL("INSERT INTO tracks_bk SELECT manga_id, chapters_total, last_chapter_id, chapters_new, last_check, last_notified_id FROM tracks")
+		db.execSQL("DROP TABLE tracks")
+		db.execSQL("CREATE TABLE tracks (`manga_id` INTEGER NOT NULL, `last_chapter_id` INTEGER NOT NULL, `chapters_new` INTEGER NOT NULL, `last_check_time` INTEGER NOT NULL, `last_chapter_date` INTEGER NOT NULL, `last_result` INTEGER NOT NULL, PRIMARY KEY(`manga_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+		db.execSQL("INSERT INTO tracks SELECT manga_id, last_chapter_id, chapters_new, last_check AS last_check_time, 0 AS last_chapter_date, 0 AS last_result FROM tracks_bk")
+		db.execSQL("DROP TABLE tracks_bk")
+
+		db.execSQL("ALTER TABLE track_logs ADD COLUMN `unread` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20To21 : Migration(20, 21) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE tracks ADD COLUMN `last_error` TEXT DEFAULT NULL")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `added_in` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21To22 : Migration(21, 22) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE sources ADD COLUMN `used_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `pinned` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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/BadBackupFormatException.kt

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import java.io.IOException
+
+class BadBackupFormatException(cause: Throwable?) : IOException(cause)

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

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okio.IOException
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class CloudFlareBlockedException(
+	val url: String,
+	val source: MangaSource?,
+) : IOException("Blocked by CloudFlare")

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

@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.core.exceptions
+
+class IncompatiblePluginException(
+	val name: String?,
+	cause: Throwable?,
+) : RuntimeException(cause)

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

@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okio.IOException
+
+class NoDataReceivedException(
+	url: String,
+) : IOException("No data has been received from $url")

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

@@ -1,62 +1,74 @@
 package org.koitharu.kotatsu.core.exceptions.resolve
 
-import androidx.activity.result.ActivityResultCallback
+import android.content.Context
-import androidx.activity.result.ActivityResultLauncher
+import android.widget.Toast
+import androidx.activity.result.ActivityResultCaller
 import androidx.annotation.StringRes
-import androidx.collection.ArrayMap
+import androidx.collection.MutableScatterMap
-import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentActivity
+import dagger.assisted.Assisted
-import okhttp3.Headers
+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.dialog.ErrorDetailsDialog
-import org.koitharu.kotatsu.core.util.TaggedActivityResult
+import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
+import org.koitharu.kotatsu.core.util.ext.restartApplication
 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 continuations = ArrayMap<String, Continuation<Boolean>>(1)
+	private val sourceAuthContract = host.registerForActivityResult(SourceAuthActivity.Contract()) {
-	private val activity: FragmentActivity?
+		handleActivityResult(SourceAuthActivity.TAG, it)
-	private val fragment: Fragment?
-	private val sourceAuthContract: ActivityResultLauncher<MangaSource>
-	private val cloudflareContract: ActivityResultLauncher<Pair<String, Headers?>>
-
-	constructor(activity: FragmentActivity) {
-		this.activity = activity
-		fragment = null
-		sourceAuthContract = activity.registerForActivityResult(SourceAuthActivity.Contract(), this)
-		cloudflareContract = activity.registerForActivityResult(CloudFlareActivity.Contract(), this)
 	}
-
+	private val cloudflareContract = host.registerForActivityResult(CloudFlareActivity.Contract()) {
-	constructor(fragment: Fragment) {
+		handleActivityResult(CloudFlareActivity.TAG, it)
-		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)
 	}
 
 	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) {
-		is CloudFlareProtectedException -> resolveCF(e.url, e.headers)
+		is CloudFlareProtectedException -> resolveCF(e)
 		is AuthRequiredException -> resolveAuthException(e.source)
+		is SSLException,
+		is CertPathValidatorException -> {
+			showSslErrorDialog()
+			false
+		}
+
+		is ProxyConfigException -> {
+			host.withContext {
+				startActivity(SettingsActivity.newProxySettingsIntent(this))
+			}
+			false
+		}
+
 		is NotFoundException -> {
 			openInBrowser(e.url)
 			false
@@ -67,12 +79,26 @@ 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
 	}
 
-	private suspend fun resolveCF(url: String, headers: Headers): Boolean = suspendCoroutine { cont ->
+	private suspend fun resolveCF(e: CloudFlareProtectedException): Boolean = suspendCoroutine { cont ->
 		continuations[CloudFlareActivity.TAG] = cont
-		cloudflareContract.launch(url to headers)
+		cloudflareContract.launch(e)
 	}
 
 	private suspend fun resolveAuthException(source: MangaSource): Boolean = suspendCoroutine { cont ->
@@ -80,26 +106,68 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 		sourceAuthContract.launch(source)
 	}
 
-	private fun openInBrowser(url: String) {
+	private fun openInBrowser(url: String) = host.withContext {
-		val context = activity ?: fragment?.activity ?: return
+		startActivity(BrowserActivity.newIntent(this, url, null, null))
-		context.startActivity(BrowserActivity.newIntent(context, url, null))
 	}
 
-	private fun openAlternatives(manga: Manga) {
+	private fun openAlternatives(manga: Manga) = host.withContext {
-		val context = activity ?: fragment?.activity ?: return
+		startActivity(AlternativesActivity.newIntent(this, manga))
-		context.startActivity(AlternativesActivity.newIntent(context, manga))
 	}
 
-	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
+	private fun handleActivityResult(tag: String, result: Boolean) {
+		continuations.remove(tag)?.resume(result)
+	}
+
+	private fun showSslErrorDialog() {
+		val ctx = host.getContext() ?: return
+		if (settings.isSSLBypassEnabled) {
+			Toast.makeText(ctx, R.string.operation_not_supported, Toast.LENGTH_SHORT).show()
+			return
+		}
+		buildAlertDialog(ctx) {
+			setTitle(R.string.ignore_ssl_errors)
+			setMessage(R.string.ignore_ssl_errors_summary)
+			setPositiveButton(R.string.apply) { _, _ ->
+				settings.isSSLBypassEnabled = true
+				Toast.makeText(ctx, R.string.settings_apply_restart_required, Toast.LENGTH_LONG).show()
+				ctx.restartApplication()
+			}
+			setNegativeButton(android.R.string.cancel, null)
+		}.show()
+	}
+
+	private inline fun Host.withContext(block: Context.() -> Unit) {
+		getContext()?.apply(block)
+	}
+
+	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/fs/FileSequence.kt

@@ -1,20 +1,31 @@
 package org.koitharu.kotatsu.core.fs
 
 import android.os.Build
-import org.koitharu.kotatsu.core.util.iterator.CloseableIterator
+import androidx.annotation.RequiresApi
+import org.koitharu.kotatsu.core.util.CloseableSequence
 import org.koitharu.kotatsu.core.util.iterator.MappingIterator
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 
-class FileSequence(private val dir: File) : Sequence<File> {
+sealed interface FileSequence : CloseableSequence<File> {
 
-	override fun iterator(): Iterator<File> {
+	@RequiresApi(Build.VERSION_CODES.O)
-		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+	class StreamImpl(dir: File) : FileSequence {
-			val stream = Files.newDirectoryStream(dir.toPath())
+
-			CloseableIterator(MappingIterator(stream.iterator(), Path::toFile), stream)
+		private val stream = Files.newDirectoryStream(dir.toPath())
-		} else {
+
-			dir.listFiles().orEmpty().iterator()
+		override fun iterator(): Iterator<File> = MappingIterator(stream.iterator(), Path::toFile)
-		}
+
+		override fun close() = stream.close()
+	}
+
+	class ListImpl(dir: File) : FileSequence {
+
+		private val list = dir.listFiles().orEmpty()
+
+		override fun iterator(): Iterator<File> = list.iterator()
+
+		override fun close() = Unit
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/logs/FileLogger.kt

@@ -1,148 +0,0 @@
-package org.koitharu.kotatsu.core.logs
-
-import android.content.Context
-import androidx.annotation.WorkerThread
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.core.util.ext.subdir
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import java.io.File
-import java.io.FileOutputStream
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
-import java.util.Locale
-import java.util.concurrent.ConcurrentLinkedQueue
-
-private const val DIR = "logs"
-private const val FLUSH_DELAY = 2_000L
-private const val MAX_SIZE_BYTES = 1024 * 1024 // 1 MB
-
-class FileLogger(
-	context: Context,
-	private val settings: AppSettings,
-	name: String,
-) {
-
-	val file by lazy {
-		val dir = context.getExternalFilesDir(DIR) ?: context.filesDir.subdir(DIR)
-		File(dir, "$name.log")
-	}
-	val isEnabled: Boolean
-		get() = settings.isLoggingEnabled
-	private val dateTimeFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).withLocale(Locale.ROOT)
-	private val buffer = ConcurrentLinkedQueue<String>()
-	private val mutex = Mutex()
-	private var flushJob: Job? = null
-
-	fun log(message: String, e: Throwable? = null) {
-		if (!isEnabled) {
-			return
-		}
-		val text = buildString {
-			append(dateTimeFormatter.format(LocalDateTime.now()))
-			append(": ")
-			if (e != null) {
-				append("E!")
-			}
-			append(message)
-			if (e != null) {
-				append(' ')
-				append(e.stackTraceToString())
-				appendLine()
-			}
-		}
-		buffer.add(text)
-		postFlush()
-	}
-
-	inline fun log(messageProducer: () -> String) {
-		if (isEnabled) {
-			log(messageProducer())
-		}
-	}
-
-	suspend fun flush() {
-		if (!isEnabled) {
-			return
-		}
-		flushJob?.cancelAndJoin()
-		flushImpl()
-	}
-
-	@WorkerThread
-	fun flushBlocking() {
-		if (!isEnabled) {
-			return
-		}
-		runBlockingSafe { flushJob?.cancelAndJoin() }
-		runBlockingSafe { flushImpl() }
-	}
-
-	private fun postFlush() {
-		if (flushJob?.isActive == true) {
-			return
-		}
-		flushJob = processLifecycleScope.launch(Dispatchers.Default) {
-			delay(FLUSH_DELAY)
-			runCatchingCancellable {
-				flushImpl()
-			}.onFailure {
-				it.printStackTraceDebug()
-			}
-		}
-	}
-
-	private suspend fun flushImpl() = withContext(NonCancellable) {
-		mutex.withLock {
-			if (buffer.isEmpty()) {
-				return@withContext
-			}
-			runInterruptible(Dispatchers.IO) {
-				if (file.length() > MAX_SIZE_BYTES) {
-					rotate()
-				}
-				FileOutputStream(file, true).use {
-					while (true) {
-						val message = buffer.poll() ?: break
-						it.write(message.toByteArray())
-						it.write('\n'.code)
-					}
-					it.flush()
-				}
-			}
-		}
-	}
-
-	@WorkerThread
-	private fun rotate() {
-		val length = file.length()
-		val bakFile = File(file.parentFile, file.name + ".bak")
-		file.renameTo(bakFile)
-		bakFile.inputStream().use { input ->
-			input.skip(length - MAX_SIZE_BYTES / 2)
-			file.outputStream().use { output ->
-				input.copyTo(output)
-				output.flush()
-			}
-		}
-		bakFile.delete()
-	}
-
-	private inline fun runBlockingSafe(crossinline block: suspend () -> Unit) = try {
-		runBlocking(NonCancellable) { block() }
-	} catch (_: InterruptedException) {
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/logs/Loggers.kt

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.logs
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TrackerLogger
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class SyncLogger

app/src/main/kotlin/org/koitharu/kotatsu/core/logs/LoggersModule.kt

@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.logs
-
-import android.content.Context
-import androidx.collection.arraySetOf
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import dagger.multibindings.ElementsIntoSet
-import org.koitharu.kotatsu.core.prefs.AppSettings
-
-@Module
-@InstallIn(SingletonComponent::class)
-object LoggersModule {
-
-	@Provides
-	@TrackerLogger
-	fun provideTrackerLogger(
-		@ApplicationContext context: Context,
-		settings: AppSettings,
-	) = FileLogger(context, settings, "tracker")
-
-	@Provides
-	@SyncLogger
-	fun provideSyncLogger(
-		@ApplicationContext context: Context,
-		settings: AppSettings,
-	) = FileLogger(context, settings, "sync")
-
-	@Provides
-	@ElementsIntoSet
-	fun provideAllLoggers(
-		@TrackerLogger trackerLogger: FileLogger,
-		@SyncLogger syncLogger: FileLogger,
-	): Set<@JvmSuppressWildcards FileLogger> = arraySetOf(
-		trackerLogger,
-		syncLogger,
-	)
-}

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,21 +1,24 @@
 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.MangaSource
+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
-import java.text.DecimalFormat
-import java.text.DecimalFormatSymbols
 import com.google.android.material.R as materialR
 
 @JvmName("mangaIds")
@@ -70,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,7 +124,10 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 }
 
 val Manga.isLocal: Boolean
-	get() = source == MangaSource.LOCAL
+	get() = source == LocalMangaSource
+
+val Manga.isBroken: Boolean
+	get() = source == UnknownMangaSource
 
 val Manga.appUrl: Uri
 	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
@@ -119,17 +136,10 @@ val Manga.appUrl: Uri
 		.appendQueryParameter("url", url)
 		.build()
 
-private val chaptersNumberFormat = DecimalFormat("#.#").also { f ->
+fun MangaChapter.formatNumber(): String? = if (number > 0f) {
-	f.decimalFormatSymbols = DecimalFormatSymbols.getInstance().also {
+	number.formatSimple()
-		it.decimalSeparator = '.'
+} else {
-	}
+	null
-}
-
-fun MangaChapter.formatNumber(): String? {
-	if (number <= 0f) {
-		return null
-	}
-	return chaptersNumberFormat.format(number.toDouble())
 }
 
 fun Manga.chaptersCount(): Int {
@@ -147,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

@@ -7,26 +7,49 @@ import android.text.style.ForegroundColorSpan
 import android.text.style.RelativeSizeSpan
 import android.text.style.SuperscriptSpan
 import androidx.annotation.StringRes
-import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
 import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.parsers.util.splitTwoParts
-import java.util.Locale
 import com.google.android.material.R as materialR
 
-fun MangaSource(name: String): MangaSource {
+data object LocalMangaSource : MangaSource {
-	MangaSource.entries.forEach {
+	override val name = "LOCAL"
-		if (it.name == name) return it
-	}
-	return MangaSource.DUMMY
 }
 
-fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
+data object UnknownMangaSource : MangaSource {
+	override val name = "UNKNOWN"
+}
+
+fun MangaSource(name: String?): MangaSource {
+	when (name ?: return UnknownMangaSource) {
+		UnknownMangaSource.name -> return UnknownMangaSource
+
+		LocalMangaSource.name -> return LocalMangaSource
+	}
+	if (name.startsWith("content:")) {
+		val parts = name.substringAfter(':').splitTwoParts('/') ?: return UnknownMangaSource
+		return ExternalMangaSource(packageName = parts.first, authority = parts.second)
+	}
+	MangaParserSource.entries.forEach {
+		if (it.name == name) return it
+	}
+	return UnknownMangaSource
+}
+
+fun Collection<String>.toMangaSources() = map(::MangaSource)
+
+fun MangaSource.isNsfw(): Boolean = when (this) {
+	is MangaSourceInfo -> mangaSource.isNsfw()
+	is MangaParserSource -> contentType == ContentType.HENTAI
+	else -> false
+}
 
 @get:StringRes
 val ContentType.titleResId
@@ -35,25 +58,42 @@ 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 {
+tailrec fun MangaSource.unwrap(): MangaSource = if (this is MangaSourceInfo) {
-	val type = context.getString(contentType.titleResId)
+	mangaSource.unwrap()
-	val locale = locale?.toLocale().getDisplayName(context)
-	return context.getString(R.string.source_summary_pattern, type, locale)
-}
-
-fun MangaSource.getTitle(context: Context): CharSequence = if (isNsfw()) {
-	buildSpannedString {
-		append(title)
-		append(' ')
-		appendNsfwLabel(context)
-	}
 } else {
-	title
+	this
 }
 
-private fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
+fun MangaSource.getSummary(context: Context): String? = when (val source = unwrap()) {
+	is MangaParserSource -> {
+		val type = context.getString(source.contentType.titleResId)
+		val locale = source.locale.toLocale().getDisplayName(context)
+		context.getString(R.string.source_summary_pattern, type, locale)
+	}
+
+	is ExternalMangaSource -> context.getString(R.string.external_source)
+
+	else -> null
+}
+
+fun MangaSource.getTitle(context: Context): String = when (val source = unwrap()) {
+	is MangaParserSource -> source.title
+	LocalMangaSource -> context.getString(R.string.local_storage)
+	is ExternalMangaSource -> source.resolveName(context)
+	else -> context.getString(R.string.unknown)
+}
+
+fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
 	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
 	RelativeSizeSpan(0.74f),
 	SuperscriptSpan(),

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

@@ -0,0 +1,9 @@
+package org.koitharu.kotatsu.core.model
+
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+data class MangaSourceInfo(
+	val mangaSource: MangaSource,
+	val isEnabled: Boolean,
+	val isPinned: Boolean,
+) : MangaSource by mangaSource

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/MangaSourceParceler.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import kotlinx.parcelize.Parceler
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class MangaSourceParceler : Parceler<MangaSource> {
+
+	override fun create(parcel: Parcel): MangaSource = MangaSource(parcel.readString())
+
+	override fun MangaSource.write(parcel: Parcel, flags: Int) {
+		parcel.writeString(name)
+	}
+}

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

@@ -4,9 +4,8 @@ import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaSource
 
 @Parcelize
 data class ParcelableChapter(
@@ -25,8 +24,8 @@ data class ParcelableChapter(
 				scanlator = parcel.readString(),
 				uploadDate = parcel.readLong(),
 				branch = parcel.readString(),
-				source = parcel.readSerializableCompat() ?: MangaSource.DUMMY,
+				source = MangaSource(parcel.readString()),
-			)
+			),
 		)
 
 		override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
@@ -38,7 +37,7 @@ data class ParcelableChapter(
 			parcel.writeString(scanlator)
 			parcel.writeLong(uploadDate)
 			parcel.writeString(branch)
-			parcel.writeSerializable(source)
+			parcel.writeString(source.name)
 		}
 	}
 }

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

@@ -5,6 +5,7 @@ import android.os.Parcelable
 import androidx.core.os.ParcelCompat
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -30,7 +31,7 @@ data class ParcelableManga(
 			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
 			parcel.writeSerializable(state)
 			parcel.writeString(author)
-			parcel.writeSerializable(source)
+			parcel.writeString(source.name)
 		}
 
 		override fun create(parcel: Parcel) = ParcelableManga(
@@ -49,8 +50,8 @@ data class ParcelableManga(
 				state = parcel.readSerializableCompat(),
 				author = parcel.readString(),
 				chapters = null,
-				source = requireNotNull(parcel.readSerializableCompat()),
+				source = MangaSource(parcel.readString()),
-			)
+			),
 		)
 	}
 }

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/model/parcelable/ParcelableMangaPage.kt

@@ -5,7 +5,7 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
-import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaPage
 
 object MangaPageParceler : Parceler<MangaPage> {
@@ -13,14 +13,14 @@ object MangaPageParceler : Parceler<MangaPage> {
 		id = parcel.readLong(),
 		url = requireNotNull(parcel.readString()),
 		preview = parcel.readString(),
-		source = requireNotNull(parcel.readSerializableCompat()),
+		source = MangaSource(parcel.readString()),
 	)
 
 	override fun MangaPage.write(parcel: Parcel, flags: Int) {
 		parcel.writeLong(id)
 		parcel.writeString(url)
 		parcel.writeString(preview)
-		parcel.writeSerializable(source)
+		parcel.writeString(source.name)
 	}
 }
 

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

@@ -5,20 +5,20 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
-import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
 object MangaTagParceler : Parceler<MangaTag> {
 	override fun create(parcel: Parcel) = MangaTag(
 		title = requireNotNull(parcel.readString()),
 		key = requireNotNull(parcel.readString()),
-		source = requireNotNull(parcel.readSerializableCompat()),
+		source = MangaSource(parcel.readString()),
 	)
 
 	override fun MangaTag.write(parcel: Parcel, flags: Int) {
 		parcel.writeString(title)
 		parcel.writeString(key)
-		parcel.writeSerializable(source)
+		parcel.writeString(source.name)
 	}
 }
 

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/CloudFlareInterceptor.kt

@@ -2,31 +2,43 @@ package org.koitharu.kotatsu.core.network
 
 import okhttp3.Interceptor
 import okhttp3.Response
-import okhttp3.internal.closeQuietly
+import okio.IOException
-import org.jsoup.Jsoup
+import org.koitharu.kotatsu.core.exceptions.CloudFlareBlockedException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import java.net.HttpURLConnection.HTTP_FORBIDDEN
+import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
-import java.net.HttpURLConnection.HTTP_UNAVAILABLE
 
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
-		val response = chain.proceed(chain.request())
+		val request = chain.request()
-		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
+		val response = chain.proceed(request)
-			val content = response.body?.let { response.peekBody(Long.MAX_VALUE) }?.byteStream()?.use {
+		return when (CloudFlareHelper.checkResponseForProtection(response)) {
-				Jsoup.parse(it, Charsets.UTF_8.name(), response.request.url.toString())
+			CloudFlareHelper.PROTECTION_BLOCKED -> response.closeThrowing(
-			} ?: return response
+				CloudFlareBlockedException(
-			if (content.getElementById("challenge-error-title") != null) {
+					url = request.url.toString(),
-				val request = response.request
+					source = request.tag(MangaSource::class.java),
-				response.closeQuietly()
+				),
-				throw CloudFlareProtectedException(
+			)
+
+			CloudFlareHelper.PROTECTION_CAPTCHA -> response.closeThrowing(
+				CloudFlareProtectedException(
 					url = request.url.toString(),
 					source = request.tag(MangaSource::class.java),
 					headers = request.headers,
-				)
+				),
-			}
+			)
+
+			else -> response
 		}
-		return response
+	}
+
+	private fun Response.closeThrowing(error: IOException): Nothing {
+		try {
+			close()
+		} catch (e: Exception) {
+			error.addSuppressed(e)
+		}
+		throw error
 	}
 }

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

@@ -4,15 +4,18 @@ import android.util.Log
 import dagger.Lazy
 import okhttp3.Headers
 import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
 import okhttp3.Request
 import okhttp3.Response
+import okio.IOException
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.parser.ParserMangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mergeWith
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.net.IDN
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,11 +26,11 @@ class CommonHeadersInterceptor @Inject constructor(
 	private val mangaLoaderContextLazy: Lazy<MangaLoaderContextImpl>,
 ) : Interceptor {
 
-	override fun intercept(chain: Interceptor.Chain): Response {
+	override fun intercept(chain: Chain): Response {
 		val request = chain.request()
 		val source = request.tag(MangaSource::class.java)
 		val repository = if (source != null) {
-			mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository
+			mangaRepositoryFactoryLazy.get().create(source) as? ParserMangaRepository
 		} else {
 			if (BuildConfig.DEBUG) {
 				Log.w("Http", "Request without source tag: ${request.url}")
@@ -35,7 +38,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			null
 		}
 		val headersBuilder = request.headers.newBuilder()
-		repository?.headers?.let {
+		repository?.getRequestHeaders()?.let {
 			headersBuilder.mergeWith(it, replaceExisting = false)
 		}
 		if (headersBuilder[CommonHeaders.USER_AGENT] == null) {
@@ -46,7 +49,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.trySet(CommonHeaders.REFERER, "https://$idn/")
 		}
 		val newRequest = request.newBuilder().headers(headersBuilder.build()).build()
-		return repository?.intercept(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
+		return repository?.interceptSafe(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
 	}
 
 	private fun Headers.Builder.trySet(name: String, value: String) = try {
@@ -55,10 +58,21 @@ class CommonHeadersInterceptor @Inject constructor(
 		e.printStackTraceDebug()
 	}
 
+	private fun Interceptor.interceptSafe(chain: Chain): Response = runCatchingCancellable {
+		intercept(chain)
+	}.getOrElse { e ->
+		if (e is IOException) {
+			throw e
+		} else {
+			// only IOException can be safely thrown from an Interceptor
+			throw IOException("Error in interceptor: ${e.message}", e)
+		}
+	}
+
 	private class ProxyChain(
-		private val delegate: Interceptor.Chain,
+		private val delegate: Chain,
 		private val request: Request,
-	) : Interceptor.Chain by delegate {
+	) : Chain by delegate {
 
 		override fun request(): Request = request
 	}

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

@@ -83,6 +83,11 @@ class DoHManager(
 					tryGetByIp("2a10:50c0::2:ff"),
 				),
 			).build()
+
+		DoHProvider.ZERO_MS -> DnsOverHttps.Builder().client(bootstrapClient)
+			.url("https://2ca4h4crra.cloudflare-gateway.com/dns-query".toHttpUrl())
+			.resolvePublicAddresses(true)
+			.build()
 	}
 
 	private fun tryGetByIp(ip: String): InetAddress? = try {

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

@@ -2,5 +2,5 @@ package org.koitharu.kotatsu.core.network
 
 enum class DoHProvider {
 
-	NONE, GOOGLE, CLOUDFLARE, ADGUARD
+	NONE, GOOGLE, CLOUDFLARE, ADGUARD, ZERO_MS
-}
+}

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

@@ -1,106 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.util.Log
-import androidx.collection.ArraySet
-import coil.intercept.Interceptor
-import coil.request.ErrorResult
-import coil.request.ImageResult
-import coil.request.SuccessResult
-import coil.size.Dimension
-import coil.size.isOriginal
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.ensureSuccess
-import org.koitharu.kotatsu.core.util.ext.isHttpOrHttps
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.util.Collections
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ImageProxyInterceptor @Inject constructor(
-	private val settings: AppSettings,
-) : Interceptor {
-
-	private val blacklist = Collections.synchronizedSet(ArraySet<String>())
-
-	override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-		val request = chain.request
-		if (!settings.isImagesProxyEnabled) {
-			return chain.proceed(request)
-		}
-		val url: HttpUrl? = when (val data = request.data) {
-			is HttpUrl -> data
-			is String -> data.toHttpUrlOrNull()
-			else -> null
-		}
-		if (url == null || !url.isHttpOrHttps || url.host in blacklist) {
-			return chain.proceed(request)
-		}
-		val newUrl = HttpUrl.Builder()
-			.scheme("https")
-			.host("wsrv.nl")
-			.addQueryParameter("url", url.toString())
-			.addQueryParameter("we", null)
-		val size = request.sizeResolver.size()
-		if (!size.isOriginal) {
-			newUrl.addQueryParameter("crop", "cover")
-			(size.height as? Dimension.Pixels)?.let { newUrl.addQueryParameter("h", it.toString()) }
-			(size.width as? Dimension.Pixels)?.let { newUrl.addQueryParameter("w", it.toString()) }
-		}
-
-		val newRequest = request.newBuilder()
-			.data(newUrl.build())
-			.build()
-		val result = chain.proceed(newRequest)
-		return if (result is SuccessResult) {
-			result
-		} else {
-			logDebug((result as? ErrorResult)?.throwable)
-			chain.proceed(request).also {
-				if (it is SuccessResult) {
-					blacklist.add(url.host)
-				}
-			}
-		}
-	}
-
-	suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
-		if (!settings.isImagesProxyEnabled) {
-			return okHttp.newCall(request).await()
-		}
-		val sourceUrl = request.url
-		val targetUrl = HttpUrl.Builder()
-			.scheme("https")
-			.host("wsrv.nl")
-			.addQueryParameter("url", sourceUrl.toString())
-			.addQueryParameter("we", null)
-		val newRequest = request.newBuilder()
-			.url(targetUrl.build())
-			.build()
-		return runCatchingCancellable {
-			okHttp.doCall(newRequest)
-		}.recover {
-			logDebug(it)
-			okHttp.doCall(request).also {
-				blacklist.add(sourceUrl.host)
-			}
-		}.getOrThrow()
-	}
-
-	private suspend fun OkHttpClient.doCall(request: Request): Response {
-		return newCall(request).await().ensureSuccess()
-	}
-
-	private fun logDebug(e: Throwable?) {
-		if (BuildConfig.DEBUG) {
-			Log.w("ImageProxy", e.toString())
-		}
-	}
-}

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

@@ -13,8 +13,9 @@ import okhttp3.internal.canParseAsIpAddress
 import okhttp3.internal.closeQuietly
 import okhttp3.internal.publicsuffix.PublicSuffixDatabase
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.parser.ParserMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.EnumMap
 import javax.inject.Inject
@@ -26,8 +27,8 @@ class MirrorSwitchInterceptor @Inject constructor(
 	private val settings: AppSettings,
 ) : Interceptor {
 
-	private val locks = EnumMap<MangaSource, Any>(MangaSource::class.java)
+	private val locks = EnumMap<MangaParserSource, Any>(MangaParserSource::class.java)
-	private val blacklist = EnumMap<MangaSource, MutableSet<String>>(MangaSource::class.java)
+	private val blacklist = EnumMap<MangaParserSource, MutableSet<String>>(MangaParserSource::class.java)
 
 	val isEnabled: Boolean
 		get() = settings.isMirrorSwitchingAvailable
@@ -53,7 +54,7 @@ class MirrorSwitchInterceptor @Inject constructor(
 		}
 	}
 
-	suspend fun trySwitchMirror(repository: RemoteMangaRepository): Boolean = runInterruptible(Dispatchers.Default) {
+	suspend fun trySwitchMirror(repository: ParserMangaRepository): Boolean = runInterruptible(Dispatchers.Default) {
 		if (!isEnabled) {
 			return@runInterruptible false
 		}
@@ -75,14 +76,14 @@ class MirrorSwitchInterceptor @Inject constructor(
 		}
 	}
 
-	fun rollback(repository: RemoteMangaRepository, oldMirror: String) = synchronized(obtainLock(repository.source)) {
+	fun rollback(repository: ParserMangaRepository, oldMirror: String) = synchronized(obtainLock(repository.source)) {
 		blacklist[repository.source]?.remove(oldMirror)
 		repository.domain = oldMirror
 	}
 
 	private fun trySwitchMirror(request: Request, chain: Interceptor.Chain): Response? {
 		val source = request.tag(MangaSource::class.java) ?: return null
-		val repository = mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository ?: return null
+		val repository = mangaRepositoryFactoryLazy.get().create(source) as? ParserMangaRepository ?: return null
 		val mirrors = repository.getAvailableMirrors()
 		if (mirrors.isEmpty()) {
 			return null
@@ -93,7 +94,7 @@ class MirrorSwitchInterceptor @Inject constructor(
 	}
 
 	private fun tryMirrors(
-		repository: RemoteMangaRepository,
+		repository: ParserMangaRepository,
 		mirrors: List<String>,
 		chain: Interceptor.Chain,
 		request: Request,
@@ -145,15 +146,15 @@ class MirrorSwitchInterceptor @Inject constructor(
 		return source().readByteArray().toResponseBody(contentType())
 	}
 
-	private fun obtainLock(source: MangaSource): Any = locks.getOrPut(source) {
+	private fun obtainLock(source: MangaParserSource): Any = locks.getOrPut(source) {
 		Any()
 	}
 
-	private fun isBlacklisted(source: MangaSource, domain: String): Boolean {
+	private fun isBlacklisted(source: MangaParserSource, domain: String): Boolean {
 		return blacklist[source]?.contains(domain) == true
 	}
 
-	private fun addToBlacklist(source: MangaSource, domain: String) {
+	private fun addToBlacklist(source: MangaParserSource, domain: String) {
 		blacklist.getOrPut(source) {
 			ArraySet(2)
 		}.add(domain)

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
@@ -15,9 +14,14 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.cookies.AndroidCookieJar
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.network.cookies.PreferencesCookieJar
+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
 import javax.inject.Singleton
 
 @Module
@@ -27,15 +31,19 @@ interface NetworkModule {
 	@Binds
 	fun bindCookieJar(androidCookieJar: MutableCookieJar): CookieJar
 
+	@Binds
+	fun bindImageProxyInterceptor(impl: RealImageProxyInterceptor): ImageProxyInterceptor
+
 	companion object {
 
 		@Provides
 		@Singleton
 		fun provideCookieJar(
 			@ApplicationContext context: Context
-		): MutableCookieJar = try {
+		): MutableCookieJar = runCatching {
 			AndroidCookieJar()
-		} catch (e: AndroidRuntimeException) {
+		}.getOrElse { e ->
+			e.printStackTraceDebug()
 			// WebView is not available
 			PreferencesCookieJar(context)
 		}
@@ -50,10 +58,12 @@ interface NetworkModule {
 		@Singleton
 		@BaseHttpClient
 		fun provideBaseHttpClient(
+			@ApplicationContext contextProvider: Provider<Context>,
 			cache: Cache,
 			cookieJar: CookieJar,
 			settings: AppSettings,
 		): OkHttpClient = OkHttpClient.Builder().apply {
+			assertNotInMainThread()
 			connectTimeout(20, TimeUnit.SECONDS)
 			readTimeout(60, TimeUnit.SECONDS)
 			writeTimeout(20, TimeUnit.SECONDS)
@@ -62,7 +72,9 @@ interface NetworkModule {
 			proxyAuthenticator(ProxyAuthenticator(settings))
 			dns(DoHManager(cache, settings))
 			if (settings.isSSLBypassEnabled) {
-				bypassSSLErrors()
+				disableCertificateVerification()
+			} else {
+				installExtraCertificates(contextProvider.get())
 			}
 			cache(cache)
 			addInterceptor(GZipInterceptor())

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 org.koitharu.kotatsu.parsers.exception.TooManyRequestExceptions
-import java.time.Instant
 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? {
+	private fun String.parseRetryAfter(): Long {
-		return toLongOrNull()?.let { Instant.now().plusSeconds(it) }
+		return toLongOrNull()?.let { TimeUnit.SECONDS.toMillis(it) }
-			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant()
+			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant().toEpochMilli()
 	}
 }