Move read button to bottom

.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 a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead
+      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

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -60,7 +60,7 @@ body:
       attributes:
           label: Acknowledgements
           options:
-              - 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.
+              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
                 required: true
-              - 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).
+              - 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).
                 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: 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: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+                required: true

.gitignore

@@ -25,4 +25,3 @@
 .externalNativeBuild
 .cxx
 /.idea/deviceManager.xml
-/.kotlin/

.idea/.gitignore

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

.idea/gradle.xml

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

README.md

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

app/build.gradle

@@ -8,16 +8,16 @@ plugins {
 }
 
 android {
-	compileSdk = 35
-	buildToolsVersion = '35.0.0'
+	compileSdk = 34
+	buildToolsVersion = '34.0.0'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
-		targetSdk = 35
-		versionCode = 673
-		versionName = '7.6'
+		targetSdk = 34
+		versionCode = 642
+		versionName = '7.0.1'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -48,15 +48,14 @@ android {
 	}
 	compileOptions {
 		coreLibraryDesugaringEnabled true
-		sourceCompatibility JavaVersion.VERSION_11
-		targetCompatibility JavaVersion.VERSION_11
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_11.toString()
+		jvmTarget = JavaVersion.VERSION_1_8.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',
@@ -83,23 +82,22 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:3cdd391410') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:078b59b1e2') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.20'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
-	implementation 'androidx.appcompat:appcompat:1.7.0'
+	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.13.1'
-	implementation 'androidx.activity:activity-ktx:1.9.2'
-	implementation 'androidx.fragment:fragment-ktx:1.8.3'
-	implementation 'androidx.transition:transition-ktx:1.5.1'
-	implementation 'androidx.collection:collection-ktx:1.4.4'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
-	implementation 'androidx.lifecycle:lifecycle-service:2.8.6'
-	implementation 'androidx.lifecycle:lifecycle-process:2.8.6'
+	implementation 'androidx.activity:activity-ktx:1.9.0'
+	implementation 'androidx.fragment:fragment-ktx:1.7.1'
+	implementation 'androidx.collection:collection-ktx:1.4.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.8.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.8.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -107,12 +105,12 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.6'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.0'
 	implementation 'androidx.webkit:webkit:1.11.0'
 
-	implementation 'androidx.work:work-runtime:2.9.1'
+	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
-	implementation('com.google.guava:guava:33.2.1-android') {
+	implementation('com.google.guava:guava:32.0.1-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
 		exclude group: 'org.checkerframework', module: 'checker-qual'
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
@@ -125,44 +123,46 @@ dependencies {
 	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-tls:4.12.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
-	implementation 'com.squareup.okio:okio:3.9.1'
+	implementation 'com.squareup.okio:okio:3.9.0'
 
 	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.52'
-	kapt 'com.google.dagger:hilt-compiler:2.52'
+	implementation 'com.google.dagger:hilt-android:2.51.1'
+	kapt 'com.google.dagger:hilt-compiler:2.51.1'
 	implementation 'androidx.hilt:hilt-work:1.2.0'
 	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
-	implementation 'io.coil-kt:coil-base:2.7.0'
-	implementation 'io.coil-kt:coil-svg:2.7.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:4ec7176962'
+	implementation 'io.coil-kt:coil-base:2.6.0'
+	implementation 'io.coil-kt:coil-svg:2.6.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.4'
-	implementation 'ch.acra:acra-dialog:5.11.4'
+	implementation 'ch.acra:acra-http:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.3'
+	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
+	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
 	implementation 'org.conscrypt:conscrypt-android:2.5.2'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:3.0-alpha-8'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 	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.9.0'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
-	androidTestImplementation 'androidx.test:runner:1.6.1'
-	androidTestImplementation 'androidx.test:rules:1.6.1'
-	androidTestImplementation 'androidx.test:core-ktx:1.6.1'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
+	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
+	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
 	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.52'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.52'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51.1'
 }

app/proguard-rules.pro

@@ -14,7 +14,6 @@
 -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
@@ -22,7 +21,3 @@
 -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

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

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<application>
+
+		<activity
+			android:name=".tracker.ui.debug.TrackerDebugActivity"
+			android:label="@string/check_for_new_chapters" />
+
+	</application>
+
+</manifest>

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

@@ -8,7 +8,6 @@ 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() {
 
@@ -31,7 +30,6 @@ class KotatsuApp : BaseApp() {
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
 				.setClassInstanceLimit(PageLoader::class.java, 1)
-				.setClassInstanceLimit(ReaderViewModel::class.java, 1)
 				.penaltyLog()
 				.build(),
 		)

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

@@ -1,33 +0,0 @@
-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/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugAD.kt

@@ -58,7 +58,7 @@ fun trackDebugAD(
 				append(" - ")
 				bold {
 					color(context.getThemeColor(materialR.attr.colorError, Color.RED)) {
-						append(item.lastError ?: getString(R.string.error))
+						append(getString(R.string.error))
 					}
 				}
 			}

app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackDebugItem.kt

@@ -11,7 +11,6 @@ data class TrackDebugItem(
 	val lastCheckTime: Instant?,
 	val lastChapterDate: Instant?,
 	val lastResult: Int,
-	val lastError: String?,
 ) : ListModel {
 
 	override fun areItemsTheSame(other: ListModel): Boolean {

app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugActivity.kt

@@ -32,7 +32,6 @@ class TrackerDebugActivity : BaseActivity<ActivityTrackerDebugBinding>(), OnList
 		val tracksAdapter = BaseListAdapter<TrackDebugItem>()
 			.addDelegate(ListItemType.FEED, trackDebugAD(this, coil, this))
 		with(viewBinding.recyclerView) {
-			setHasFixedSize(true)
 			adapter = tracksAdapter
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}

app/src/debug/kotlin/org/koitharu/kotatsu/tracker/ui/debug/TrackerDebugViewModel.kt

@@ -31,7 +31,6 @@ class TrackerDebugViewModel @Inject constructor(
 			lastCheckTime = it.track.lastCheckTime.toInstantOrNull(),
 			lastChapterDate = it.track.lastChapterDate.toInstantOrNull(),
 			lastResult = it.track.lastResult,
-			lastError = it.track.lastError,
 		)
 	}
 }

app/src/debug/res/layout/item_track_debug.xml

@@ -4,10 +4,9 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="72dp"
 	android:background="@drawable/list_selector"
-	android:clipChildren="false"
-	android:minHeight="72dp">
+	android:clipChildren="false">
 
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
@@ -15,7 +14,9 @@
 		android:layout_height="40dp"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
 		android:scaleType="centerCrop"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
@@ -31,6 +32,7 @@
 		android:ellipsize="end"
 		android:maxLines="1"
 		android:textAppearance="?attr/textAppearanceTitleSmall"
+		app:layout_constraintBottom_toTopOf="@+id/textView_summary"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
 		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
@@ -41,14 +43,14 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
-		android:layout_marginTop="2dp"
 		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
-		android:paddingBottom="16dp"
+		android:maxLines="1"
 		android:textAppearance="?attr/textAppearanceBodySmall"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
 		app:layout_constraintTop_toBottomOf="@+id/textView_title"
-		tools:text="@tools:sample/lorem[2]" />
+		tools:text="@tools:sample/lorem/random" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

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

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

@@ -12,23 +12,19 @@ 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_DEFAULT = 0.2f
+private const val MATCH_THRESHOLD = 0.2f
 
 class AlternativesUseCase @Inject constructor(
 	private val sourcesRepository: MangaSourcesRepository,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {
 
-	suspend operator fun invoke(manga: Manga): Flow<Manga> = invoke(manga, MATCH_THRESHOLD_DEFAULT)
-
-	suspend operator fun invoke(manga: Manga, matchThreshold: Float): Flow<Manga> {
+	suspend operator fun invoke(manga: Manga): Flow<Manga> {
 		val sources = getSources(manga.source)
 		if (sources.isEmpty()) {
 			return emptyFlow()
@@ -37,17 +33,17 @@ class AlternativesUseCase @Inject constructor(
 		return channelFlow {
 			for (source in sources) {
 				val repository = mangaRepositoryFactory.create(source)
-				if (!repository.filterCapabilities.isSearchSupported) {
+				if (!repository.isSearchSupported) {
 					continue
 				}
 				launch {
 					val list = runCatchingCancellable {
 						semaphore.withPermit {
-							repository.getList(offset = 0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
+							repository.getList(offset = 0, filter = MangaListFilter.Search(manga.title))
 						}
 					}.getOrDefault(emptyList())
 					for (item in list) {
-						if (item.matches(manga, matchThreshold)) {
+						if (item.matches(manga)) {
 							send(item)
 						}
 					}
@@ -61,31 +57,29 @@ class AlternativesUseCase @Inject constructor(
 	}
 
 	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
-		val result = ArrayList<MangaSource>(MangaParserSource.entries.size - 2)
+		val result = ArrayList<MangaSource>(MangaSource.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, threshold: Float): Boolean {
-		return matchesTitles(title, ref.title, threshold) ||
-			matchesTitles(title, ref.altTitle, threshold) ||
-			matchesTitles(altTitle, ref.title, threshold) ||
-			matchesTitles(altTitle, ref.altTitle, threshold)
+	private fun Manga.matches(ref: Manga): Boolean {
+		return matchesTitles(title, ref.title) ||
+			matchesTitles(title, ref.altTitle) ||
+			matchesTitles(altTitle, ref.title) ||
+			matchesTitles(altTitle, ref.altTitle)
 
 	}
 
-	private fun matchesTitles(a: String?, b: String?, threshold: Float): Boolean {
-		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, threshold)
+	private fun matchesTitles(a: String?, b: String?): Boolean {
+		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
 	}
 
 	private fun MangaSource.priority(ref: MangaSource): Int {
 		var res = 0
-		if (this is MangaParserSource && ref is MangaParserSource) {
-			if (locale == ref.locale) res += 2
-			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

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

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

@@ -7,43 +7,34 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.details.domain.ProgressUpdateUseCase
 import org.koitharu.kotatsu.history.data.HistoryEntity
+import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.history.data.toMangaHistory
-import org.koitharu.kotatsu.list.domain.ReadingProgress.Companion.PROGRESS_NONE
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-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 scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
 ) {
-	suspend operator fun invoke(
-		oldManga: Manga,
-		newManga: Manga,
-	) {
-		val oldDetails =
-			if (oldManga.chapters.isNullOrEmpty()) {
-				runCatchingCancellable {
-					mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
-				}.getOrDefault(oldManga)
-			} else {
-				oldManga
-			}
-		val newDetails =
-			if (newManga.chapters.isNullOrEmpty()) {
-				mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
-			} else {
-				newManga
-			}
+
+	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
+		val oldDetails = if (oldManga.chapters.isNullOrEmpty()) {
+			runCatchingCancellable {
+				mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
+			}.getOrDefault(oldManga)
+		} else {
+			oldManga
+		}
+		val newDetails = if (newManga.chapters.isNullOrEmpty()) {
+			mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+		} else {
+			newManga
+		}
 		mangaDataRepository.storeManga(newDetails)
 		database.withTransaction {
 			// replace favorites
@@ -52,69 +43,36 @@ constructor(
 			if (oldFavourites.isNotEmpty()) {
 				favoritesDao.delete(oldManga.id)
 				for (f in oldFavourites) {
-					val e =
-						f.copy(
-							mangaId = newManga.id,
-						)
+					val e = f.copy(
+						mangaId = newManga.id,
+					)
 					favoritesDao.upsert(e)
 				}
 			}
 			// replace history
 			val historyDao = database.getHistoryDao()
 			val oldHistory = historyDao.find(oldDetails.id)
-			val newHistory =
-				if (oldHistory != null) {
-					val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
-					historyDao.delete(oldDetails.id)
-					historyDao.upsert(newHistory)
-					newHistory
-				} else {
-					null
-				}
+			if (oldHistory != null) {
+				val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
+				historyDao.delete(oldDetails.id)
+				historyDao.upsert(newHistory)
+			}
 			// 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,
-					)
+				val newTrack = TrackEntity(
+					mangaId = newDetails.id,
+					lastChapterId = lastChapter?.id ?: 0L,
+					newChapters = 0,
+					lastCheckTime = System.currentTimeMillis(),
+					lastChapterDate = lastChapter?.uploadDate ?: 0L,
+					lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+				)
 				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)
 	}
@@ -127,53 +85,48 @@ 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) {
-					chapters[(chapters.lastIndex * history.percent).toInt()]
-				} else {
-					chapters.first()
-				}
+			val currentChapter = if (history.percent in 0f..1f) {
+				chapters[(chapters.lastIndex * history.percent).toInt()]
+			} else {
+				chapters.first()
+			}
 			return HistoryEntity(
 				mangaId = newManga.id,
 				createdAt = history.createdAt,
-				updatedAt = history.updatedAt,
+				updatedAt = System.currentTimeMillis(),
 				chapterId = currentChapter.id,
 				page = history.page,
 				scroll = history.scroll,
 				percent = history.percent,
 				deletedAt = 0,
-				chaptersCount = chapters.count { it.branch == currentChapter.branch },
+				chaptersCount = chapters.size,
 			)
 		}
 		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) {
-					(oldChapters.lastIndex * history.percent).toInt()
-				} else {
-					0
-				}
+			index = if (history.percent in 0f..1f) {
+				(oldChapters.lastIndex * history.percent).toInt()
+			} else {
+				0
+			}
 		}
 		val newChapters = checkNotNull(newManga.chapters).groupBy { it.branch }
-		val newBranch =
-			if (newChapters.containsKey(branch)) {
-				branch
-			} else {
-				newManga.getPreferredBranch(null)
-			}
-		val newChapterId =
-			checkNotNull(newChapters[newBranch])
-				.let {
-					val oldChapter = oldChapters[index]
-					it.findByNumber(oldChapter.volume, oldChapter.number) ?: it.getOrNull(index) ?: it.last()
-				}.id
+		val newBranch = if (newChapters.containsKey(branch)) {
+			branch
+		} else {
+			newManga.getPreferredBranch(null)
+		}
+		val newChapterId = checkNotNull(newChapters[newBranch]).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 = history.updatedAt,
+			updatedAt = System.currentTimeMillis(),
 			chapterId = newChapterId,
 			page = history.page,
 			scroll = history.scroll,
@@ -183,13 +136,11 @@ constructor(
 		)
 	}
 
-	private fun List<MangaChapter>.findByNumber(
-		volume: Int,
-		number: Float,
-	): MangaChapter? =
-		if (number <= 0f) {
+	private fun List<MangaChapter>.findByNumber(volume: Int, number: Float): MangaChapter? {
+		return if (number <= 0f) {
 			null
 		} else {
 			firstOrNull { it.volume == volume && it.number == number }
 		}
+	}
 }

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

@@ -7,10 +7,9 @@ import androidx.core.text.inSpans
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.transform.RoundedCornersTransformation
+import coil.transform.CircleCropTransformation
 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
@@ -62,9 +61,9 @@ fun alternativeAD(
 				}
 			}
 		}
-		binding.progressView.setProgress(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
+		binding.progressView.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.getTitle(chip.context)
+			chip.text = item.manga.source.title
 			ImageRequest.Builder(context)
 				.data(item.manga.source.faviconUri())
 				.lifecycle(lifecycleOwner)
@@ -75,7 +74,7 @@ fun alternativeAD(
 				.fallback(R.drawable.ic_web)
 				.error(R.drawable.ic_web)
 				.source(item.manga.source)
-				.transformations(RoundedCornersTransformation(context.resources.getDimension(R.dimen.chip_icon_corner)))
+				.transformations(CircleCropTransformation())
 				.allowRgb565(true)
 				.enqueueWith(coil)
 		}

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,8 +30,7 @@ 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.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.search.ui.MangaListActivity
+import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -82,37 +81,29 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 
 	override fun onItemClick(item: MangaAlternativeModel, view: View) {
 		when (view.id) {
-			R.id.chip_source -> startActivity(
-				MangaListActivity.newIntent(
-					this,
-					item.manga.source,
-					MangaListFilter(query = viewModel.manga.title),
-				),
-			)
-
+			R.id.chip_source -> startActivity(SearchActivity.newIntent(this, item.manga.source, viewModel.manga.title))
 			R.id.button_migrate -> confirmMigration(item.manga)
 			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
 		}
 	}
 
 	private fun confirmMigration(target: Manga) {
-		buildAlertDialog(this, isCentered = true) {
-			setIcon(R.drawable.ic_replace)
-			setTitle(R.string.manga_migration)
-			setMessage(
+		MaterialAlertDialogBuilder(this, DIALOG_THEME_CENTERED)
+			.setIcon(R.drawable.ic_replace)
+			.setTitle(R.string.manga_migration)
+			.setMessage(
 				getString(
 					R.string.migrate_confirmation,
 					viewModel.manga.title,
-					viewModel.manga.source.getTitle(context),
+					viewModel.manga.source.title,
 					target.title,
-					target.source.getTitle(context),
+					target.source.title,
 				),
 			)
-			setNegativeButton(android.R.string.cancel, null)
-			setPositiveButton(R.string.migrate) { _, _ ->
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.migrate) { _, _ ->
 				viewModel.migrate(target)
-			}
-		}.show()
+			}.show()
 	}
 
 	companion object {

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

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

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

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

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

@@ -1,13 +1,12 @@
 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: ReadingProgress?,
+	val progress: Float,
 	private val referenceChapters: Int,
 ) : ListModel {
 

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

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

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

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

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

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

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

@@ -12,14 +12,13 @@ import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.internal.userAgent
 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.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -43,9 +42,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
-		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
-		repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
+		val userAgent = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)?.let { source ->
+			val repository = mangaRepositoryFactory.create(source) as? RemoteMangaRepository
+			repository?.headers?.get(CommonHeaders.USER_AGENT)
+		}
 		viewBinding.webView.configureForParser(userAgent)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
@@ -108,10 +108,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onDestroy() {
 		super.onDestroy()
-		if (hasViewBinding()) {
-			viewBinding.webView.stopLoading()
-			viewBinding.webView.destroy()
-		}
+		viewBinding.webView.stopLoading()
+		viewBinding.webView.destroy()
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {
@@ -147,7 +145,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 			return Intent(context, BrowserActivity::class.java)
 				.setData(Uri.parse(url))
 				.putExtra(EXTRA_TITLE, title)
-				.putExtra(EXTRA_SOURCE, source?.name)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }

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

@@ -14,9 +14,8 @@ 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(
@@ -47,7 +46,7 @@ class CaptchaNotifier(
 			.setGroup(GROUP_CAPTCHA)
 			.setAutoCancel(true)
 			.setVisibility(
-				if (exception.source?.isNsfw() == true) {
+				if (exception.source?.contentType == ContentType.HENTAI) {
 					NotificationCompat.VISIBILITY_SECRET
 				} else {
 					NotificationCompat.VISIBILITY_PUBLIC
@@ -56,7 +55,7 @@ class CaptchaNotifier(
 			.setContentText(
 				context.getString(
 					R.string.captcha_required_summary,
-					exception.source?.getTitle(context) ?: context.getString(R.string.app_name),
+					exception.source?.title ?: context.getString(R.string.app_name),
 				),
 			)
 			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -29,6 +28,7 @@ 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
@@ -55,11 +55,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		val url = intent?.dataString
-		if (url.isNullOrEmpty()) {
-			finishAfterTransition()
-			return
-		}
+		val url = intent?.dataString.orEmpty()
 		cfClient = CloudFlareClient(cookieJar, this, url)
 		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
 		viewBinding.webView.webViewClient = cfClient
@@ -67,7 +63,12 @@ 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)
 		}
@@ -180,13 +181,13 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		}
 	}
 
-	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
+	class Contract : ActivityResultContract<CloudFlareProtectedException, TaggedActivityResult>() {
 		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
 			return newIntent(context, input)
 		}
 
-		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
-			return resultCode == Activity.RESULT_OK
+		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
+			return TaggedActivityResult(TAG, resultCode)
 		}
 	}
 

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core
 
 import android.app.Application
-import android.content.ContentResolver
 import android.content.Context
 import android.provider.SearchRecentSuggestions
 import android.text.Html
@@ -28,8 +27,8 @@ import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 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
@@ -49,7 +48,6 @@ 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.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
@@ -111,8 +109,6 @@ interface AppModule {
 				.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))
@@ -156,12 +152,10 @@ interface AppModule {
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
 			acraScreenLogger: AcraScreenLogger,
-			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
 			acraScreenLogger,
-			screenshotPolicyHelper,
 		)
 
 		@Provides

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

@@ -11,7 +11,6 @@ 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
@@ -29,9 +28,6 @@ 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
@@ -64,13 +60,6 @@ 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)
@@ -93,7 +82,6 @@ open class BaseApp : Application(), Configuration.Provider {
 		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
-			localStorageChanges.collect(localMangaIndexProvider.get())
 		}
 		workScheduleManager.init()
 		WorkServiceStopHelper(workManagerProvider).setup()

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

@@ -0,0 +1,24 @@
+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,7 +4,6 @@ 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
@@ -39,7 +38,7 @@ class BackupZipInput private constructor(val file: File) : Closeable {
 	fun cleanupAsync() {
 		processLifecycleScope.launch(Dispatchers.IO, CoroutineStart.ATOMIC) {
 			runCatching {
-				closeQuietly()
+				close()
 				file.delete()
 			}
 		}
@@ -47,22 +46,14 @@ class BackupZipInput private constructor(val file: File) : Closeable {
 
 	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
-				}
+		fun from(file: File): BackupZipInput = try {
+			val res = BackupZipInput(file)
+			if (res.zipFile.getEntry("index") == null) {
+				throw BadBackupFormatException(null)
 			}
+			res
+		} catch (e: ZipException) {
+			throw BadBackupFormatException(e)
 		}
 	}
 }

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

@@ -12,7 +12,6 @@ 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) {
@@ -85,9 +84,6 @@ 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,9 +89,6 @@ 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/MemoryContentCache.kt

@@ -16,16 +16,16 @@ class MemoryContentCache @Inject constructor(application: Application) : Compone
 
 	private val isLowRam = application.isLowRamDevice()
 
+	init {
+		application.registerComponentCallbacks(this)
+	}
+
 	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)
-	}
-
 	suspend fun getDetails(source: MangaSource, url: String): Manga? {
 		return detailsCache[Key(source, url)]?.awaitOrNull()
 	}

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

@@ -33,9 +33,6 @@ 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
@@ -51,8 +48,6 @@ 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
@@ -63,14 +58,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 = 23
+const val DATABASE_VERSION = 20
 
 @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, LocalMangaIndexEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -101,8 +96,6 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getSourcesDao(): MangaSourcesDao
 
 	abstract fun getStatsDao(): StatsDao
-
-	abstract fun getLocalMangaIndexDao(): LocalMangaIndexDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -125,9 +118,6 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration17To18(),
 	Migration18To19(),
 	Migration19To20(),
-	Migration20To21(),
-	Migration21To22(),
-	Migration22To23(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -1,113 +0,0 @@
-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/MangaSourcesDao.kt

@@ -11,26 +11,19 @@ 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 pinned DESC, sort_key")
+	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
 	@Query("SELECT source FROM sources WHERE enabled = 1")
 	abstract suspend fun findAllEnabledNames(): List<String>
 
-	@Query("SELECT * FROM sources WHERE added_in >= :version")
-	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
-
-	@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")
+	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT enabled FROM sources WHERE source = :source")
@@ -45,12 +38,6 @@ 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>)
@@ -58,14 +45,11 @@ 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 pinned DESC, $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
 		return observeImpl(query)
 	}
 
@@ -73,7 +57,7 @@ abstract class MangaSourcesDao {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
 		return findAllImpl(query)
 	}
 
@@ -84,9 +68,6 @@ abstract class MangaSourcesDao {
 				source = source,
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
-				addedIn = BuildConfig.VERSION_CODE,
-				lastUsedAt = 0,
-				isPinned = false,
 			)
 			upsert(entity)
 		}
@@ -105,6 +86,5 @@ 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,8 +1,6 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.Dao
-import androidx.room.Query
-import androidx.room.Upsert
+import androidx.room.*
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 
@@ -15,9 +13,6 @@ abstract class PreferencesDao {
 	@Query("SELECT * FROM preferences WHERE manga_id = :mangaId")
 	abstract fun observe(mangaId: Long): Flow<MangaPrefsEntity?>
 
-	@Query("UPDATE preferences SET cf_brightness = 0, cf_contrast = 0, cf_invert = 0, cf_grayscale = 0")
-	abstract suspend fun resetColorFilters()
-
 	@Upsert
 	abstract suspend fun upsert(pref: MangaPrefsEntity)
 }

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

@@ -4,59 +4,36 @@ 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
-abstract class TrackLogsDao : MangaQueryBuilder.ConditionCallback {
-
-	fun observeAll(
-		limit: Int,
-		filterOptions: Set<ListFilterOption>,
-	): Flow<List<TrackLogWithManga>> = observeAllImpl(
-		MangaQueryBuilder("track_logs", this)
-			.filters(filterOptions)
-			.limit(limit)
-			.orderBy("created_at DESC")
-			.build(),
-	)
-
-	@Query("SELECT COUNT(*) FROM track_logs WHERE unread = 1")
-	abstract fun observeUnreadCount(): Flow<Int>
-
-	@Query("DELETE FROM track_logs")
-	abstract suspend fun clear()
-
-	@Query("UPDATE track_logs SET unread = 0 WHERE id = :id")
-	abstract suspend fun markAsRead(id: Long)
-
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	abstract suspend fun insert(entity: TrackLogEntity): Long
-
-	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
-	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")
-	abstract suspend fun count(): Int
+interface TrackLogsDao {
 
 	@Transaction
-	@RawQuery(observedEntities = [TrackLogEntity::class])
-	protected abstract fun observeAllImpl(query: SupportSQLiteQuery): Flow<List<TrackLogWithManga>>
+	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
+	fun observeAll(limit: Int): 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
-	}
+	@Query("SELECT COUNT(*) FROM track_logs WHERE unread = 1")
+	fun observeUnreadCount(): Flow<Int>
+
+	@Query("DELETE FROM track_logs")
+	suspend fun clear()
+
+	@Query("UPDATE track_logs SET unread = 0 WHERE id = :id")
+	suspend fun markAsRead(id: Long)
+
+	@Insert(onConflict = OnConflictStrategy.REPLACE)
+	suspend fun insert(entity: TrackLogEntity): Long
+
+	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
+	suspend fun gc()
+
+	@Query("DELETE FROM track_logs WHERE id IN (SELECT id FROM track_logs ORDER BY created_at DESC LIMIT 0 OFFSET :size)")
+	suspend fun trim(size: Int)
+
+	@Query("SELECT COUNT(*) FROM track_logs")
+	suspend fun count(): Int
 }

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

@@ -39,8 +39,6 @@ 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,7 +14,4 @@ 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.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class Migration16To17(context: Context) : Migration(16, 17) {
 
@@ -15,8 +15,11 @@ 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 = MangaParserSource.entries
+		val sources = MangaSource.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/Migration20To21.kt

@@ -1,12 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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/IncompatiblePluginException.kt

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

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

@@ -1,5 +0,0 @@
-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

@@ -0,0 +1,13 @@
+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,74 +1,61 @@
 package org.koitharu.kotatsu.core.exceptions.resolve
 
-import android.content.Context
-import android.widget.Toast
-import androidx.activity.result.ActivityResultCaller
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
-import androidx.collection.MutableScatterMap
-import androidx.fragment.app.FragmentManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import androidx.collection.ArrayMap
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 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.ext.findActivity
+import org.koitharu.kotatsu.core.util.TaggedActivityResult
 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 @AssistedInject constructor(
-	@Assisted private val host: Host,
-	private val settings: AppSettings,
-	private val scrobblerAuthHelperProvider: Provider<ScrobblerAuthHelper>,
-) {
-	private val continuations = MutableScatterMap<String, Continuation<Boolean>>(1)
+class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 
-	private val sourceAuthContract = host.registerForActivityResult(SourceAuthActivity.Contract()) {
-		handleActivityResult(SourceAuthActivity.TAG, it)
+	private val continuations = ArrayMap<String, Continuation<Boolean>>(1)
+	private val activity: FragmentActivity?
+	private val fragment: Fragment?
+	private val sourceAuthContract: ActivityResultLauncher<MangaSource>
+	private val cloudflareContract: ActivityResultLauncher<CloudFlareProtectedException>
+
+	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()) {
-		handleActivityResult(CloudFlareActivity.TAG, it)
+
+	constructor(fragment: Fragment) {
+		this.fragment = fragment
+		activity = null
+		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
+		cloudflareContract = fragment.registerForActivityResult(CloudFlareActivity.Contract(), this)
+	}
+
+	override fun onActivityResult(result: TaggedActivityResult) {
+		continuations.remove(result.tag)?.resume(result.isSuccess)
 	}
 
 	fun showDetails(e: Throwable, url: String?) {
-		ErrorDetailsDialog.show(host.getChildFragmentManager(), e, url)
+		ErrorDetailsDialog.show(getFragmentManager(), e, url)
 	}
 
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
 		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
@@ -79,20 +66,6 @@ class ExceptionResolver @AssistedInject constructor(
 			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
 	}
 
@@ -106,67 +79,26 @@ class ExceptionResolver @AssistedInject constructor(
 		sourceAuthContract.launch(source)
 	}
 
-	private fun openInBrowser(url: String) = host.withContext {
-		startActivity(BrowserActivity.newIntent(this, url, null, null))
+	private fun openInBrowser(url: String) {
+		val context = activity ?: fragment?.activity ?: return
+		context.startActivity(BrowserActivity.newIntent(context, url, null, null))
 	}
 
-	private fun openAlternatives(manga: Manga) = host.withContext {
-		startActivity(AlternativesActivity.newIntent(this, manga))
+	private fun openAlternatives(manga: Manga) {
+		val context = activity ?: fragment?.activity ?: return
+		context.startActivity(AlternativesActivity.newIntent(context, manga))
 	}
 
-	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
-		}
-		MaterialAlertDialogBuilder(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_SHORT).show()
-				ctx.findActivity()?.finishAffinity()
-			}.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
-	}
+	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
 
 	companion object {
 
 		@StringRes
 		fun getResolveStringId(e: Throwable) = when (e) {
 			is CloudFlareProtectedException -> R.string.captcha_solve
-			is ScrobblerAuthRequiredException,
 			is AuthRequiredException -> R.string.sign_in
-
 			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
 			is UnsupportedSourceException -> if (e.manga != null) R.string.alternatives else 0
-			is SSLException,
-			is CertPathValidatorException -> R.string.fix
-
-			is ProxyConfigException -> R.string.settings
-
 			else -> 0
 		}
 

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

@@ -1,32 +0,0 @@
-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,17 @@
 package org.koitharu.kotatsu.core.model
 
 import android.net.Uri
-import android.text.SpannableStringBuilder
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.collection.MutableObjectIntMap
 import androidx.core.os.LocaleListCompat
-import androidx.core.text.buildSpannedString
-import androidx.core.text.strikeThrough
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.parsers.model.ContentRating
-import org.koitharu.kotatsu.parsers.model.Demographic
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.formatSimple
 import org.koitharu.kotatsu.parsers.util.mapToSet
@@ -73,17 +69,6 @@ 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)
 }
@@ -124,10 +109,7 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 }
 
 val Manga.isLocal: Boolean
-	get() = source == LocalMangaSource
-
-val Manga.isBroken: Boolean
-	get() = source == UnknownMangaSource
+	get() = source == MangaSource.LOCAL
 
 val Manga.appUrl: Uri
 	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
@@ -157,26 +139,3 @@ 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,5 +12,4 @@ 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,49 +7,26 @@ 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.splitTwoParts
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import java.util.Locale
 import com.google.android.material.R as materialR
 
-data object LocalMangaSource : MangaSource {
-	override val name = "LOCAL"
-}
-
-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 {
+fun MangaSource(name: String): MangaSource {
+	MangaSource.entries.forEach {
 		if (it.name == name) return it
 	}
-	return UnknownMangaSource
+	return MangaSource.DUMMY
 }
 
-fun Collection<String>.toMangaSources() = map(::MangaSource)
-
-fun MangaSource.isNsfw(): Boolean = when (this) {
-	is MangaSourceInfo -> mangaSource.isNsfw()
-	is MangaParserSource -> contentType == ContentType.HENTAI
-	else -> false
-}
+fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
 
 @get:StringRes
 val ContentType.titleResId
@@ -58,42 +35,25 @@ 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
 	}
 
-tailrec fun MangaSource.unwrap(): MangaSource = if (this is MangaSourceInfo) {
-	mangaSource.unwrap()
+fun MangaSource.getSummary(context: Context): String {
+	val type = context.getString(contentType.titleResId)
+	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 {
-	this
+	title
 }
 
-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(
+private 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

@@ -1,9 +0,0 @@
-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

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

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

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

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

@@ -5,7 +5,6 @@ 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
@@ -31,7 +30,7 @@ data class ParcelableManga(
 			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
 			parcel.writeSerializable(state)
 			parcel.writeString(author)
-			parcel.writeString(source.name)
+			parcel.writeSerializable(source)
 		}
 
 		override fun create(parcel: Parcel) = ParcelableManga(
@@ -50,8 +49,8 @@ data class ParcelableManga(
 				state = parcel.readSerializableCompat(),
 				author = parcel.readString(),
 				chapters = null,
-				source = MangaSource(parcel.readString()),
-			),
+				source = requireNotNull(parcel.readSerializableCompat()),
+			)
 		)
 	}
 }

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

@@ -1,53 +0,0 @@
-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.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 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 = MangaSource(parcel.readString()),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
 	override fun MangaPage.write(parcel: Parcel, flags: Int) {
 		parcel.writeLong(id)
 		parcel.writeString(url)
 		parcel.writeString(preview)
-		parcel.writeString(source.name)
+		parcel.writeSerializable(source)
 	}
 }
 

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.model.MangaSource
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 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 = MangaSource(parcel.readString()),
+		source = requireNotNull(parcel.readSerializableCompat()),
 	)
 
 	override fun MangaTag.write(parcel: Parcel, flags: Int) {
 		parcel.writeString(title)
 		parcel.writeString(key)
-		parcel.writeString(source.name)
+		parcel.writeSerializable(source)
 	}
 }
 

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

@@ -1,9 +1,8 @@
 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
@@ -32,12 +31,9 @@ class AppProxySelector(
 		val type = settings.proxyType
 		val address = settings.proxyAddress
 		val port = settings.proxyPort
-		if (type == Proxy.Type.DIRECT) {
+		if (type == Proxy.Type.DIRECT || address.isNullOrEmpty() || port == 0) {
 			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/CommonHeadersInterceptor.kt

@@ -4,18 +4,15 @@ 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.ParserMangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 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
@@ -26,11 +23,11 @@ class CommonHeadersInterceptor @Inject constructor(
 	private val mangaLoaderContextLazy: Lazy<MangaLoaderContextImpl>,
 ) : Interceptor {
 
-	override fun intercept(chain: Chain): Response {
+	override fun intercept(chain: Interceptor.Chain): Response {
 		val request = chain.request()
 		val source = request.tag(MangaSource::class.java)
 		val repository = if (source != null) {
-			mangaRepositoryFactoryLazy.get().create(source) as? ParserMangaRepository
+			mangaRepositoryFactoryLazy.get().create(source) as? RemoteMangaRepository
 		} else {
 			if (BuildConfig.DEBUG) {
 				Log.w("Http", "Request without source tag: ${request.url}")
@@ -38,7 +35,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			null
 		}
 		val headersBuilder = request.headers.newBuilder()
-		repository?.getRequestHeaders()?.let {
+		repository?.headers?.let {
 			headersBuilder.mergeWith(it, replaceExisting = false)
 		}
 		if (headersBuilder[CommonHeaders.USER_AGENT] == null) {
@@ -49,7 +46,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.trySet(CommonHeaders.REFERER, "https://$idn/")
 		}
 		val newRequest = request.newBuilder().headers(headersBuilder.build()).build()
-		return repository?.interceptSafe(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
+		return repository?.intercept(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
 	}
 
 	private fun Headers.Builder.trySet(name: String, value: String) = try {
@@ -58,21 +55,10 @@ 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: Chain,
+		private val delegate: Interceptor.Chain,
 		private val request: Request,
-	) : Chain by delegate {
+	) : Interceptor.Chain by delegate {
 
 		override fun request(): Request = request
 	}

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

@@ -83,11 +83,6 @@ 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, ZERO_MS
-}
+	NONE, GOOGLE, CLOUDFLARE, ADGUARD
+}

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

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

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.network
 
 import android.content.Context
+import android.util.AndroidRuntimeException
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -14,11 +15,8 @@ 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
@@ -31,19 +29,15 @@ interface NetworkModule {
 	@Binds
 	fun bindCookieJar(androidCookieJar: MutableCookieJar): CookieJar
 
-	@Binds
-	fun bindImageProxyInterceptor(impl: RealImageProxyInterceptor): ImageProxyInterceptor
-
 	companion object {
 
 		@Provides
 		@Singleton
 		fun provideCookieJar(
 			@ApplicationContext context: Context
-		): MutableCookieJar = runCatching {
+		): MutableCookieJar = try {
 			AndroidCookieJar()
-		}.getOrElse { e ->
-			e.printStackTraceDebug()
+		} catch (e: AndroidRuntimeException) {
 			// WebView is not available
 			PreferencesCookieJar(context)
 		}

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

@@ -3,27 +3,28 @@ package org.koitharu.kotatsu.core.network
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
-import org.koitharu.kotatsu.parsers.exception.TooManyRequestExceptions
+import org.koitharu.kotatsu.core.exceptions.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(),
-				retryAfter = response.header(CommonHeaders.RETRY_AFTER)?.parseRetryAfter() ?: 0L,
+				retryAt = retryDate,
 			)
 		}
 		return response
 	}
 
-	private fun String.parseRetryAfter(): Long {
-		return toLongOrNull()?.let { TimeUnit.SECONDS.toMillis(it) }
-			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant().toEpochMilli()
+	private fun String.parseRetryDate(): Instant? {
+		return toLongOrNull()?.let { Instant.now().plusSeconds(it) }
+			?: ZonedDateTime.parse(this, DateTimeFormatter.RFC_1123_DATE_TIME).toInstant()
 	}
 }

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

@@ -1,87 +0,0 @@
-package org.koitharu.kotatsu.core.network.imageproxy
-
-import android.util.Log
-import androidx.collection.ArraySet
-import coil.intercept.Interceptor
-import coil.network.HttpException
-import coil.request.ErrorResult
-import coil.request.ImageRequest
-import coil.request.ImageResult
-import coil.request.SuccessResult
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.jsoup.HttpStatusException
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.exceptions.CloudFlareBlockedException
-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.net.HttpURLConnection
-import java.util.Collections
-
-abstract class BaseImageProxyInterceptor : ImageProxyInterceptor {
-
-	private val blacklist = Collections.synchronizedSet(ArraySet<String>())
-
-	final override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-		val request = chain.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 newRequest = onInterceptImageRequest(request, url)
-		return when (val result = chain.proceed(newRequest)) {
-			is SuccessResult -> result
-			is ErrorResult -> {
-				logDebug(result.throwable, newRequest.data)
-				chain.proceed(request).also {
-					if (it is SuccessResult && result.throwable.isBlockedByServer()) {
-						blacklist.add(url.host)
-					}
-				}
-			}
-		}
-	}
-
-	final override suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
-		val newRequest = onInterceptPageRequest(request)
-		return runCatchingCancellable {
-			okHttp.doCall(newRequest)
-		}.recover { error ->
-			logDebug(error, newRequest.url)
-			okHttp.doCall(request).also {
-				if (error.isBlockedByServer()) {
-					blacklist.add(request.url.host)
-				}
-			}
-		}.getOrThrow()
-	}
-
-	protected abstract suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest
-
-	protected abstract suspend fun onInterceptPageRequest(request: Request): Request
-
-	private suspend fun OkHttpClient.doCall(request: Request): Response {
-		return newCall(request).await().ensureSuccess()
-	}
-
-	private fun logDebug(e: Throwable, url: Any) {
-		if (BuildConfig.DEBUG) {
-			Log.w("ImageProxy", "${e.message}: $url", e)
-		}
-	}
-
-	private fun Throwable.isBlockedByServer(): Boolean {
-		return this is CloudFlareBlockedException
-			|| (this is HttpException && response.code == HttpURLConnection.HTTP_FORBIDDEN)
-			|| (this is HttpStatusException && statusCode == HttpURLConnection.HTTP_FORBIDDEN)
-	}
-}

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

@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.network.imageproxy
-
-import coil.intercept.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-
-interface ImageProxyInterceptor : Interceptor {
-
-	suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response
-}

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

@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.core.network.imageproxy
-
-import coil.intercept.Interceptor
-import coil.request.ImageResult
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.plus
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.parsers.util.await
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RealImageProxyInterceptor @Inject constructor(
-	private val settings: AppSettings,
-) : ImageProxyInterceptor {
-
-	private val delegate = settings.observeAsStateFlow(
-		scope = processLifecycleScope + Dispatchers.Default,
-		key = AppSettings.KEY_IMAGES_PROXY,
-		valueProducer = { createDelegate() },
-	)
-
-	override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-		return delegate.value?.intercept(chain) ?: chain.proceed(chain.request)
-	}
-
-	override suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
-		return delegate.value?.interceptPageRequest(request, okHttp) ?: okHttp.newCall(request).await()
-	}
-
-	private fun createDelegate(): ImageProxyInterceptor? = when (val proxy = settings.imagesProxy) {
-		-1 -> null
-		0 -> WsrvNlProxyInterceptor()
-		1 -> ZeroMsProxyInterceptor()
-		else -> error("Unsupported images proxy $proxy")
-	}
-}

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

@@ -1,40 +0,0 @@
-package org.koitharu.kotatsu.core.network.imageproxy
-
-import coil.request.ImageRequest
-import coil.size.Dimension
-import coil.size.isOriginal
-import okhttp3.HttpUrl
-import okhttp3.Request
-
-class WsrvNlProxyInterceptor : BaseImageProxyInterceptor() {
-
-	override suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest {
-		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()) }
-		}
-
-		return request.newBuilder()
-			.data(newUrl.build())
-			.build()
-	}
-
-	override suspend fun onInterceptPageRequest(request: Request): Request {
-		val sourceUrl = request.url
-		val targetUrl = HttpUrl.Builder()
-			.scheme("https")
-			.host("wsrv.nl")
-			.addQueryParameter("url", sourceUrl.toString())
-			.addQueryParameter("we", null)
-		return request.newBuilder()
-			.url(targetUrl.build())
-			.build()
-	}
-}

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

@@ -1,26 +0,0 @@
-package org.koitharu.kotatsu.core.network.imageproxy
-
-import coil.request.ImageRequest
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Request
-
-class ZeroMsProxyInterceptor : BaseImageProxyInterceptor() {
-
-	override suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest {
-		if (url.host == "x.0ms.dev" || url.host == "0ms.dev") {
-			return request
-		}
-		val newUrl = ("https://x.0ms.dev/q70/$url").toHttpUrl()
-		return request.newBuilder()
-			.data(newUrl)
-			.build()
-	}
-
-	override suspend fun onInterceptPageRequest(request: Request): Request {
-		val newUrl = ("https://x.0ms.dev/q70/${request.url}").toHttpUrl()
-		return request.newBuilder()
-			.url(newUrl)
-			.build()
-	}
-}

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

@@ -21,7 +21,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
-import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -174,13 +173,12 @@ class AppShortcutManager @Inject constructor(
 			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
 			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
 		)
-		val title = source.getTitle(context)
 		ShortcutInfoCompat.Builder(context, source.name)
-			.setShortLabel(title)
-			.setLongLabel(title)
+			.setShortLabel(source.title)
+			.setLongLabel(source.title)
 			.setIcon(icon)
 			.setLongLived(true)
-			.setIntent(MangaListActivity.newIntent(context, source, null))
+			.setIntent(MangaListActivity.newIntent(context, source))
 			.build()
 	}
 }

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

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

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

@@ -1,47 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.graphics.Canvas
-import org.koitharu.kotatsu.parsers.bitmap.Bitmap
-import org.koitharu.kotatsu.parsers.bitmap.Rect
-import java.io.OutputStream
-import android.graphics.Bitmap as AndroidBitmap
-import android.graphics.Rect as AndroidRect
-
-class BitmapWrapper private constructor(
-	private val androidBitmap: AndroidBitmap,
-) : Bitmap, AutoCloseable {
-
-	private val canvas by lazy { Canvas(androidBitmap) } // is not always used, so initialized lazily
-
-	override val height: Int
-		get() = androidBitmap.height
-
-	override val width: Int
-		get() = androidBitmap.width
-
-	override fun drawBitmap(sourceBitmap: Bitmap, src: Rect, dst: Rect) {
-		val androidSourceBitmap = (sourceBitmap as BitmapWrapper).androidBitmap
-		canvas.drawBitmap(androidSourceBitmap, src.toAndroidRect(), dst.toAndroidRect(), null)
-	}
-
-	override fun close() {
-		androidBitmap.recycle()
-	}
-
-	fun compressTo(output: OutputStream) {
-		androidBitmap.compress(AndroidBitmap.CompressFormat.PNG, 100, output)
-	}
-
-	companion object {
-
-		fun create(width: Int, height: Int) = BitmapWrapper(
-			AndroidBitmap.createBitmap(width, height, AndroidBitmap.Config.ARGB_8888),
-		)
-
-		fun create(bitmap: AndroidBitmap) = BitmapWrapper(
-			if (bitmap.isMutable) bitmap else bitmap.copy(AndroidBitmap.Config.ARGB_8888, true),
-		)
-
-		private fun Rect.toAndroidRect() = AndroidRect(left, top, right, bottom)
-	}
-}

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

@@ -1,104 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.util.Log
-import androidx.collection.MutableLongSet
-import coil.request.CachePolicy
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainCoroutineDispatcher
-import kotlinx.coroutines.async
-import kotlinx.coroutines.currentCoroutineContext
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.cache.SafeDeferred
-import org.koitharu.kotatsu.core.util.MultiMutex
-import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-
-abstract class CachingMangaRepository(
-	private val cache: MemoryContentCache,
-) : MangaRepository {
-
-	private val detailsMutex = MultiMutex<Long>()
-	private val relatedMangaMutex = MultiMutex<Long>()
-	private val pagesMutex = MultiMutex<Long>()
-
-	final override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, CachePolicy.ENABLED)
-
-	final override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = pagesMutex.withLock(chapter.id) {
-		cache.getPages(source, chapter.url)?.let { return it }
-		val pages = asyncSafe {
-			getPagesImpl(chapter).distinctById()
-		}
-		cache.putPages(source, chapter.url, pages)
-		pages
-	}.await()
-
-	final override suspend fun getRelated(seed: Manga): List<Manga> = relatedMangaMutex.withLock(seed.id) {
-		cache.getRelatedManga(source, seed.url)?.let { return it }
-		val related = asyncSafe {
-			getRelatedMangaImpl(seed).filterNot { it.id == seed.id }
-		}
-		cache.putRelatedManga(source, seed.url, related)
-		related
-	}.await()
-
-	suspend fun getDetails(manga: Manga, cachePolicy: CachePolicy): Manga = detailsMutex.withLock(manga.id) {
-		if (cachePolicy.readEnabled) {
-			cache.getDetails(source, manga.url)?.let { return it }
-		}
-		val details = asyncSafe {
-			getDetailsImpl(manga)
-		}
-		if (cachePolicy.writeEnabled) {
-			cache.putDetails(source, manga.url, details)
-		}
-		details
-	}.await()
-
-	suspend fun peekDetails(manga: Manga): Manga? {
-		return cache.getDetails(source, manga.url)
-	}
-
-	fun invalidateCache() {
-		cache.clear(source)
-	}
-
-	protected abstract suspend fun getDetailsImpl(manga: Manga): Manga
-
-	protected abstract suspend fun getRelatedMangaImpl(seed: Manga): List<Manga>
-
-	protected abstract suspend fun getPagesImpl(chapter: MangaChapter): List<MangaPage>
-
-	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
-		var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]
-		if (dispatcher == null || dispatcher is MainCoroutineDispatcher) {
-			dispatcher = Dispatchers.Default
-		}
-		return SafeDeferred(
-			processLifecycleScope.async(dispatcher) {
-				runCatchingCancellable { block() }
-			},
-		)
-	}
-
-	private fun List<MangaPage>.distinctById(): List<MangaPage> {
-		if (isEmpty()) {
-			return emptyList()
-		}
-		val result = ArrayList<MangaPage>(size)
-		val set = MutableLongSet(size)
-		for (page in this) {
-			if (set.add(page.id)) {
-				result.add(page)
-			} else if (BuildConfig.DEBUG) {
-				Log.w(null, "Duplicate page: $page")
-			}
-		}
-		return result
-	}
-}

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

@@ -7,17 +7,16 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.util.EnumSet
 
 /**
  * This parser is just for parser development, it should not be used in releases
  */
-class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParserSource.DUMMY) {
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("localhost")
@@ -25,17 +24,14 @@ class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParse
 	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)
 
-	override val filterCapabilities: MangaListFilterCapabilities
-		get() = MangaListFilterCapabilities()
-
-	override suspend fun getFilterOptions(): MangaListFilterOptions = stub(null)
-
 	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
 
-	override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List<Manga> = stub(null)
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
 
+	override suspend fun getAvailableTags(): Set<MangaTag> = stub(null)
+
 	private fun stub(manga: Manga?): Nothing {
 		throw UnsupportedSourceException("Usage of Dummy parser", manga)
 	}

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

@@ -1,41 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.EnumSet
-
-class EmptyMangaRepository(override val source: MangaSource) : MangaRepository {
-
-	override val sortOrders: Set<SortOrder>
-		get() = EnumSet.allOf(SortOrder::class.java)
-
-	override var defaultSortOrder: SortOrder
-		get() = SortOrder.NEWEST
-		set(value) = Unit
-
-	override val filterCapabilities: MangaListFilterCapabilities
-		get() = MangaListFilterCapabilities()
-
-	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> = stub(null)
-
-	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
-
-	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
-
-	override suspend fun getPageUrl(page: MangaPage): String = stub(null)
-
-	override suspend fun getFilterOptions(): MangaListFilterOptions = stub(null)
-
-	override suspend fun getRelated(seed: Manga): List<Manga> = stub(seed)
-
-	private fun stub(manga: Manga?): Nothing {
-		throw UnsupportedSourceException("This manga source is not supported", manga)
-	}
-}

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

@@ -12,7 +12,6 @@ import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
-import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
@@ -46,16 +45,11 @@ class MangaDataRepository @Inject constructor(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
 					cfInvert = colorFilter?.isInverted ?: false,
-					cfGrayscale = colorFilter?.isGrayscale ?: false,
 				),
 			)
 		}
 	}
 
-	suspend fun resetColorFilters() {
-		db.getPreferencesDao().resetColorFilters()
-	}
-
 	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
 		return db.getPreferencesDao().find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}
@@ -107,7 +101,7 @@ class MangaDataRepository @Inject constructor(
 
 	suspend fun cleanupLocalManga() {
 		val dao = db.getMangaDao()
-		val broken = dao.findAllBySource(LocalMangaSource.name)
+		val broken = dao.findAllBySource(MangaSource.LOCAL.name)
 			.filter { x -> x.manga.url.toUri().toFileOrNull()?.exists() == false }
 		if (broken.isNotEmpty()) {
 			dao.delete(broken.map { it.manga })

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

@@ -4,11 +4,10 @@ import android.net.Uri
 import coil.request.CachePolicy
 import dagger.Reusable
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.model.UnknownMangaSource
-import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
+import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -37,7 +36,7 @@ class MangaLinkResolver @Inject constructor(
 		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
 		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
 		val source = MangaSource(sourceName)
-		require(source != UnknownMangaSource) { "Manga source $sourceName is not supported" }
+		require(source != MangaSource.DUMMY) { "Manga source $sourceName is not supported" }
 		val repo = repositoryFactory.create(source)
 		return repo.findExact(
 			url = uri.getQueryParameter("url"),
@@ -52,7 +51,7 @@ class MangaLinkResolver @Inject constructor(
 		val host = uri.host ?: return null
 		val repo = sourcesRepository.allMangaSources.asSequence()
 			.map { source ->
-				repositoryFactory.create(source) as ParserMangaRepository
+				repositoryFactory.create(source) as RemoteMangaRepository
 			}.find { repo ->
 				host in repo.domains
 			} ?: return null
@@ -61,7 +60,7 @@ class MangaLinkResolver @Inject constructor(
 
 	private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
 		if (!title.isNullOrEmpty()) {
-			val list = getList(0, null, MangaListFilter(query = title))
+			val list = getList(0, MangaListFilter.Search(title))
 			if (url != null) {
 				list.find { it.url == url }?.let {
 					return it
@@ -80,13 +79,13 @@ class MangaLinkResolver @Inject constructor(
 			}.ifNullOrEmpty {
 				seed.author
 			} ?: return@runCatchingCancellable null
-			val seedList = getList(0, null, MangaListFilter(query = seedTitle))
+			val seedList = getList(0, MangaListFilter.Search(seedTitle))
 			seedList.first { x -> x.url == url }
 		}.getOrThrow()
 	}
 
 	private suspend fun MangaRepository.getDetailsNoCache(manga: Manga): Manga {
-		return if (this is ParserMangaRepository) {
+		return if (this is RemoteMangaRepository) {
 			getDetails(manga, CachePolicy.READ_ONLY)
 		} else {
 			getDetails(manga)
@@ -109,7 +108,7 @@ class MangaLinkResolver @Inject constructor(
 		url = url,
 		publicUrl = "",
 		rating = 0.0f,
-		isNsfw = source.isNsfw(),
+		isNsfw = source.contentType == ContentType.HENTAI,
 		coverUrl = "",
 		tags = emptySet(),
 		state = null,

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

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.parser
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.util.Base64
 import android.webkit.WebView
 import androidx.annotation.MainThread
@@ -11,11 +10,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
-import okhttp3.Response
-import okhttp3.ResponseBody.Companion.asResponseBody
-import okio.Buffer
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.prefs.SourceSettings
@@ -23,13 +18,10 @@ import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
-import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.parsers.bitmap.Bitmap
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.parsers.util.map
 import java.lang.ref.WeakReference
 import java.util.Locale
 import javax.inject.Inject
@@ -76,26 +68,12 @@ class MangaLoaderContextImpl @Inject constructor(
 		return LocaleListCompat.getAdjustedDefault().toList()
 	}
 
-	override fun redrawImageResponse(response: Response, redraw: (image: Bitmap) -> Bitmap): Response {
-		return response.map { body ->
-			val opts = BitmapFactory.Options()
-			opts.inMutable = true
-			BitmapFactory.decodeStream(body.byteStream(), null, opts)?.use { bitmap ->
-				(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
-					Buffer().also {
-						result.compressTo(it.outputStream())
-					}.asResponseBody("image/jpeg".toMediaType())
-				}
-			} ?: error("Cannot decode bitmap")
-		}
-	}
-
-	override fun createBitmap(width: Int, height: Int): Bitmap = BitmapWrapper.create(width, height)
-
 	@MainThread
-	private fun obtainWebView(): WebView = webViewCached?.get() ?: WebView(androidContext).also {
-		it.configureForParser(null)
-		webViewCached = WeakReference(it)
+	private fun obtainWebView(): WebView {
+		return webViewCached?.get() ?: WebView(androidContext).also {
+			it.configureForParser(null)
+			webViewCached = WeakReference(it)
+		}
 	}
 
 	private fun obtainWebViewUserAgent(): String {

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

@@ -2,11 +2,12 @@ package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
-fun MangaParser(source: MangaParserSource, loaderContext: MangaLoaderContext): MangaParser {
-	return when (source) {
-		MangaParserSource.DUMMY -> DummyParser(loaderContext)
-		else -> loaderContext.newParserInstance(source)
+fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
+	return if (source == MangaSource.DUMMY) {
+		DummyParser(loaderContext)
+	} else {
+		loaderContext.newParserInstance(source)
 	}
 }

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

@@ -1,28 +1,22 @@
 package org.koitharu.kotatsu.core.parser
 
-import android.content.Context
 import androidx.annotation.AnyThread
-import androidx.collection.ArrayMap
-import dagger.hilt.android.qualifiers.ApplicationContext
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.model.LocalMangaSource
-import org.koitharu.kotatsu.core.model.MangaSourceInfo
-import org.koitharu.kotatsu.core.model.UnknownMangaSource
 import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
-import org.koitharu.kotatsu.core.parser.external.ExternalMangaRepository
-import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import java.lang.ref.WeakReference
+import java.util.EnumMap
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.set
@@ -33,11 +27,19 @@ interface MangaRepository {
 
 	val sortOrders: Set<SortOrder>
 
+	val states: Set<MangaState>
+
+	val contentRatings: Set<ContentRating>
+
 	var defaultSortOrder: SortOrder
 
-	val filterCapabilities: MangaListFilterCapabilities
+	val isMultipleTagsSupported: Boolean
 
-	suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga>
+	val isTagsExclusionSupported: Boolean
+
+	val isSearchSupported: Boolean
+
+	suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga>
 
 	suspend fun getDetails(manga: Manga): Manga
 
@@ -45,64 +47,38 @@ interface MangaRepository {
 
 	suspend fun getPageUrl(page: MangaPage): String
 
-	suspend fun getFilterOptions(): MangaListFilterOptions
+	suspend fun getTags(): Set<MangaTag>
+
+	suspend fun getLocales(): Set<Locale>
 
 	suspend fun getRelated(seed: Manga): List<Manga>
 
-	suspend fun find(manga: Manga): Manga? {
-		val list = getList(0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
-		return list.find { x -> x.id == manga.id }
-	}
-
 	@Singleton
 	class Factory @Inject constructor(
-		@ApplicationContext private val context: Context,
 		private val localMangaRepository: LocalMangaRepository,
 		private val loaderContext: MangaLoaderContext,
 		private val contentCache: MemoryContentCache,
 		private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
 	) {
 
-		private val cache = ArrayMap<MangaSource, WeakReference<MangaRepository>>()
+		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
 
 		@AnyThread
 		fun create(source: MangaSource): MangaRepository {
-			when (source) {
-				is MangaSourceInfo -> return create(source.mangaSource)
-				LocalMangaSource -> return localMangaRepository
-				UnknownMangaSource -> return EmptyMangaRepository(source)
+			if (source == MangaSource.LOCAL) {
+				return localMangaRepository
 			}
 			cache[source]?.get()?.let { return it }
 			return synchronized(cache) {
 				cache[source]?.get()?.let { return it }
-				val repository = createRepository(source)
-				if (repository != null) {
-					cache[source] = WeakReference(repository)
-					repository
-				} else {
-					EmptyMangaRepository(source)
-				}
-			}
-		}
-
-		private fun createRepository(source: MangaSource): MangaRepository? = when (source) {
-			is MangaParserSource -> ParserMangaRepository(
-				parser = MangaParser(source, loaderContext),
-				cache = contentCache,
-				mirrorSwitchInterceptor = mirrorSwitchInterceptor,
-			)
-
-			is ExternalMangaSource -> if (source.isAvailable(context)) {
-				ExternalMangaRepository(
-					contentResolver = context.contentResolver,
-					source = source,
+				val repository = RemoteMangaRepository(
+					parser = MangaParser(source, loaderContext),
 					cache = contentCache,
+					mirrorSwitchInterceptor = mirrorSwitchInterceptor,
 				)
-			} else {
-				EmptyMangaRepository(source)
+				cache[source] = WeakReference(repository)
+				repository
 			}
-
-			else -> null
 		}
 	}
 }

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

@@ -1,145 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import okhttp3.Interceptor
-import okhttp3.Response
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
-import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.parsers.MangaParser
-import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
-import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.model.ContentRating
-import org.koitharu.kotatsu.parsers.model.Favicons
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaParserSource
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
-import org.koitharu.kotatsu.parsers.util.domain
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.util.Locale
-
-class ParserMangaRepository(
-	private val parser: MangaParser,
-	private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
-	cache: MemoryContentCache,
-) : CachingMangaRepository(cache), Interceptor {
-
-	private val filterOptionsLazy = SuspendLazy {
-		mirrorSwitchInterceptor.withMirrorSwitching {
-			parser.getFilterOptions()
-		}
-	}
-
-	override val source: MangaParserSource
-		get() = parser.source
-
-	override val sortOrders: Set<SortOrder>
-		get() = parser.availableSortOrders
-
-	override val filterCapabilities: MangaListFilterCapabilities
-		get() = parser.filterCapabilities
-
-	override var defaultSortOrder: SortOrder
-		get() = getConfig().defaultSortOrder ?: sortOrders.first()
-		set(value) {
-			getConfig().defaultSortOrder = value
-		}
-
-	var domain: String
-		get() = parser.domain
-		set(value) {
-			getConfig()[parser.configKeyDomain] = value
-		}
-
-	val domains: Array<out String>
-		get() = parser.configKeyDomain.presetValues
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		return if (parser is Interceptor) {
-			parser.intercept(chain)
-		} else {
-			chain.proceed(chain.request())
-		}
-	}
-
-	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> {
-		return mirrorSwitchInterceptor.withMirrorSwitching {
-			parser.getList(offset, order ?: defaultSortOrder, filter ?: MangaListFilter.EMPTY)
-		}
-	}
-
-	override suspend fun getPagesImpl(
-		chapter: MangaChapter
-	): List<MangaPage> = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getPages(chapter)
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getPageUrl(page)
-	}
-
-	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptionsLazy.get()
-
-	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getFavicons()
-	}
-
-	override suspend fun getRelatedMangaImpl(seed: Manga): List<Manga> = parser.getRelatedManga(seed)
-
-	override suspend fun getDetailsImpl(manga: Manga): Manga = mirrorSwitchInterceptor.withMirrorSwitching {
-		parser.getDetails(manga)
-	}
-
-	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
-
-	fun getRequestHeaders() = parser.getRequestHeaders()
-
-	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {
-		parser.onCreateConfig(it)
-	}
-
-	fun getAvailableMirrors(): List<String> {
-		return parser.configKeyDomain.presetValues.toList()
-	}
-
-	fun isSlowdownEnabled(): Boolean {
-		return getConfig().isSlowdownEnabled
-	}
-
-	fun getConfig() = parser.config as SourceSettings
-
-	private suspend fun <R> MirrorSwitchInterceptor.withMirrorSwitching(block: suspend () -> R): R {
-		if (!isEnabled) {
-			return block()
-		}
-		val initialMirror = domain
-		val result = runCatchingCancellable {
-			block()
-		}
-		if (result.isValidResult()) {
-			return result.getOrThrow()
-		}
-		return if (trySwitchMirror(this@ParserMangaRepository)) {
-			val newResult = runCatchingCancellable {
-				block()
-			}
-			if (newResult.isValidResult()) {
-				return newResult.getOrThrow()
-			} else {
-				rollback(this@ParserMangaRepository, initialMirror)
-				return result.getOrThrow()
-			}
-		} else {
-			result.getOrThrow()
-		}
-	}
-
-	private fun Result<*>.isValidResult() = isSuccess && (getOrNull() as? Collection<*>)?.isEmpty() != true
-}

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

@@ -0,0 +1,239 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.util.Log
+import androidx.collection.MutableLongSet
+import coil.request.CachePolicy
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainCoroutineDispatcher
+import kotlinx.coroutines.async
+import kotlinx.coroutines.currentCoroutineContext
+import okhttp3.Headers
+import okhttp3.Interceptor
+import okhttp3.Response
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.cache.MemoryContentCache
+import org.koitharu.kotatsu.core.cache.SafeDeferred
+import org.koitharu.kotatsu.core.network.MirrorSwitchInterceptor
+import org.koitharu.kotatsu.core.prefs.SourceSettings
+import org.koitharu.kotatsu.core.util.MultiMutex
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.ContentRating
+import org.koitharu.kotatsu.parsers.model.Favicons
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaState
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.domain
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.util.Locale
+
+class RemoteMangaRepository(
+	private val parser: MangaParser,
+	private val cache: MemoryContentCache,
+	private val mirrorSwitchInterceptor: MirrorSwitchInterceptor,
+) : MangaRepository, Interceptor {
+
+	private val detailsMutex = MultiMutex<Long>()
+	private val relatedMangaMutex = MultiMutex<Long>()
+	private val pagesMutex = MultiMutex<Long>()
+
+	override val source: MangaSource
+		get() = parser.source
+
+	override val sortOrders: Set<SortOrder>
+		get() = parser.availableSortOrders
+
+	override val states: Set<MangaState>
+		get() = parser.availableStates
+
+	override val contentRatings: Set<ContentRating>
+		get() = parser.availableContentRating
+
+	override var defaultSortOrder: SortOrder
+		get() = getConfig().defaultSortOrder ?: sortOrders.first()
+		set(value) {
+			getConfig().defaultSortOrder = value
+		}
+
+	override val isMultipleTagsSupported: Boolean
+		get() = parser.isMultipleTagsSupported
+
+	override val isSearchSupported: Boolean
+		get() = parser.isSearchSupported
+
+	override val isTagsExclusionSupported: Boolean
+		get() = parser.isTagsExclusionSupported
+
+	var domain: String
+		get() = parser.domain
+		set(value) {
+			getConfig()[parser.configKeyDomain] = value
+		}
+
+	val domains: Array<out String>
+		get() = parser.configKeyDomain.presetValues
+
+	val headers: Headers
+		get() = parser.headers
+
+	override fun intercept(chain: Interceptor.Chain): Response {
+		return if (parser is Interceptor) {
+			parser.intercept(chain)
+		} else {
+			chain.proceed(chain.request())
+		}
+	}
+
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> {
+		return mirrorSwitchInterceptor.withMirrorSwitching {
+			parser.getList(offset, filter)
+		}
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, CachePolicy.ENABLED)
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = pagesMutex.withLock(chapter.id) {
+		cache.getPages(source, chapter.url)?.let { return it }
+		val pages = asyncSafe {
+			mirrorSwitchInterceptor.withMirrorSwitching {
+				parser.getPages(chapter).distinctById()
+			}
+		}
+		cache.putPages(source, chapter.url, pages)
+		pages
+	}.await()
+
+	override suspend fun getPageUrl(page: MangaPage): String = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getPageUrl(page)
+	}
+
+	override suspend fun getTags(): Set<MangaTag> = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getAvailableTags()
+	}
+
+	override suspend fun getLocales(): Set<Locale> {
+		return parser.getAvailableLocales()
+	}
+
+	suspend fun getFavicons(): Favicons = mirrorSwitchInterceptor.withMirrorSwitching {
+		parser.getFavicons()
+	}
+
+	override suspend fun getRelated(seed: Manga): List<Manga> = relatedMangaMutex.withLock(seed.id) {
+		cache.getRelatedManga(source, seed.url)?.let { return it }
+		val related = asyncSafe {
+			parser.getRelatedManga(seed).filterNot { it.id == seed.id }
+		}
+		cache.putRelatedManga(source, seed.url, related)
+		related
+	}.await()
+
+	suspend fun getDetails(manga: Manga, cachePolicy: CachePolicy): Manga = detailsMutex.withLock(manga.id) {
+		if (cachePolicy.readEnabled) {
+			cache.getDetails(source, manga.url)?.let { return it }
+		}
+		val details = asyncSafe {
+			mirrorSwitchInterceptor.withMirrorSwitching {
+				parser.getDetails(manga)
+			}
+		}
+		if (cachePolicy.writeEnabled) {
+			cache.putDetails(source, manga.url, details)
+		}
+		details
+	}.await()
+
+	suspend fun peekDetails(manga: Manga): Manga? {
+		return cache.getDetails(source, manga.url)
+	}
+
+	suspend fun find(manga: Manga): Manga? {
+		val list = getList(0, MangaListFilter.Search(manga.title))
+		return list.find { x -> x.id == manga.id }
+	}
+
+	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
+
+	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {
+		parser.onCreateConfig(it)
+	}
+
+	fun getAvailableMirrors(): List<String> {
+		return parser.configKeyDomain.presetValues.toList()
+	}
+
+	fun isSlowdownEnabled(): Boolean {
+		return getConfig().isSlowdownEnabled
+	}
+
+	fun invalidateCache() {
+		cache.clear(source)
+	}
+
+	fun getConfig() = parser.config as SourceSettings
+
+	private suspend fun <T> asyncSafe(block: suspend CoroutineScope.() -> T): SafeDeferred<T> {
+		var dispatcher = currentCoroutineContext()[CoroutineDispatcher.Key]
+		if (dispatcher == null || dispatcher is MainCoroutineDispatcher) {
+			dispatcher = Dispatchers.Default
+		}
+		return SafeDeferred(
+			processLifecycleScope.async(dispatcher) {
+				runCatchingCancellable { block() }
+			},
+		)
+	}
+
+	private fun List<MangaPage>.distinctById(): List<MangaPage> {
+		if (isEmpty()) {
+			return emptyList()
+		}
+		val result = ArrayList<MangaPage>(size)
+		val set = MutableLongSet(size)
+		for (page in this) {
+			if (set.add(page.id)) {
+				result.add(page)
+			} else if (BuildConfig.DEBUG) {
+				Log.w(null, "Duplicate page: $page")
+			}
+		}
+		return result
+	}
+
+	private suspend fun <R> MirrorSwitchInterceptor.withMirrorSwitching(block: suspend () -> R): R {
+		if (!isEnabled) {
+			return block()
+		}
+		val initialMirror = domain
+		val result = runCatchingCancellable {
+			block()
+		}
+		if (result.isValidResult()) {
+			return result.getOrThrow()
+		}
+		return if (trySwitchMirror(this@RemoteMangaRepository)) {
+			val newResult = runCatchingCancellable {
+				block()
+			}
+			if (newResult.isValidResult()) {
+				return newResult.getOrThrow()
+			} else {
+				rollback(this@RemoteMangaRepository, initialMirror)
+				return result.getOrThrow()
+			}
+		} else {
+			result.getOrThrow()
+		}
+	}
+
+	private fun Result<*>.isValidResult() = isSuccess && (getOrNull() as? Collection<*>)?.isEmpty() != true
+}

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

@@ -1,67 +0,0 @@
-package org.koitharu.kotatsu.core.parser.external
-
-import android.content.ContentResolver
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.parser.CachingMangaRepository
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.SuspendLazy
-import java.util.EnumSet
-
-class ExternalMangaRepository(
-	private val contentResolver: ContentResolver,
-	override val source: ExternalMangaSource,
-	cache: MemoryContentCache,
-) : CachingMangaRepository(cache) {
-
-	private val contentSource = ExternalPluginContentSource(contentResolver, source)
-
-	private val capabilities by lazy {
-		runCatching {
-			contentSource.getCapabilities()
-		}.onFailure {
-			it.printStackTraceDebug()
-		}.getOrNull()
-	}
-
-	private val filterOptions = SuspendLazy(contentSource::getListFilterOptions)
-
-	override val sortOrders: Set<SortOrder>
-		get() = capabilities?.availableSortOrders ?: EnumSet.of(SortOrder.POPULARITY)
-
-	override val filterCapabilities: MangaListFilterCapabilities
-		get() = capabilities?.listFilterCapabilities ?: MangaListFilterCapabilities()
-
-	override var defaultSortOrder: SortOrder
-		get() = capabilities?.availableSortOrders?.firstOrNull() ?: SortOrder.ALPHABETICAL
-		set(value) = Unit
-
-	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptions.get()
-
-	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> =
-		runInterruptible(Dispatchers.IO) {
-			contentSource.getList(offset, order ?: defaultSortOrder, filter ?: MangaListFilter.EMPTY)
-		}
-
-	override suspend fun getDetailsImpl(manga: Manga): Manga = runInterruptible(Dispatchers.IO) {
-		contentSource.getDetails(manga)
-	}
-
-	override suspend fun getPagesImpl(chapter: MangaChapter): List<MangaPage> = runInterruptible(Dispatchers.IO) {
-		contentSource.getPages(chapter)
-	}
-
-	override suspend fun getPageUrl(page: MangaPage): String = runInterruptible(Dispatchers.IO) {
-		contentSource.getPageUrl(page.url)
-	}
-
-	override suspend fun getRelatedMangaImpl(seed: Manga): List<Manga> = emptyList() // TODO
-}

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

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.core.parser.external
-
-import android.content.Context
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-data class ExternalMangaSource(
-	val packageName: String,
-	val authority: String,
-) : MangaSource {
-
-	override val name: String
-		get() = "content:$packageName/$authority"
-
-	private var cachedName: String? = null
-
-	fun isAvailable(context: Context): Boolean {
-		return context.packageManager.resolveContentProvider(authority, 0)?.isEnabled == true
-	}
-
-	fun resolveName(context: Context): String {
-		cachedName?.let {
-			return it
-		}
-		val pm = context.packageManager
-		val info = pm.resolveContentProvider(authority, 0)
-		return info?.loadLabel(pm)?.toString()?.also {
-			cachedName = it
-		} ?: authority
-	}
-}

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

@@ -1,331 +0,0 @@
-package org.koitharu.kotatsu.core.parser.external
-
-import android.content.ContentResolver
-import android.database.Cursor
-import androidx.annotation.WorkerThread
-import androidx.collection.ArraySet
-import androidx.core.net.toUri
-import org.jetbrains.annotations.Blocking
-import org.koitharu.kotatsu.core.exceptions.IncompatiblePluginException
-import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
-import org.koitharu.kotatsu.parsers.model.ContentRating
-import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.Demographic
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
-import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaState
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.find
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
-import org.koitharu.kotatsu.parsers.util.splitTwoParts
-import java.util.EnumSet
-import java.util.Locale
-
-class ExternalPluginContentSource(
-	private val contentResolver: ContentResolver,
-	private val source: ExternalMangaSource,
-) {
-
-	@Blocking
-	@WorkerThread
-	fun getListFilterOptions() = MangaListFilterOptions(
-		availableTags = fetchTags(),
-		availableStates = fetchEnumSet(MangaState::class.java, "filter/states"),
-		availableContentRating = fetchEnumSet(ContentRating::class.java, "filter/content_ratings"),
-		availableContentTypes = fetchEnumSet(ContentType::class.java, "filter/content_types"),
-		availableDemographics = fetchEnumSet(Demographic::class.java, "filter/demographics"),
-		availableLocales = fetchLocales(),
-	)
-
-	@Blocking
-	@WorkerThread
-	fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List<Manga> {
-		val uri = "content://${source.authority}/manga".toUri().buildUpon()
-		uri.appendQueryParameter("offset", offset.toString())
-		filter.tags.forEach { uri.appendQueryParameter("tags_include", "${it.key}=${it.title}") }
-		filter.tagsExclude.forEach { uri.appendQueryParameter("tags_exclude", "${it.key}=${it.title}") }
-		filter.states.forEach { uri.appendQueryParameter("state", it.name) }
-		filter.locale?.let { uri.appendQueryParameter("locale", it.language) }
-		filter.contentRating.forEach { uri.appendQueryParameter("content_rating", it.name) }
-		if (!filter.query.isNullOrEmpty()) {
-			uri.appendQueryParameter("query", filter.query)
-		}
-		return contentResolver.query(uri.build(), null, null, null, order.name)
-			.safe()
-			.use { cursor ->
-				val result = ArrayList<Manga>(cursor.count)
-				if (cursor.moveToFirst()) {
-					do {
-						result += cursor.getManga()
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	@Blocking
-	@WorkerThread
-	fun getDetails(manga: Manga): Manga {
-		val chapters = queryChapters(manga.url)
-		val details = queryDetails(manga.url)
-		return Manga(
-			id = manga.id,
-			title = details.title.ifBlank { manga.title },
-			altTitle = details.altTitle.ifNullOrEmpty { manga.altTitle },
-			url = details.url.ifEmpty { manga.url },
-			publicUrl = details.publicUrl.ifEmpty { manga.publicUrl },
-			rating = maxOf(details.rating, manga.rating),
-			isNsfw = details.isNsfw,
-			coverUrl = details.coverUrl.ifEmpty { manga.coverUrl },
-			tags = details.tags + manga.tags,
-			state = details.state ?: manga.state,
-			author = details.author.ifNullOrEmpty { manga.author },
-			largeCoverUrl = details.largeCoverUrl.ifNullOrEmpty { manga.largeCoverUrl },
-			description = details.description.ifNullOrEmpty { manga.description },
-			chapters = chapters,
-			source = source,
-		)
-	}
-
-	@Blocking
-	@WorkerThread
-	fun getPages(chapter: MangaChapter): List<MangaPage> {
-		val uri = "content://${source.authority}/chapters".toUri()
-			.buildUpon()
-			.appendPath(chapter.url)
-			.build()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				val result = ArrayList<MangaPage>(cursor.count)
-				if (cursor.moveToFirst()) {
-					do {
-						result += MangaPage(
-							id = cursor.getLong(COLUMN_ID),
-							url = cursor.getString(COLUMN_URL),
-							preview = cursor.getStringOrNull(COLUMN_PREVIEW),
-							source = source,
-						)
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	@Blocking
-	@WorkerThread
-	private fun fetchTags(): Set<MangaTag> {
-		val uri = "content://${source.authority}/filter/tags".toUri()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				val result = ArraySet<MangaTag>(cursor.count)
-				if (cursor.moveToFirst()) {
-					do {
-						result += MangaTag(
-							key = cursor.getString(COLUMN_KEY),
-							title = cursor.getString(COLUMN_TITLE),
-							source = source,
-						)
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	@Blocking
-	@WorkerThread
-	fun getPageUrl(url: String): String {
-		val uri = "content://${source.authority}/pages/0".toUri().buildUpon()
-			.appendQueryParameter("url", url)
-			.build()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				if (cursor.moveToFirst()) {
-					cursor.getString(COLUMN_VALUE)
-				} else {
-					url
-				}
-			}
-	}
-
-	@Blocking
-	@WorkerThread
-	private fun fetchLocales(): Set<Locale> {
-		val uri = "content://${source.authority}/filter/locales".toUri()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				val result = ArraySet<Locale>(cursor.count)
-				if (cursor.moveToFirst()) {
-					do {
-						result += Locale(cursor.getString(COLUMN_NAME))
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	fun getCapabilities(): MangaSourceCapabilities? {
-		val uri = "content://${source.authority}/capabilities".toUri()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				if (cursor.moveToFirst()) {
-					MangaSourceCapabilities(
-						availableSortOrders = cursor.getStringOrNull(COLUMN_SORT_ORDERS)
-							?.split(',')
-							?.mapNotNullTo(EnumSet.noneOf(SortOrder::class.java)) {
-								SortOrder.entries.find(it)
-							}.orEmpty(),
-						listFilterCapabilities = MangaListFilterCapabilities(
-							isMultipleTagsSupported = cursor.getBooleanOrDefault(COLUMN_MULTIPLE_TAGS, false),
-							isTagsExclusionSupported = cursor.getBooleanOrDefault(COLUMN_TAGS_EXCLUSION, false),
-							isSearchSupported = cursor.getBooleanOrDefault(COLUMN_SEARCH, false),
-							isSearchWithFiltersSupported = cursor.getBooleanOrDefault(
-								COLUMN_SEARCH_WITH_FILTERS,
-								false,
-							),
-							isYearSupported = cursor.getBooleanOrDefault(COLUMN_YEAR, false),
-							isYearRangeSupported = cursor.getBooleanOrDefault(COLUMN_YEAR_RANGE, false),
-							isOriginalLocaleSupported = cursor.getBooleanOrDefault(COLUMN_ORIGINAL_LOCALE, false),
-						),
-					)
-				} else {
-					null
-				}
-			}
-	}
-
-	private fun queryDetails(url: String): Manga {
-		val uri = "content://${source.authority}/manga".toUri()
-			.buildUpon()
-			.appendPath(url)
-			.build()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				cursor.moveToFirst()
-				cursor.getManga()
-			}
-	}
-
-	private fun queryChapters(url: String): List<MangaChapter> {
-		val uri = "content://${source.authority}/manga/chapters".toUri()
-			.buildUpon()
-			.appendPath(url)
-			.build()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				val result = ArrayList<MangaChapter>(cursor.count)
-				if (cursor.moveToFirst()) {
-					do {
-						result += MangaChapter(
-							id = cursor.getLong(COLUMN_ID),
-							name = cursor.getString(COLUMN_NAME),
-							number = cursor.getFloatOrDefault(COLUMN_NUMBER, 0f),
-							volume = cursor.getIntOrDefault(COLUMN_VOLUME, 0),
-							url = cursor.getString(COLUMN_URL),
-							scanlator = cursor.getStringOrNull(COLUMN_SCANLATOR),
-							uploadDate = cursor.getLongOrDefault(COLUMN_UPLOAD_DATE, 0L),
-							branch = cursor.getStringOrNull(COLUMN_BRANCH),
-							source = source,
-						)
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	private fun ExternalPluginCursor.getManga() = Manga(
-		id = getLong(COLUMN_ID),
-		title = getString(COLUMN_TITLE),
-		altTitle = getStringOrNull(COLUMN_ALT_TITLE),
-		url = getString(COLUMN_URL),
-		publicUrl = getString(COLUMN_PUBLIC_URL),
-		rating = getFloat(COLUMN_RATING),
-		isNsfw = getBooleanOrDefault(COLUMN_IS_NSFW, false),
-		coverUrl = getString(COLUMN_COVER_URL),
-		tags = getStringOrNull(COLUMN_TAGS)?.split(':')?.mapNotNullToSet {
-			val parts = it.splitTwoParts('=') ?: return@mapNotNullToSet null
-			MangaTag(key = parts.first, title = parts.second, source = source)
-		}.orEmpty(),
-		state = getStringOrNull(COLUMN_STATE)?.let { MangaState.entries.find(it) },
-		author = getStringOrNull(COLUMN_AUTHOR),
-		largeCoverUrl = getStringOrNull(COLUMN_LARGE_COVER_URL),
-		description = getStringOrNull(COLUMN_DESCRIPTION),
-		chapters = emptyList(),
-		source = source,
-	)
-
-	private fun <E : Enum<E>> fetchEnumSet(cls: Class<E>, path: String): EnumSet<E> {
-		val uri = "content://${source.authority}/$path".toUri()
-		return contentResolver.query(uri, null, null, null, null)
-			.safe()
-			.use { cursor ->
-				val result = EnumSet.noneOf(cls)
-				val enumConstants = cls.enumConstants ?: return@use result
-				if (cursor.moveToFirst()) {
-					do {
-						val name = cursor.getString(COLUMN_NAME)
-						val enumValue = enumConstants.find { it.name == name }
-						if (enumValue != null) {
-							result.add(enumValue)
-						}
-					} while (cursor.moveToNext())
-				}
-				result
-			}
-	}
-
-	private fun Cursor?.safe() = ExternalPluginCursor(
-		source = source,
-		cursor = this ?: throw IncompatiblePluginException(source.name, null),
-	)
-
-	class MangaSourceCapabilities(
-		val availableSortOrders: Set<SortOrder>,
-		val listFilterCapabilities: MangaListFilterCapabilities,
-	)
-
-	private companion object {
-
-		const val COLUMN_SORT_ORDERS = "sort_orders"
-		const val COLUMN_MULTIPLE_TAGS = "multiple_tags"
-		const val COLUMN_TAGS_EXCLUSION = "tags_exclusion"
-		const val COLUMN_SEARCH = "search"
-		const val COLUMN_SEARCH_WITH_FILTERS = "search_with_filters"
-		const val COLUMN_YEAR = "year"
-		const val COLUMN_YEAR_RANGE = "year_range"
-		const val COLUMN_ORIGINAL_LOCALE = "original_locale"
-		const val COLUMN_ID = "id"
-		const val COLUMN_NAME = "name"
-		const val COLUMN_NUMBER = "number"
-		const val COLUMN_VOLUME = "volume"
-		const val COLUMN_URL = "url"
-		const val COLUMN_SCANLATOR = "scanlator"
-		const val COLUMN_UPLOAD_DATE = "upload_date"
-		const val COLUMN_BRANCH = "branch"
-		const val COLUMN_TITLE = "title"
-		const val COLUMN_ALT_TITLE = "alt_title"
-		const val COLUMN_PUBLIC_URL = "public_url"
-		const val COLUMN_RATING = "rating"
-		const val COLUMN_IS_NSFW = "is_nsfw"
-		const val COLUMN_COVER_URL = "cover_url"
-		const val COLUMN_TAGS = "tags"
-		const val COLUMN_STATE = "state"
-		const val COLUMN_AUTHOR = "author"
-		const val COLUMN_LARGE_COVER_URL = "large_cover_url"
-		const val COLUMN_DESCRIPTION = "description"
-		const val COLUMN_PREVIEW = "preview"
-		const val COLUMN_KEY = "key"
-		const val COLUMN_VALUE = "value"
-	}
-}

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

@@ -1,70 +0,0 @@
-package org.koitharu.kotatsu.core.parser.external
-
-import android.database.Cursor
-import android.database.CursorWrapper
-import org.koitharu.kotatsu.core.exceptions.IncompatiblePluginException
-import org.koitharu.kotatsu.core.util.ext.getBoolean
-
-class ExternalPluginCursor(private val source: ExternalMangaSource, cursor: Cursor) : CursorWrapper(cursor) {
-
-	override fun getColumnIndexOrThrow(columnName: String?): Int = try {
-		super.getColumnIndexOrThrow(columnName)
-	} catch (e: Exception) {
-		throw IncompatiblePluginException(source.name, e)
-	}
-
-	fun getString(columnName: String): String = getString(getColumnIndexOrThrow(columnName))
-
-	fun getStringOrNull(columnName: String): String? {
-		val columnIndex = getColumnIndex(columnName)
-		return when {
-			columnIndex < 0 -> null
-			isNull(columnIndex) -> null
-			else -> getString(columnIndex)
-		}
-	}
-
-	fun getBoolean(columnName: String): Boolean = getBoolean(getColumnIndexOrThrow(columnName))
-
-	fun getBooleanOrDefault(columnName: String, defaultValue: Boolean): Boolean {
-		val columnIndex = getColumnIndex(columnName)
-		return when {
-			columnIndex < 0 -> defaultValue
-			isNull(columnIndex) -> defaultValue
-			else -> getBoolean(columnIndex)
-		}
-	}
-
-	fun getInt(columnName: String): Int = getInt(getColumnIndexOrThrow(columnName))
-
-	fun getIntOrDefault(columnName: String, defaultValue: Int): Int {
-		val columnIndex = getColumnIndex(columnName)
-		return when {
-			columnIndex < 0 -> defaultValue
-			isNull(columnIndex) -> defaultValue
-			else -> getInt(columnIndex)
-		}
-	}
-
-	fun getLong(columnName: String): Long = getLong(getColumnIndexOrThrow(columnName))
-
-	fun getLongOrDefault(columnName: String, defaultValue: Long): Long {
-		val columnIndex = getColumnIndex(columnName)
-		return when {
-			columnIndex < 0 -> defaultValue
-			isNull(columnIndex) -> defaultValue
-			else -> getLong(columnIndex)
-		}
-	}
-
-	fun getFloat(columnName: String): Float = getFloat(getColumnIndexOrThrow(columnName))
-
-	fun getFloatOrDefault(columnName: String, defaultValue: Float): Float {
-		val columnIndex = getColumnIndex(columnName)
-		return when {
-			columnIndex < 0 -> defaultValue
-			isNull(columnIndex) -> defaultValue
-			else -> getFloat(columnIndex)
-		}
-	}
-}

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

@@ -1,19 +1,12 @@
 package org.koitharu.kotatsu.core.parser.favicon
 
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.AdaptiveIconDrawable
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
 import android.net.Uri
-import android.os.Build
 import android.webkit.MimeTypeMap
 import coil.ImageLoader
 import coil.decode.DataSource
 import coil.decode.ImageSource
 import coil.disk.DiskCache
-import coil.fetch.DrawableResult
 import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.fetch.SourceResult
@@ -21,9 +14,7 @@ import coil.network.HttpException
 import coil.request.Options
 import coil.size.Size
 import coil.size.pxOrElse
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -33,16 +24,13 @@ import okio.Closeable
 import okio.buffer
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.parser.EmptyMangaRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.ParserMangaRepository
-import org.koitharu.kotatsu.core.parser.external.ExternalMangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.util.ext.writeAllCancellable
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.util.withExtraCloseable
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.requireBody
 import java.net.HttpURLConnection
 import kotlin.coroutines.coroutineContext
 
@@ -57,27 +45,14 @@ class FaviconFetcher(
 ) : Fetcher {
 
 	private val diskCacheKey
-		get() = options.diskCacheKey ?: "${mangaSource.name}x${options.size.toCacheKey()}"
+		get() = options.diskCacheKey ?: "${mangaSource.name}[${mangaSource.ordinal}]x${options.size.toCacheKey()}"
 
 	private val fileSystem
 		get() = checkNotNull(diskCache.value).fileSystem
 
 	override suspend fun fetch(): FetchResult {
 		getCached(options)?.let { return it }
-		return when (val repo = mangaRepositoryFactory.create(mangaSource)) {
-			is ParserMangaRepository -> fetchParserFavicon(repo)
-			is ExternalMangaRepository -> fetchPluginIcon(repo)
-			is EmptyMangaRepository -> DrawableResult(
-				drawable = ColorDrawable(Color.WHITE),
-				isSampled = false,
-				dataSource = DataSource.MEMORY,
-			)
-
-			else -> throw IllegalArgumentException("")
-		}
-	}
-
-	private suspend fun fetchParserFavicon(repo: ParserMangaRepository): FetchResult {
+		val repo = mangaRepositoryFactory.create(mangaSource) as RemoteMangaRepository
 		val sizePx = maxOf(
 			options.size.width.pxOrElse { FALLBACK_SIZE },
 			options.size.height.pxOrElse { FALLBACK_SIZE },
@@ -114,7 +89,6 @@ class FaviconFetcher(
 			.url(url)
 			.get()
 			.tag(MangaSource::class.java, source)
-		request.tag(MangaSource::class.java, source)
 		@Suppress("UNCHECKED_CAST")
 		options.tags.asMap().forEach { request.tag(it.key as Class<Any>, it.value) }
 		val response = okHttpClient.newCall(request.build()).await()
@@ -125,20 +99,6 @@ class FaviconFetcher(
 		return response
 	}
 
-	private suspend fun fetchPluginIcon(repository: ExternalMangaRepository): FetchResult {
-		val source = repository.source
-		val pm = options.context.packageManager
-		val icon = runInterruptible(Dispatchers.IO) {
-			val provider = pm.resolveContentProvider(source.authority, 0)
-			provider?.loadIcon(pm) ?: pm.getApplicationIcon(source.packageName)
-		}
-		return DrawableResult(
-			drawable = icon.nonAdaptive(),
-			isSampled = false,
-			dataSource = DataSource.DISK,
-		)
-	}
-
 	private fun getCached(options: Options): SourceResult? {
 		if (!options.diskCachePolicy.readEnabled) {
 			return null
@@ -190,6 +150,10 @@ class FaviconFetcher(
 		return if (networkResponse != null) DataSource.NETWORK else DataSource.DISK
 	}
 
+	private fun Response.requireBody(): ResponseBody {
+		return checkNotNull(body) { "response body == null" }
+	}
+
 	private fun Size.toCacheKey() = buildString {
 		append(width.toString())
 		append('x')
@@ -204,13 +168,6 @@ class FaviconFetcher(
 		}
 	}
 
-	private fun Drawable.nonAdaptive() =
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && this is AdaptiveIconDrawable) {
-			LayerDrawable(arrayOf(background, foreground))
-		} else {
-			this
-		}
-
 	class Factory(
 		context: Context,
 		okHttpClientLazy: Lazy<OkHttpClient>,