Move Kitsu scrobbler to kotlin dir

# Conflicts:
#	app/src/main/res/values/strings.xml

.editorconfig

@@ -13,7 +13,6 @@ disabled_rules = no-wildcard-imports, no-unused-imports
 
 [{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
 ij_continuation_indent_size = 4
-ij_xml_attribute_wrap = on_every_item
 
 [{*.kt,*.kts}]
 ij_kotlin_allow_trailing_comma_on_call_site = true

.github/ISSUE_TEMPLATE/report_bug.yml

@@ -61,6 +61,4 @@ body:
           label: Acknowledgements
           options:
               - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
-                required: true
-              - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose).
-                required: true
+                required: true

.idea/.gitignore

@@ -1,4 +1,3 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-/migrations.xml

.idea/gradle.xml

@@ -5,6 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -13,7 +14,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.weblate

@@ -1,3 +0,0 @@
-[weblate]
-url = https://hosted.weblate.org/api/
-translation = kotatsu/strings

CONTRIBUTING.md

@@ -1,11 +0,0 @@
-## Kotatsu contribution guidelines
-
-- If you want to fix bug or implement a new feature, that already mention in the [issues](https://github.com/KotatsuApp/Kotatsu/issues), please, assign this issue to you and/or comment about it.
-- Whether you have to implement new feature, please, open an issue or discussion regarding it to ensure it will be accepted.
-- Translations have to be managed using the [Weblate](https://hosted.weblate.org/engage/kotatsu/) platform.
-- In case you want to add a new manga source, refer to the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers).
-
-Refactoring or some dev-faces improvements are also might be accepted, however please stick to the following principles:
-- Performance matters. In the case of choosing between source code beauty and performance, performance should be a priority. 
-- Please, do not modify readme and other information files (except for typos).
-- Avoid adding new dependencies unless required. APK size is important.

README.md

@@ -19,7 +19,7 @@ Kotatsu is a free and open source manga reader for Android.
 * Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 
@@ -39,10 +39,6 @@ Kotatsu is a free and open source manga reader for Android.
 Kotatsu is localized in a number of different languages, if you would like to help improve these or add new languages,
 please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)
 
-### Contributing
-
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for the guidelines.
-
 ### License
 
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)

app/build.gradle

@@ -2,29 +2,28 @@ plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
 	id 'kotlin-kapt'
-	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
 }
 
 android {
-	compileSdk = 34
-	buildToolsVersion = '34.0.0'
+	compileSdk = 33
+	buildToolsVersion = '33.0.2'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
-		minSdk = 21
-		targetSdk = 34
-		versionCode = 576
-		versionName = '6.0.3'
+		minSdkVersion 21
+		targetSdkVersion 33
+		versionCode 547
+		versionName '5.1.3'
 		generatedDensities = []
-		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
-		ksp {
-			arg("room.schemaLocation", "$projectDir/schemas")
-		}
-		androidResources {
-			generateLocaleConfig true
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+		kapt {
+			arguments {
+				arg 'room.schemaLocation', "$projectDir/schemas".toString()
+			}
 		}
 	}
 	buildTypes {
@@ -40,7 +39,6 @@ android {
 	}
 	buildFeatures {
 		viewBinding true
-		buildConfig true
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
@@ -81,80 +79,80 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:2f7e704e21') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:44e28b40d3') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.21'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.10.1'
 	implementation 'androidx.activity:activity-ktx:1.7.2'
-	implementation 'androidx.fragment:fragment-ktx:1.6.1'
+	implementation 'androidx.fragment:fragment-ktx:1.5.7'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
 	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
 	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.1'
+	implementation 'androidx.recyclerview:recyclerview:1.3.0'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
-	implementation 'androidx.preference:preference-ktx:1.2.1'
+	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.9.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
+	//noinspection LifecycleAnnotationProcessorWithJava8
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
 
-	// TODO https://issuetracker.google.com/issues/254846063
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	//noinspection GradleDependency
-	implementation('com.google.guava:guava:32.0.1-android') {
+	implementation('com.google.guava:guava:32.0.0-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
 		exclude group: 'org.checkerframework', module: 'checker-qual'
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
 	}
 
-	implementation 'androidx.room:room-runtime:2.5.2'
-	implementation 'androidx.room:room-ktx:2.5.2'
-	ksp 'androidx.room:room-compiler:2.5.2'
+	implementation 'androidx.room:room-runtime:2.5.1'
+	implementation 'androidx.room:room-ktx:2.5.1'
+	kapt 'androidx.room:room-compiler:2.5.1'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation 'com.squareup.okio:okio:3.5.0'
+	implementation 'com.squareup.okio:okio:3.3.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.47'
-	kapt 'com.google.dagger:hilt-compiler:2.47'
+	implementation 'com.google.dagger:hilt-android:2.46.1'
+	kapt 'com.google.dagger:hilt-compiler:2.46.1'
 	implementation 'androidx.hilt:hilt-work:1.0.0'
 	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
 	implementation 'io.coil-kt:coil-base:2.4.0'
 	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:9b1d20be67'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:1b19231b2f'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.1'
-	implementation 'ch.acra:acra-dialog:5.11.1'
+	implementation 'ch.acra:acra-http:5.9.7'
+	implementation 'ch.acra:acra-dialog:5.9.7'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20230618'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	testImplementation 'org.json:json:20230227'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.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.7.3'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.2'
+	androidTestImplementation 'androidx.room:room-testing:2.5.1'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.47'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.47'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.46.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.46.1'
 }

app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt

@@ -17,7 +17,7 @@ class MangaDatabaseTest {
 		MangaDatabase::class.java,
 	)
 
-	private val migrations = getDatabaseMigrations(InstrumentationRegistry.getInstrumentation().targetContext)
+	private val migrations = databaseMigrations
 
 	@Test
 	fun versions() {

app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt

@@ -23,7 +23,7 @@ import javax.inject.Inject
 
 @HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
-class AppShortcutManagerTest {
+class ShortcutsUpdaterTest {
 
 	@get:Rule
 	var hiltRule = HiltAndroidRule(this)
@@ -32,7 +32,7 @@ class AppShortcutManagerTest {
 	lateinit var historyRepository: HistoryRepository
 
 	@Inject
-	lateinit var appShortcutManager: AppShortcutManager
+	lateinit var shortcutsUpdater: ShortcutsUpdater
 
 	@Inject
 	lateinit var database: MangaDatabase
@@ -48,7 +48,6 @@ class AppShortcutManagerTest {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
 			return@runTest
 		}
-		database.invalidationTracker.addObserver(appShortcutManager)
 		awaitUpdate()
 		assertTrue(getShortcuts().isEmpty())
 		historyRepository.addOrUpdate(
@@ -73,6 +72,6 @@ class AppShortcutManagerTest {
 	private suspend fun awaitUpdate() {
 		val instrumentation = InstrumentationRegistry.getInstrumentation()
 		instrumentation.awaitForIdle()
-		appShortcutManager.await()
+		shortcutsUpdater.await()
 	}
 }

app/src/androidTest/kotlin/org/koitharu/kotatsu/HiltTestRunner.kt

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import dagger.hilt.android.testing.HiltTestApplication
-
-class HiltTestRunner : AndroidJUnitRunner() {
-
-    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
-}

app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -17,7 +17,7 @@ import java.util.EnumSet
 class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("")
+		get() = ConfigKey.Domain()
 
 	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)

app/src/debug/java/org/koitharu/kotatsu/util/LoggingAdapterDataObserver.kt

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.util
+
+import android.util.Log
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+
+class LoggingAdapterDataObserver(
+	private val tag: String,
+) : AdapterDataObserver() {
+
+	override fun onChanged() {
+		Log.d(tag, "onChanged()")
+	}
+
+	override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeChanged(positionStart: Int, itemCount: Int, payload: Any?) {
+		Log.d(tag, "onItemRangeChanged(positionStart=$positionStart, itemCount=$itemCount, payload=$payload)")
+	}
+
+	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeInserted(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeRemoved(positionStart=$positionStart, itemCount=$itemCount)")
+	}
+
+	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+		Log.d(tag, "onItemRangeMoved(fromPosition=$fromPosition, toPosition=$toPosition, itemCount=$itemCount)")
+	}
+
+	override fun onStateRestorationPolicyChanged() {
+		Log.d(tag, "onStateRestorationPolicyChanged()")
+	}
+}

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

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

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

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu
-
-import android.content.Context
-import android.os.StrictMode
-import androidx.fragment.app.strictmode.FragmentStrictMode
-import org.koitharu.kotatsu.core.BaseApp
-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
-
-class KotatsuApp : BaseApp() {
-
-	override fun attachBaseContext(base: Context?) {
-		super.attachBaseContext(base)
-		enableStrictMode()
-	}
-
-	private fun enableStrictMode() {
-		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder()
-				.detectAll()
-				.penaltyLog()
-				.build(),
-		)
-		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder()
-				.detectAll()
-				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				.setClassInstanceLimit(PagesCache::class.java, 1)
-				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				.setClassInstanceLimit(PageLoader::class.java, 1)
-				.penaltyLog()
-				.build(),
-		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			.penaltyDeath()
-			.detectFragmentReuse()
-			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
-			.detectRetainInstanceUsage()
-			.detectSetUserVisibleHint()
-			.detectFragmentTagUsage()
-			.build()
-	}
-}

app/src/main/AndroidManifest.xml

@@ -18,23 +18,6 @@
 	<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
 	<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-	<uses-permission
-		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-		android:maxSdkVersion="29" />
-	<uses-permission
-		android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-		tools:ignore="ScopedStorage" />
-
-	<queries>
-		<intent>
-			<action android:name="android.intent.action.PROCESS_TEXT" />
-			<data android:mimeType="text/plain" />
-		</intent>
-		<intent>
-			<action android:name="android.speech.action.RECOGNIZE_SPEECH" />
-		</intent>
-	</queries>
 
 	<application
 		android:name="org.koitharu.kotatsu.KotatsuApp"
@@ -47,8 +30,8 @@
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:largeHeap="true"
+		android:localeConfig="@xml/locales"
 		android:networkSecurityConfig="@xml/network_security_config"
-		android:requestLegacyExternalStorage="true"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
 		android:theme="@style/Theme.Kotatsu"
@@ -71,17 +54,6 @@
 			<intent-filter>
 				<action android:name="${applicationId}.action.VIEW_MANGA" />
 			</intent-filter>
-			<intent-filter android:autoVerify="true">
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-
-				<data android:scheme="http" />
-				<data android:scheme="https" />
-				<data android:host="kotatsu.app" />
-				<data android:path="/manga" />
-			</intent-filter>
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
@@ -111,9 +83,6 @@
 		<activity
 			android:name="org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity"
 			android:label="@string/suggestions" />
-		<activity
-			android:name="org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity"
-			android:label="@string/related_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
 			android:exported="true"
@@ -129,41 +98,26 @@
 				<data android:host="sync-settings" />
 			</intent-filter>
 		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity"
-			android:label="@string/local_manga_directories" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.BrowserActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
-		<activity
-			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
-			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
-			android:autoRemoveFromRecents="true"
-			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
-			android:label="@string/manage_categories" />
+			android:label="@string/favourites"
+			android:windowSoftInputMode="stateAlwaysHidden" />
 		<activity
-			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetConfigActivity"
+			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
 			android:label="@string/manga_shelf">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
 		</activity>
-		<activity
-			android:name="org.koitharu.kotatsu.widget.recent.RecentWidgetConfigActivity"
-			android:exported="true"
-			android:label="@string/recent_manga">
-			<intent-filter>
-				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-			</intent-filter>
-		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity"
 			android:label="@string/search" />
@@ -186,6 +140,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity"
 			android:label="@string/color_correction" />
+		<activity
+			android:name="org.koitharu.kotatsu.shelf.ui.config.ShelfSettingsActivity"
+			android:label="@string/settings" />
 		<activity
 			android:name="org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity"
 			android:exported="true"
@@ -202,17 +159,23 @@
 				<data android:host="shikimori-auth" />
 				<data android:host="anilist-auth" />
 				<data android:host="mal-auth" />
+				<data android:host="kitsu-auth" />
 			</intent-filter>
 
 		</activity>
+		<activity
+			android:name=".scrobbling.kitsu.ui.KitsuAuthActivity"
+			android:exported="false"
+			android:label="@string/kitsu"
+			tools:ignore="AppLinkUrlError">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:scheme="kotatsu+kitsu" />
+			</intent-filter>
+		</activity>
 
-		<service
-			android:name="androidx.work.impl.foreground.SystemForegroundService"
-			android:foregroundServiceType="dataSync"
-			tools:node="merge" />
-		<service
-			android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService"
-			android:foregroundServiceType="dataSync" />
+		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
@@ -233,7 +196,8 @@
 		<service
 			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncService"
 			android:exported="false"
-			android:label="@string/favourites">
+			android:label="@string/favourites"
+			android:process=":sync">
 			<intent-filter>
 				<action android:name="android.content.SyncAdapter" />
 			</intent-filter>
@@ -244,7 +208,8 @@
 		<service
 			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncService"
 			android:exported="false"
-			android:label="@string/history">
+			android:label="@string/history"
+			android:process=":sync">
 			<intent-filter>
 				<action android:name="android.content.SyncAdapter" />
 			</intent-filter>
@@ -325,660 +290,6 @@
 			android:name="com.samsung.android.icon_container.has_icon_container"
 			android:value="@bool/com_samsung_android_icon_container_has_icon_container" />
 
-		<activity-alias
-			android:name="org.koitharu.kotatsu.details.ui.DetailsBYLinkActivity"
-			android:exported="true"
-			android:targetActivity="org.koitharu.kotatsu.details.ui.DetailsActivity">
-
-			<intent-filter android:autoVerify="false">
-				<action android:name="android.intent.action.VIEW" />
-
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-
-				<data android:scheme="http" />
-				<data android:scheme="https" />
-				<data android:host="1stkissmanga.me" />
-				<data android:host="3asq.org" />
-				<data android:host="18porncomic.com" />
-				<data android:host="212.32.226.234" />
-				<data android:host="247manga.com" />
-				<data android:host="365manga.com" />
-				<data android:host="2023.allhen.online" />
-				<data android:host="adultwebtoon.com" />
-				<data android:host="afroditscans.com" />
-				<data android:host="ainzscans.site" />
-				<data android:host="aiyumanga.com" />
-				<data android:host="alceascan.my.id" />
-				<data android:host="allporncomic.com" />
-				<data android:host="anibel.net" />
-				<data android:host="anigliscans.com" />
-				<data android:host="anikiga.com" />
-				<data android:host="animaregia.net" />
-				<data android:host="anisamanga.com" />
-				<data android:host="anshscans.org" />
-				<data android:host="apenasmaisumyaoi.com" />
-				<data android:host="apollcomics.com" />
-				<data android:host="aquamanga.com" />
-				<data android:host="arabtoons.net" />
-				<data android:host="araznovel.com" />
-				<data android:host="arcanescans.com" />
-				<data android:host="arenascans.net" />
-				<data android:host="arthurscan.xyz" />
-				<data android:host="astral-manga.fr" />
-				<data android:host="astrallibrary.net" />
-				<data android:host="astrumscans.xyz" />
-				<data android:host="asura.nacm.xyz" />
-				<data android:host="asurascanstr.com" />
-				<data android:host="athenafansub.com" />
-				<data android:host="ayatoon.com" />
-				<data android:host="azoranov.com" />
-				<data android:host="azuremanga.com" />
-				<data android:host="babeltoon.com" />
-				<data android:host="bakai.org" />
-				<data android:host="bakaman.net" />
-				<data android:host="bakamh.com" />
-				<data android:host="banana-scan.com" />
-				<data android:host="bato.to" />
-				<data android:host="batocomic.com" />
-				<data android:host="batocomic.net" />
-				<data android:host="batocomic.org" />
-				<data android:host="batotoo.com" />
-				<data android:host="batotwo.com" />
-				<data android:host="battwo.com" />
-				<data android:host="beast-scans.com" />
-				<data android:host="beehentai.com" />
-				<data android:host="bentomanga.com" />
-				<data android:host="bestmanga.club" />
-				<data android:host="bestmanhua.com" />
-				<data android:host="bibimanga.com" />
-				<data android:host="birdmanga.com" />
-				<data android:host="birdtoon.net" />
-				<data android:host="blogmanga.net" />
-				<data android:host="blogtruyenmoi.com" />
-				<data android:host="bokugents.com" />
-				<data android:host="boosei.net" />
-				<data android:host="boyslove.me" />
-				<data android:host="br.atlantisscan.com" />
-				<data android:host="br.ninemanga.com" />
-				<data android:host="cabaredowatame.site" />
-				<data android:host="cafecomyaoi.com.br" />
-				<data android:host="carteldemanhwas.com" />
-				<data android:host="cat300.com" />
-				<data android:host="cerisescans.com" />
-				<data android:host="chap.mangairo.com" />
-				<data android:host="chapmanganato.com" />
-				<data android:host="chapmanganato.com" />
-				<data android:host="cizgiromanarsivi.com" />
-				<data android:host="cmreader.info" />
-				<data android:host="cocorip.net" />
-				<data android:host="coffeemanga.io" />
-				<data android:host="coloredmanga.com" />
-				<data android:host="comick.app" />
-				<data android:host="comiko.net" />
-				<data android:host="comiko.org" />
-				<data android:host="copypastescan.xyz" />
-				<data android:host="cosmicscans.com" />
-				<data android:host="daprob.com" />
-				<data android:host="darkscans.com" />
-				<data android:host="de.ninemanga.com" />
-				<data android:host="desu.me" />
-				<data android:host="diamondfansub.com" />
-				<data android:host="dojing.net" />
-				<data android:host="dokkomanga.com" />
-				<data android:host="dokkomanga.com" />
-				<data android:host="doujin69.com" />
-				<data android:host="doujindesu.rip" />
-				<data android:host="doujinhentai.net" />
-				<data android:host="dragontea.ink" />
-				<data android:host="dragontranslation.net" />
-				<data android:host="drakescans.com" />
-				<data android:host="dto.to" />
-				<data android:host="duckmanga.com" />
-				<data android:host="duniakomik.id" />
-				<data android:host="dynasty-scans.com" />
-				<data android:host="e-hentai.org" />
-				<data android:host="elarcpage.com" />
-				<data android:host="en.leviatanscans.com" />
-				<data android:host="epsilonscan.fr" />
-				<data android:host="es.ninemanga.com" />
-				<data android:host="esomanga.com" />
-				<data android:host="exhentai.org" />
-				<data android:host="falconmanga.com" />
-				<data android:host="fbsquads.com" />
-				<data android:host="finalscans.com" />
-				<data android:host="flamescans.org" />
-				<data android:host="foxwhite.com.br" />
-				<data android:host="fr-scan.cc" />
-				<data android:host="fr.ninemanga.com" />
-				<data android:host="franxxmangas.net" />
-				<data android:host="freakscans.com" />
-				<data android:host="freemanga.me" />
-				<data android:host="freemangatop.com" />
-				<data android:host="freewebtooncoins.com" />
-				<data android:host="frscans.com" />
-				<data android:host="furyosociety.com" />
-				<data android:host="galaxymanga.org" />
-				<data android:host="gatemanga.com" />
-				<data android:host="gdscans.com" />
-				<data android:host="gekkou.com.br" />
-				<data android:host="glorymanga.com" />
-				<data android:host="goldenmanga.top" />
-				<data android:host="golgebahcesi.com" />
-				<data android:host="gooffansub.com" />
-				<data android:host="gourmetscans.net" />
-				<data android:host="grabber.zone" />
-				<data android:host="gremorymangas.com" />
-				<data android:host="guimah.com" />
-				<data android:host="guncelmanga.net" />
-				<data android:host="h.mangabat.com" />
-				<data android:host="hachiraw.com" />
-				<data android:host="harimanga.com" />
-				<data android:host="hayalistic.com" />
-				<data android:host="hensekai.com" />
-				<data android:host="hentai3z.cc" />
-				<data android:host="hentai3z.xyz" />
-				<data android:host="hentai4free.net" />
-				<data android:host="hentai20.io" />
-				<data android:host="hentai.gekkouscans.com.br" />
-				<data android:host="hentai.scantrad-vf.cc" />
-				<data android:host="hentaichan.live" />
-				<data android:host="hentaichan.pro" />
-				<data android:host="hentaicube.net" />
-				<data android:host="hentailib.me" />
-				<data android:host="hentaimanga.me" />
-				<data android:host="hentaiteca.net" />
-				<data android:host="hentaivn.autos" />
-				<data android:host="hentaivn.tv" />
-				<data android:host="hentaiwebtoon.com" />
-				<data android:host="hentaixcomic.com" />
-				<data android:host="hentaixdickgirl.com" />
-				<data android:host="hentaixyuri.com" />
-				<data android:host="hentaizone.xyz" />
-				<data android:host="herenscan.com" />
-				<data android:host="hhentai.fr" />
-				<data android:host="hikariscan.com.br" />
-				<data android:host="hipercool.xyz" />
-				<data android:host="hmanhwa.com" />
-				<data android:host="hni-scantrad.com" />
-				<data android:host="honey-manga.com.ua" />
-				<data android:host="hscans.com" />
-				<data android:host="hto.to" />
-				<data android:host="id.gourmetscans.net" />
-				<data android:host="illusionscan.com" />
-				<data android:host="immortalupdates.com" />
-				<data android:host="immortalupdates.id" />
-				<data android:host="imperiodabritannia.com" />
-				<data android:host="imperioscans.com.br" />
-				<data android:host="indo18h.com" />
-				<data android:host="infrafandub.xyz" />
-				<data android:host="isekaiscan.top" />
-				<data android:host="it.ninemanga.com" />
-				<data android:host="itsyourightmanhua.com" />
-				<data android:host="jaiminisbox.net" />
-				<data android:host="japscan.ws" />
-				<data android:host="jiangzaitoon.co" />
-				<data android:host="jimanga.com" />
-				<data android:host="jpmangas.xyz" />
-				<data android:host="kanzenin.xyz" />
-				<data android:host="karatcam-scans.fr" />
-				<data android:host="katakomik.online" />
-				<data android:host="kiryuu.id" />
-				<data android:host="kissmanga.in" />
-				<data android:host="klikmanga.id" />
-				<data android:host="klz9.com" />
-				<data android:host="koinoboriscan.com" />
-				<data android:host="kolmanga.com" />
-				<data android:host="komikav.com" />
-				<data android:host="komikcast.io" />
-				<data android:host="komikdewasa.cfd" />
-				<data android:host="komikgo.org" />
-				<data android:host="komikhentai.co" />
-				<data android:host="komikid.com" />
-				<data android:host="komikindo.co" />
-				<data android:host="komikindo.info" />
-				<data android:host="komiklab.com" />
-				<data android:host="komiklokal.cfd" />
-				<data android:host="komikmama.co" />
-				<data android:host="komikmanhwa.me" />
-				<data android:host="komikmirror.art" />
-				<data android:host="komiksan.link" />
-				<data android:host="komiksay.site" />
-				<data android:host="komikstation.co" />
-				<data android:host="komiktap.in" />
-				<data android:host="komiku.com" />
-				<data android:host="komikzoid.xyz" />
-				<data android:host="ksgroupscans.com" />
-				<data android:host="kumascans.com" />
-				<data android:host="kunmanga.com" />
-				<data android:host="ladymanga.com" />
-				<data android:host="lectortmo.com" />
-				<data android:host="lectorunitoon.com" />
-				<data android:host="legacy-scans.com" />
-				<data android:host="legionscans.com" />
-				<data android:host="leitor.kamisama.com.br" />
-				<data android:host="leitorizakaya.net" />
-				<data android:host="lelscanvf.cc" />
-				<data android:host="leryaoi.com" />
-				<data android:host="lilymanga.net" />
-				<data android:host="limascans.xyz/v2" />
-				<data android:host="lkscanlation.com" />
-				<data android:host="lolicon.mobi" />
-				<data android:host="lugnica-scans.com" />
-				<data android:host="lunarscan.org" />
-				<data android:host="luxmanga.net" />
-				<data android:host="lxmanga.net" />
-				<data android:host="lynxscans.com" />
-				<data android:host="m.isekaiscan.to" />
-				<data android:host="mafia-manga.com" />
-				<data android:host="maidscan.com.br" />
-				<data android:host="manga1st.online" />
-				<data android:host="manga3s.com" />
-				<data android:host="manga18.club" />
-				<data android:host="manga68.com" />
-				<data android:host="manga689.com" />
-				<data android:host="manga-chan.me" />
-				<data android:host="manga-crab.com" />
-				<data android:host="manga-diyari.com" />
-				<data android:host="manga-fast.com" />
-				<data android:host="manga-fr.me" />
-				<data android:host="manga-mate.org" />
-				<data android:host="manga-moons.net" />
-				<data android:host="manga-scan.co" />
-				<data android:host="manga-scantrad.io" />
-				<data android:host="manga-tx.com" />
-				<data android:host="manga-uptocats.com" />
-				<data android:host="manga.clone-army.org" />
-				<data android:host="manga.in.ua" />
-				<data android:host="manga.mundodrama.site" />
-				<data android:host="mangaaction.com" />
-				<data android:host="mangaatrend.net" />
-				<data android:host="mangabaz.net" />
-				<data android:host="mangabob.com" />
-				<data android:host="mangabuddy.com" />
-				<data android:host="mangacim.com" />
-				<data android:host="mangaclash.com" />
-				<data android:host="mangacultivator.com" />
-				<data android:host="mangacute.com" />
-				<data android:host="mangacv.com" />
-				<data android:host="mangadass.com" />
-				<data android:host="mangadeemak.com" />
-				<data android:host="mangadex.org" />
-				<data android:host="mangadistrict.com" />
-				<data android:host="mangadna.com" />
-				<data android:host="mangadoor.com" />
-				<data android:host="mangaeffect.com" />
-				<data android:host="mangaforest.me" />
-				<data android:host="mangaforfree.com" />
-				<data android:host="mangafoxfull.com" />
-				<data android:host="mangafreak.online" />
-				<data android:host="mangagalaxy.me" />
-				<data android:host="mangagg.com" />
-				<data android:host="mangagoyaoi.com" />
-				<data android:host="mangagreat.com" />
-				<data android:host="mangahentai.me" />
-				<data android:host="mangahub.fr" />
-				<data android:host="mangaid.click" />
-				<data android:host="mangaindo.me" />
-				<data android:host="mangak2.com" />
-				<data android:host="mangakakalot.com" />
-				<data android:host="mangakeyfi.net" />
-				<data android:host="mangaking.net" />
-				<data android:host="mangakio.me" />
-				<data android:host="mangakiss.org" />
-				<data android:host="mangakita.net" />
-				<data android:host="mangakomi.io" />
-				<data android:host="mangakyo.org" />
-				<data android:host="mangalek.com" />
-				<data android:host="mangaleks.com" />
-				<data android:host="mangaleveling.com" />
-				<data android:host="mangalib.me" />
-				<data android:host="mangalike.me" />
-				<data android:host="mangalink.online" />
-				<data android:host="mangalionz.com" />
-				<data android:host="mangamammy.ru" />
-				<data android:host="mangamanhua.online" />
-				<data android:host="mangamaniacs.org" />
-				<data android:host="manganato.com" />
-				<data android:host="mangaokutr.com" />
-				<data android:host="mangaonelove.site" />
-				<data android:host="mangaonlineteam.com" />
-				<data android:host="mangaowl.to" />
-				<data android:host="mangaprotm.com" />
-				<data android:host="mangapt.com" />
-				<data android:host="mangapuma.com" />
-				<data android:host="mangaread.co" />
-				<data android:host="mangareaderpro.com" />
-				<data android:host="mangareading.org" />
-				<data android:host="mangarockteam.com" />
-				<data android:host="mangarocky.com" />
-				<data android:host="mangarolls.net" />
-				<data android:host="mangarosie.in" />
-				<data android:host="mangas-origines.fr" />
-				<data android:host="mangas-origines.xyz" />
-				<data android:host="mangaschan.com" />
-				<data android:host="mangasehri.com" />
-				<data android:host="mangaspark.com" />
-				<data android:host="mangastarz.com" />
-				<data android:host="mangastic.cc" />
-				<data android:host="mangastic.cc" />
-				<data android:host="mangasushi.org" />
-				<data android:host="mangasusuku.xyz" />
-				<data android:host="mangatale.co" />
-				<data android:host="mangatone.com" />
-				<data android:host="mangatoto.com" />
-				<data android:host="mangatoto.net" />
-				<data android:host="mangatoto.org" />
-				<data android:host="mangatx.com" />
-				<data android:host="mangaus.xyz" />
-				<data android:host="mangavisa.com" />
-				<data android:host="mangaweebs.in" />
-				<data android:host="mangawt.com" />
-				<data android:host="mangax1.com" />
-				<data android:host="mangaxyz.com" />
-				<data android:host="mangayaro.net" />
-				<data android:host="mangazavr.ru" />
-				<data android:host="mangazodiac.com" />
-				<data android:host="manhatic.com" />
-				<data android:host="manhuaes.com" />
-				<data android:host="manhuafast.com" />
-				<data android:host="manhuafast.net" />
-				<data android:host="manhuaga.com" />
-				<data android:host="manhuahot.com" />
-				<data android:host="manhuamix.com" />
-				<data android:host="manhuaplus.com" />
-				<data android:host="manhuascan.us" />
-				<data android:host="manhuaus.com" />
-				<data android:host="manhuazone.net" />
-				<data android:host="manhwa18.app" />
-				<data android:host="manhwa18.com" />
-				<data android:host="manhwa18.net" />
-				<data android:host="manhwa18.org" />
-				<data android:host="manhwa68.com" />
-				<data android:host="manhwa-latino.com" />
-				<data android:host="manhwaclan.com" />
-				<data android:host="manhwadesu.top" />
-				<data android:host="manhwafull.com" />
-				<data android:host="manhwahentai.me" />
-				<data android:host="manhwaindo.icu" />
-				<data android:host="manhwaindo.id" />
-				<data android:host="manhwakool.com" />
-				<data android:host="manhwalist.xyz" />
-				<data android:host="manhwalover.com" />
-				<data android:host="manhwaplus.pro" />
-				<data android:host="manhwasco.net" />
-				<data android:host="manhwatop.com" />
-				<data android:host="manhwaworld.com" />
-				<data android:host="manhwax.org" />
-				<data android:host="manhwaz.com" />
-				<data android:host="mantrazscan.com" />
-				<data android:host="manwe.pro" />
-				<data android:host="manycomic.com" />
-				<data android:host="manytoon.com" />
-				<data android:host="manytoon.me" />
-				<data android:host="masterkomik.com" />
-				<data android:host="melokomik.xyz" />
-				<data android:host="mgkomik.com" />
-				<data android:host="miauscans.com" />
-				<data android:host="milftoon.xxx" />
-				<data android:host="mintmanga.com" />
-				<data android:host="mintmanga.live" />
-				<data android:host="mirrordesu.ink" />
-				<data android:host="mm-scans.org" />
-				<data android:host="momonohanascan.com" />
-				<data android:host="monarcamanga.com" />
-				<data android:host="moonloversscan.com.br" />
-				<data android:host="moonwitchinlovescan.com" />
-				<data android:host="mortalsgroove.com" />
-				<data android:host="mto.to" />
-				<data android:host="mundomangakun.com.br" />
-				<data android:host="mundomanhwa.com" />
-				<data android:host="murimscan.run" />
-				<data android:host="neatmangas.com" />
-				<data android:host="neoxscans.net" />
-				<data android:host="nettruyenin.com" />
-				<data android:host="nettruyento.com" />
-				<data android:host="neumanga.net" />
-				<data android:host="neumanga.xyz" />
-				<data android:host="nhattruyenmin.com" />
-				<data android:host="nhentai.net" />
-				<data android:host="nicovideo.jp" />
-				<data android:host="nightscans.org" />
-				<data android:host="niji-translations.com" />
-				<data android:host="ninjascan.site" />
-				<data android:host="niverafansub.com" />
-				<data android:host="nocsummer.com.br" />
-				<data android:host="noindexscan.com" />
-				<data android:host="nonbiri.space" />
-				<data android:host="novelcrow.com" />
-				<data android:host="novelmic.com" />
-				<data android:host="novelstown.cyou" />
-				<data android:host="nude-moon.net" />
-				<data android:host="nude-moon.org" />
-				<data android:host="nyxmanga.com" />
-				<data android:host="origami-orpheans.com.br" />
-				<data android:host="otsugami.id" />
-				<data android:host="oxapk.com" />
-				<data android:host="ozulmanga.com" />
-				<data android:host="painfulnightz.com" />
-				<data android:host="pantheon-scan.com" />
-				<data android:host="papscan.com" />
-				<data android:host="paragonscans.com" />
-				<data android:host="peacescans.com" />
-				<data android:host="phantomscans.com" />
-				<data android:host="phenixscans.fr" />
-				<data android:host="pianmanga.me" />
-				<data android:host="pirulitorosa.site" />
-				<data android:host="piscans.in" />
-				<data android:host="platinumscans.com" />
-				<data android:host="pojokmanga.net" />
-				<data android:host="popsmanga.com" />
-				<data android:host="portalyaoi.com" />
-				<data android:host="prismahentai.com" />
-				<data android:host="prismascans.net" />
-				<data android:host="projetoscanlator.com" />
-				<data android:host="psunicorn.com" />
-				<data android:host="queenscans.com" />
-				<data android:host="ragnarokscan.com" />
-				<data android:host="ragnarokscanlation.com" />
-				<data android:host="raijinscans.fr" />
-				<data android:host="raikiscan.com" />
-				<data android:host="rainbowfairyscan.com" />
-				<data android:host="randomscans.com" />
-				<data android:host="ravenscans.com" />
-				<data android:host="rawdex.net" />
-				<data android:host="rawkuma.com" />
-				<data android:host="read-nifteam.info" />
-				<data android:host="read.babelwuxia.com" />
-				<data android:host="readcomicsonline.ru" />
-				<data android:host="reader.deathtollscans.net" />
-				<data android:host="reader.decadencescans.com" />
-				<data android:host="reader.evilflowers.com" />
-				<data android:host="reader.mangatellers.gr" />
-				<data android:host="reader.onepiecenakama.pl" />
-				<data android:host="reader.powermanga.org" />
-				<data android:host="reader.silentsky-scans.net" />
-				<data android:host="readfreecomics.com" />
-				<data android:host="readkomik.com" />
-				<data android:host="readmanga.io" />
-				<data android:host="readmanga.live" />
-				<data android:host="readmanga.me" />
-				<data android:host="readmangabat.com" />
-				<data android:host="readmanhua.net" />
-				<data android:host="readtoto.com" />
-				<data android:host="readtoto.net" />
-				<data android:host="readtoto.org" />
-				<data android:host="realmscans.xyz" />
-				<data android:host="reaperscans.fr" />
-				<data android:host="remanga.org" />
-				<data android:host="rightdark-scan.com" />
-				<data android:host="rio2manga.com" />
-				<data android:host="rio2manga.net" />
-				<data android:host="rogmangas.com" />
-				<data android:host="romantikmanga.com" />
-				<data android:host="ru.ninemanga.com" />
-				<data android:host="s2manga.com" />
-				<data android:host="samuraiscan.com" />
-				<data android:host="sawamics.com" />
-				<data android:host="saytruyenhay.com" />
-				<data android:host="scambertraslator.com" />
-				<data android:host="scan.hentai.menu" />
-				<data android:host="scanmanga-vf.ws" />
-				<data android:host="scansmangas.me" />
-				<data android:host="scansraw.com" />
-				<data android:host="scantrad-union.com" />
-				<data android:host="scantrad-vf.co" />
-				<data android:host="sekaikomik.pro" />
-				<data android:host="sektedoujin.cc" />
-				<data android:host="sektekomik.xyz" />
-				<data android:host="selfmanga.live" />
-				<data android:host="senpaiediciones.com" />
-				<data android:host="shadowmangas.com" />
-				<data android:host="shadowtrad.net" />
-				<data android:host="sheakomik.com" />
-				<data android:host="shibamanga.com" />
-				<data android:host="shinigami.id" />
-				<data android:host="shirodoujin.com" />
-				<data android:host="shootingstarscans.com" />
-				<data android:host="silencescan.com.br" />
-				<data android:host="sinensisscans.com" />
-				<data android:host="skanlacje-feniksy.pl" />
-				<data android:host="skymanga.work" />
-				<data android:host="skymangas.com" />
-				<data android:host="sleepytranslations.com" />
-				<data android:host="soulscans.my.id" />
-				<data android:host="spartanmanga.com.tr" />
-				<data android:host="sssscanlator.com" />
-				<data android:host="summanga.com" />
-				<data android:host="suryascans.com" />
-				<data android:host="sushiscan.fr" />
-				<data android:host="sushiscan.net" />
-				<data android:host="swatop.club" />
-				<data android:host="tankouhentai.com" />
-				<data android:host="tatakaescan.com" />
-				<data android:host="tecnoscann.com" />
-				<data android:host="teenmanhua.com" />
-				<data android:host="tempestfansub.com" />
-				<data android:host="templescan.net" />
-				<data android:host="templescanesp.com" />
-				<data android:host="tenkaiscan.net" />
-				<data android:host="theguildscans.com" />
-				<data android:host="thesugarscan.com" />
-				<data android:host="timenaight.com" />
-				<data android:host="todaymic.com" />
-				<data android:host="tonizutoon.com" />
-				<data android:host="toonchill.com" />
-				<data android:host="toonfr.com" />
-				<data android:host="toonhunter.com" />
-				<data android:host="toonily.com" />
-				<data android:host="toonily.me" />
-				<data android:host="toonily.net" />
-				<data android:host="toonitube.com" />
-				<data android:host="tortuga-ceviri.com" />
-				<data android:host="traduccionesmoonlight.com" />
-				<data android:host="treemanga.com" />
-				<data android:host="tritinia.org" />
-				<data android:host="truemanga.com" />
-				<data android:host="truyentranhlh.net" />
-				<data android:host="tsundoku.com.br" />
-				<data android:host="tukangkomik.id" />
-				<data android:host="tumanhwas.club" />
-				<data android:host="turktoon.com" />
-				<data android:host="v2.comiz.net" />
-				<data android:host="valkyriescan.com" />
-				<data android:host="vercomicsporno.com" />
-				<data android:host="vermangasporno.com" />
-				<data android:host="vermanhwa.es" />
-				<data android:host="viyafansub.com" />
-				<data android:host="void-scans.com" />
-				<data android:host="w.mangairo.com" />
-				<data android:host="wakamics.net" />
-				<data android:host="webcomic.me" />
-				<data android:host="webtoon-tr.com" />
-				<data android:host="webtoon.uk" />
-				<data android:host="webtoonempire.org" />
-				<data android:host="webtoonhatti.com" />
-				<data android:host="webtoons.top" />
-				<data android:host="webtoonscan.com" />
-				<data android:host="weloma.art" />
-				<data android:host="welovemanga.one" />
-				<data android:host="westmanga.info" />
-				<data android:host="wickedwitchscan.com" />
-				<data android:host="winterscan.com" />
-				<data android:host="wonderlandscan.com" />
-				<data android:host="woopread.com" />
-				<data android:host="worldmanhwas.bar" />
-				<data android:host="wto.to" />
-				<data android:host="www1.bluesolo.org" />
-				<data android:host="www.areascans.net" />
-				<data android:host="www.bentomanga.com" />
-				<data android:host="www.eromiau.com" />
-				<data android:host="www.inu-manga.com" />
-				<data android:host="www.japscan.lol" />
-				<data android:host="www.kuroimanga.com" />
-				<data android:host="www.lami-manga.com" />
-				<data android:host="www.lelmanga.com" />
-				<data android:host="www.lianscans.my.id" />
-				<data android:host="www.maid.my.id" />
-				<data android:host="www.majorscans.com" />
-				<data android:host="www.mangadods.com" />
-				<data android:host="www.mangaread.org" />
-				<data android:host="www.mangascantrad.fr" />
-				<data android:host="www.mangatown.com" />
-				<data android:host="www.manhuabug.com" />
-				<data android:host="www.manhuakey.com" />
-				<data android:host="www.manhuasy.com" />
-				<data android:host="www.menudo-fansub.com" />
-				<data android:host="www.nettruyenmax.com" />
-				<data android:host="www.nettruyento.com" />
-				<data android:host="www.nightcomic.com" />
-				<data android:host="www.ninemanga.com" />
-				<data android:host="www.noblessetranslations.com" />
-				<data android:host="www.pantheon-scan.fr" />
-				<data android:host="www.paritehaber.com" />
-				<data android:host="www.peachscan.com" />
-				<data android:host="www.petrotechsociety.org" />
-				<data android:host="www.petrotechsociety.org" />
-				<data android:host="www.ramareader.it" />
-				<data android:host="www.rh2plusmanga.com" />
-				<data android:host="www.ruyamanga.com" />
-				<data android:host="www.scan-fr.org" />
-				<data android:host="www.scan-vf.net" />
-				<data android:host="www.thaimanga.net" />
-				<data android:host="www.topmanhua.com" />
-				<data android:host="www.vfscan.com" />
-				<data android:host="www.walpurgiscan.it" />
-				<data android:host="www.webtoon.xyz" />
-				<data android:host="www.witcomics.net" />
-				<data android:host="www.xn--l3c0azab5a2gta.com" />
-				<data android:host="www.yaoitoshokan.net" />
-				<data android:host="xbato.com" />
-				<data android:host="xbato.net" />
-				<data android:host="xbato.org" />
-				<data android:host="xoxocomics.net" />
-				<data android:host="xx.hentaichan.live" />
-				<data android:host="xxx.hentaichan.live" />
-				<data android:host="y.hentaichan.live" />
-				<data android:host="yaoi-chan.me" />
-				<data android:host="yaoi.mobi" />
-				<data android:host="yaoilib.me" />
-				<data android:host="yaoiscan.com" />
-				<data android:host="ycscan.com" />
-				<data android:host="yugenmangas.com.br" />
-				<data android:host="yuri.live" />
-				<data android:host="zahard.xyz" />
-				<data android:host="zandynofansub.aishiteru.org" />
-				<data android:host="zbato.com" />
-				<data android:host="zbato.net" />
-				<data android:host="zbato.org" />
-				<data android:host="zeroscan.com.br" />
-				<data android:host="zinmanga.com" />
-				<data android:host="zinmanhwa.com" />
-				<data android:host="zuttomanga.com" />
-				<data android:host="реманга.орг" />
-			</intent-filter>
-		</activity-alias>
-
 	</application>
 
 </manifest>

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

@@ -1,36 +1,35 @@
-package org.koitharu.kotatsu.core
+package org.koitharu.kotatsu
 
 import android.app.Application
 import android.content.Context
+import android.os.StrictMode
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.strictmode.FragmentStrictMode
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.room.InvalidationTracker
 import androidx.work.Configuration
-import androidx.work.WorkManager
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
 import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
-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.settings.work.WorkScheduleManager
+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 javax.inject.Inject
-import javax.inject.Provider
 
 @HiltAndroidApp
-open class BaseApp : Application(), Configuration.Provider {
+class KotatsuApp : Application(), Configuration.Provider {
 
 	@Inject
 	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
@@ -47,26 +46,18 @@ open class BaseApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workerFactory: HiltWorkerFactory
 
-	@Inject
-	lateinit var appValidator: AppValidator
-
-	@Inject
-	lateinit var workScheduleManager: WorkScheduleManager
-
-	@Inject
-	lateinit var workManagerProvider: Provider<WorkManager>
-
 	override fun onCreate() {
 		super.onCreate()
-		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
+		if (BuildConfig.DEBUG) {
+			enableStrictMode()
+		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
 		AppCompatDelegate.setApplicationLocales(settings.appLocales)
 		setupActivityLifecycleCallbacks()
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
-		workScheduleManager.init()
-		WorkServiceStopHelper(workManagerProvider).setup()
+		WorkServiceStopHelper(applicationContext).setup()
 	}
 
 	override fun attachBaseContext(base: Context?) {
@@ -76,10 +67,6 @@ open class BaseApp : Application(), Configuration.Provider {
 			reportFormat = StringFormat.JSON
 			excludeMatchingSharedPreferencesKeys = listOf(
 				"sources_\\w+",
-				AppSettings.KEY_APP_PASSWORD,
-				AppSettings.KEY_PROXY_LOGIN,
-				AppSettings.KEY_PROXY_ADDRESS,
-				AppSettings.KEY_PROXY_PASSWORD,
 			)
 			httpSender {
 				uri = getString(R.string.url_error_report)
@@ -96,10 +83,8 @@ open class BaseApp : Application(), Configuration.Provider {
 				ReportField.PHONE_MODEL,
 				ReportField.STACK_TRACE,
 				ReportField.CRASH_CONFIGURATION,
-				ReportField.CUSTOM_DATA,
 				ReportField.SHARED_PREFERENCES,
 			)
-
 			dialog {
 				text = getString(R.string.crash_text)
 				title = getString(R.string.error_occurred)
@@ -129,4 +114,31 @@ open class BaseApp : Application(), Configuration.Provider {
 			registerActivityLifecycleCallbacks(it)
 		}
 	}
+
+	private fun enableStrictMode() {
+		StrictMode.setThreadPolicy(
+			StrictMode.ThreadPolicy.Builder()
+				.detectAll()
+				.penaltyLog()
+				.build(),
+		)
+		StrictMode.setVmPolicy(
+			StrictMode.VmPolicy.Builder()
+				.detectAll()
+				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				.setClassInstanceLimit(PagesCache::class.java, 1)
+				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				.setClassInstanceLimit(PageLoader::class.java, 1)
+				.penaltyLog()
+				.build(),
+		)
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
+			.penaltyDeath()
+			.detectFragmentReuse()
+			.detectWrongFragmentContainer()
+			.detectRetainInstanceUsage()
+			.detectSetUserVisibleHint()
+			.detectFragmentTagUsage()
+			.build()
+	}
 }

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

@@ -5,7 +5,6 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Transaction
-import androidx.room.Upsert
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 
@@ -15,24 +14,15 @@ abstract class BookmarksDao {
 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
 	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
 
-	@Query("SELECT * FROM bookmarks WHERE page_id = :pageId")
-	abstract suspend fun find(pageId: Long): BookmarkEntity?
-
-	@Transaction
-	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent",
-	)
-	abstract suspend fun findAll(): Map<MangaWithTags, List<BookmarkEntity>>
-
-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page ORDER BY percent")
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
 	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
 
-	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY percent")
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId ORDER BY created_at DESC")
 	abstract fun observe(mangaId: Long): Flow<List<BookmarkEntity>>
 
 	@Transaction
 	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent",
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY bookmarks.created_at",
 	)
 	abstract fun observe(): Flow<Map<MangaWithTags, List<BookmarkEntity>>>
 
@@ -45,12 +35,6 @@ abstract class BookmarksDao {
 	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
 	abstract suspend fun delete(mangaId: Long, pageId: Long): Int
 
-	@Query("DELETE FROM bookmarks WHERE page_id = :pageId")
-	abstract suspend fun delete(pageId: Long): Int
-
 	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page")
 	abstract suspend fun delete(mangaId: Long, chapterId: Long, page: Int): Int
-
-	@Upsert
-	abstract suspend fun upsert(bookmarks: Collection<BookmarkEntity>)
 }

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.util.*
 
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
@@ -30,5 +30,4 @@ fun Collection<BookmarkEntity>.toBookmarks(manga: Manga) = map {
 	it.toBookmark(manga)
 }
 
-@JvmName("bookmarksIds")
-fun Collection<Bookmark>.ids() = map { it.pageId }
+fun Collection<Bookmark>.ids() = map { it.pageId }

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

@@ -1,12 +1,9 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.local.data.ImageFileFilter
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
 import java.util.Date
 
-data class Bookmark(
+class Bookmark(
 	val manga: Manga,
 	val pageId: Long,
 	val chapterId: Long,
@@ -15,30 +12,33 @@ data class Bookmark(
 	val imageUrl: String,
 	val createdAt: Date,
 	val percent: Float,
-) : ListModel {
+) {
 
-	val directImageUrl: String?
-		get() = if (isImageUrlDirect()) imageUrl else null
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
 
-	val imageLoadData: Any
-		get() = if (isImageUrlDirect()) imageUrl else toMangaPage()
+		other as Bookmark
 
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is Bookmark &&
-			manga.id == other.manga.id &&
-			chapterId == other.chapterId &&
-			page == other.page
+		if (manga != other.manga) return false
+		if (pageId != other.pageId) return false
+		if (chapterId != other.chapterId) return false
+		if (page != other.page) return false
+		if (scroll != other.scroll) return false
+		if (imageUrl != other.imageUrl) return false
+		if (createdAt != other.createdAt) return false
+		return percent == other.percent
 	}
 
-	fun toMangaPage() = MangaPage(
-		id = pageId,
-		url = imageUrl,
-		preview = null,
-		source = manga.source,
-	)
-
-	private fun isImageUrlDirect(): Boolean {
-		val extension = imageUrl.substringAfterLast('.')
-		return extension.isNotEmpty() && ImageFileFilter().isExtensionValid(extension)
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + pageId.hashCode()
+		result = 31 * result + chapterId.hashCode()
+		result = 31 * result + page
+		result = 31 * result + scroll
+		result = 31 * result + imageUrl.hashCode()
+		result = 31 * result + createdAt.hashCode()
+		result = 31 * result + percent.hashCode()
+		return result
 	}
 }

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

@@ -15,8 +15,8 @@ import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.mapItems
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 @Reusable
@@ -52,13 +52,6 @@ class BookmarksRepository @Inject constructor(
 		}
 	}
 
-	suspend fun updateBookmark(bookmark: Bookmark, imageUrl: String) {
-		val entity = bookmark.toEntity().copy(
-			imageUrl = imageUrl,
-		)
-		db.bookmarksDao.upsert(listOf(entity))
-	}
-
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
 		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
 			"Bookmark not found"
@@ -69,16 +62,18 @@ class BookmarksRepository @Inject constructor(
 		removeBookmark(bookmark.manga.id, bookmark.chapterId, bookmark.page)
 	}
 
-	suspend fun removeBookmarks(ids: Set<Long>): ReversibleHandle {
+	suspend fun removeBookmarks(ids: Map<Manga, Set<Long>>): ReversibleHandle {
 		val entities = ArrayList<BookmarkEntity>(ids.size)
 		db.withTransaction {
 			val dao = db.bookmarksDao
-			for (pageId in ids) {
-				val e = dao.find(pageId)
-				if (e != null) {
-					entities.add(e)
+			for ((manga, idSet) in ids) {
+				for (pageId in idSet) {
+					val e = dao.find(manga.id, pageId)
+					if (e != null) {
+						entities.add(e)
+					}
+					dao.delete(manga.id, pageId)
 				}
-				dao.delete(pageId)
 			}
 		}
 		return BookmarksRestorer(entities)

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

@@ -12,31 +12,31 @@ import androidx.core.graphics.Insets
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.GridLayoutManager
 import coil.ImageLoader
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.data.ids
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksGroupAdapter
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
-import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.core.ui.list.decor.AbstractSelectionItemDecoration
+import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.ui.util.reverseAsync
+import org.koitharu.kotatsu.core.util.ext.invalidateNestedItemDecorations
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
-import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
-import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
-import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -48,18 +48,15 @@ class BookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
-	ListSelectionController.Callback2,
-	FastScroller.FastScrollListener, ListHeaderClickListener {
+	SectionedSelectionController.Callback<Manga>,
+	FastScroller.FastScrollListener {
 
 	@Inject
 	lateinit var coil: ImageLoader
 
-	@Inject
-	lateinit var settings: AppSettings
-
 	private val viewModel by viewModels<BookmarksViewModel>()
-	private var bookmarksAdapter: BookmarksAdapter? = null
-	private var selectionController: ListSelectionController? = null
+	private var adapter: BookmarksGroupAdapter? = null
+	private var selectionController: SectionedSelectionController<Manga>? = null
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
 		return FragmentListSimpleBinding.inflate(inflater, container, false)
@@ -67,62 +64,45 @@ class BookmarksFragment :
 
 	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		selectionController = ListSelectionController(
+		selectionController = SectionedSelectionController(
 			activity = requireActivity(),
-			decoration = BookmarksSelectionDecoration(binding.root.context),
-			registryOwner = this,
+			owner = this,
 			callback = this,
 		)
-		bookmarksAdapter = BookmarksAdapter(
+		adapter = BookmarksGroupAdapter(
 			lifecycleOwner = viewLifecycleOwner,
 			coil = coil,
-			clickListener = this,
-			headerClickListener = this,
+			listener = this,
+			selectionController = checkNotNull(selectionController),
+			bookmarkClickListener = this,
+			groupClickListener = OnGroupClickListener(),
 		)
-		val spanSizeLookup = SpanSizeLookup()
-		with(binding.recyclerView) {
-			setHasFixedSize(true)
-			val spanResolver = MangaListSpanResolver(resources)
-			addItemDecoration(TypedListSpacingDecoration(context, false))
-			adapter = bookmarksAdapter
-			addOnLayoutChangeListener(spanResolver)
-			spanResolver.setGridSize(settings.gridSize / 100f, this)
-			val lm = GridLayoutManager(context, spanResolver.spanCount)
-			lm.spanSizeLookup = spanSizeLookup
-			layoutManager = lm
-			selectionController?.attachToRecyclerView(this)
-		}
-		viewModel.content.observe(viewLifecycleOwner) {
-			bookmarksAdapter?.setItems(it, spanSizeLookup)
-		}
+		binding.recyclerView.adapter = adapter
+		binding.recyclerView.setHasFixedSize(true)
+		val spacingDecoration = SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+		binding.recyclerView.addItemDecoration(spacingDecoration)
+
+		viewModel.content.observe(viewLifecycleOwner, ::onListChanged)
 		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
 		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
 	}
 
 	override fun onDestroyView() {
 		super.onDestroyView()
-		bookmarksAdapter = null
+		adapter = null
 		selectionController = null
 	}
 
 	override fun onItemClick(item: Bookmark, view: View) {
-		if (selectionController?.onItemClick(item.pageId) != true) {
-			val intent = ReaderActivity.IntentBuilder(view.context)
-				.bookmark(item)
-				.incognito(true)
-				.build()
-			startActivity(intent)
+		if (selectionController?.onItemClick(item.manga, item.pageId) != true) {
+			val intent = ReaderActivity.newIntent(view.context, item)
+			startActivity(intent, scaleUpActivityOptionsOf(view).toBundle())
 			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}
 
-	override fun onListHeaderClick(item: ListHeader, view: View) {
-		val manga = item.payload as? Manga ?: return
-		startActivity(DetailsActivity.newIntent(view.context, manga))
-	}
-
 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(item.pageId) ?: false
+		return selectionController?.onItemLongClick(item.manga, item.pageId) ?: false
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -135,16 +115,24 @@ class BookmarksFragment :
 
 	override fun onFastScrollStop(fastScroller: FastScroller) = Unit
 
-	override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
-		requireViewBinding().recyclerView.invalidateItemDecorations()
+	override fun onSelectionChanged(controller: SectionedSelectionController<Manga>, count: Int) {
+		requireViewBinding().recyclerView.invalidateNestedItemDecorations()
 	}
 
-	override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+	override fun onCreateActionMode(
+		controller: SectionedSelectionController<Manga>,
+		mode: ActionMode,
+		menu: Menu,
+	): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
 		return true
 	}
 
-	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
+	override fun onActionItemClicked(
+		controller: SectionedSelectionController<Manga>,
+		mode: ActionMode,
+		item: MenuItem,
+	): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
@@ -157,16 +145,24 @@ class BookmarksFragment :
 		}
 	}
 
+	override fun onCreateItemDecoration(
+		controller: SectionedSelectionController<Manga>,
+		section: Manga,
+	): AbstractSelectionItemDecoration = BookmarksSelectionDecoration(requireContext())
+
 	override fun onWindowInsetsChanged(insets: Insets) {
-		val rv = requireViewBinding().recyclerView
-		rv.updatePadding(
-			bottom = insets.bottom + rv.paddingTop,
+		requireViewBinding().recyclerView.updatePadding(
+			bottom = insets.bottom,
 		)
-		rv.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+		requireViewBinding().recyclerView.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			bottomMargin = insets.bottom
 		}
 	}
 
+	private fun onListChanged(list: List<ListModel>) {
+		adapter?.items = list
+	}
+
 	private fun onActionDone(action: ReversibleAction) {
 		val handle = action.handle
 		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
@@ -177,24 +173,24 @@ class BookmarksFragment :
 		snackbar.show()
 	}
 
-	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
+	private inner class OnGroupClickListener : OnListItemClickListener<BookmarksGroup> {
 
-		init {
-			isSpanIndexCacheEnabled = true
-			isSpanGroupIndexCacheEnabled = true
-		}
-
-		override fun getSpanSize(position: Int): Int {
-			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
-			return when (bookmarksAdapter?.getItemViewType(position)) {
-				ListItemType.PAGE_THUMB.ordinal -> 1
-				else -> total
+		override fun onItemClick(item: BookmarksGroup, view: View) {
+			val controller = selectionController
+			if (controller != null && controller.count > 0) {
+				if (controller.getSectionCount(item.manga) == item.bookmarks.size) {
+					controller.clearSelection(item.manga)
+				} else {
+					controller.addToSelection(item.manga, item.bookmarks.ids())
+				}
+				return
 			}
+			val intent = DetailsActivity.newIntent(view.context, item.manga)
+			startActivity(intent)
 		}
 
-		override fun run() {
-			invalidateSpanGroupIndexCache()
-			invalidateSpanIndexCache()
+		override fun onItemLongClick(item: BookmarksGroup, view: View): Boolean {
+			return selectionController?.addToSelection(item.manga, item.bookmarks.ids()) ?: false
 		}
 	}
 

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

@@ -10,14 +10,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
@@ -42,26 +41,17 @@ class BookmarksViewModel @Inject constructor(
 						actionStringRes = 0,
 					),
 				)
-			} else {
-				mapList(list)
+			} else list.map { (manga, bookmarks) ->
+				BookmarksGroup(manga, bookmarks)
 			}
 		}
 		.catch { e -> emit(listOf(e.toErrorState(canRetry = false))) }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
 
-	fun removeBookmarks(ids: Set<Long>) {
+	fun removeBookmarks(ids: Map<Manga, Set<Long>>) {
 		launchJob(Dispatchers.Default) {
 			val handle = repository.removeBookmarks(ids)
 			onActionDone.call(ReversibleAction(R.string.bookmarks_removed, handle))
 		}
 	}
-
-	private fun mapList(data: Map<Manga, List<Bookmark>>): List<ListModel> {
-		val result = ArrayList<ListModel>(data.values.sumOf { it.size + 1 })
-		for ((manga, bookmarks) in data) {
-			result.add(ListHeader(manga.title, R.string.more, manga))
-			result.addAll(bookmarks)
-		}
-		return result
-	}
 }

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

@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
 import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.decodeRegion
+import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -27,16 +28,19 @@ fun bookmarkListAD(
 	binding.root.setOnLongClickListener(listener)
 
 	bind {
-		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageUrl)?.run {
 			size(CoverSizeResolver(binding.imageViewThumb))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_error_placeholder)
 			allowRgb565(true)
-			tag(item)
 			decodeRegion(item.scroll)
 			source(item.manga.source)
 			enqueueWith(coil)
 		}
 	}
+
+	onViewRecycled {
+		binding.imageViewThumb.disposeImageRequest()
+	}
 }

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

@@ -1,19 +1,32 @@
 package org.koitharu.kotatsu.bookmarks.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 
 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : BaseListAdapter<Bookmark>() {
+) : AsyncListDifferDelegationAdapter<Bookmark>(
+	DiffCallback(),
+	bookmarkListAD(coil, lifecycleOwner, clickListener),
+) {
+
+	private class DiffCallback : DiffUtil.ItemCallback<Bookmark>() {
+
+		override fun areItemsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.manga.id == newItem.manga.id &&
+				oldItem.chapterId == newItem.chapterId &&
+				oldItem.page == newItem.page
+		}
+
+		override fun areContentsTheSame(oldItem: Bookmark, newItem: Bookmark): Boolean {
+			return oldItem.imageUrl == newItem.imageUrl
+		}
 
-	init {
-		addDelegate(ListItemType.PAGE_THUMB, bookmarkListAD(coil, lifecycleOwner, clickListener))
 	}
 }

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

@@ -0,0 +1,69 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import android.view.View
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.core.util.ext.clearItemDecorations
+import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.source
+import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+
+fun bookmarksGroupAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	sharedPool: RecyclerView.RecycledViewPool,
+	selectionController: SectionedSelectionController<Manga>,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
+	{ layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
+) {
+	val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
+		override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
+		override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
+	}
+
+	val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
+	binding.recyclerView.setRecycledViewPool(sharedPool)
+	binding.recyclerView.adapter = adapter
+	val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
+	binding.recyclerView.addItemDecoration(spacingDecoration)
+	binding.root.setOnClickListener(viewListenerAdapter)
+	binding.root.setOnLongClickListener(viewListenerAdapter)
+
+	bind { payloads ->
+		if (payloads.isEmpty()) {
+			binding.recyclerView.clearItemDecorations()
+			binding.recyclerView.addItemDecoration(spacingDecoration)
+			selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
+		}
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
+			placeholder(R.drawable.ic_placeholder)
+			fallback(R.drawable.ic_placeholder)
+			error(R.drawable.ic_error_placeholder)
+			allowRgb565(true)
+			size(CoverSizeResolver(binding.imageViewCover))
+			source(item.manga.source)
+			enqueueWith(coil)
+		}
+		binding.textViewTitle.text = item.manga.title
+		adapter.items = item.bookmarks
+	}
+
+	onViewRecycled {
+		binding.imageViewCover.disposeImageRequest()
+	}
+}

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

@@ -0,0 +1,77 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
+import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
+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.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.parsers.model.Manga
+import kotlin.jvm.internal.Intrinsics
+
+class BookmarksGroupAdapter(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	selectionController: SectionedSelectionController<Manga>,
+	listener: ListStateHolderListener,
+	bookmarkClickListener: OnListItemClickListener<Bookmark>,
+	groupClickListener: OnListItemClickListener<BookmarksGroup>,
+) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
+
+	init {
+		val pool = RecyclerView.RecycledViewPool()
+		delegatesManager
+			.addDelegate(
+				bookmarksGroupAD(
+					coil = coil,
+					lifecycleOwner = lifecycleOwner,
+					sharedPool = pool,
+					selectionController = selectionController,
+					bookmarkClickListener = bookmarkClickListener,
+					groupClickListener = groupClickListener,
+				),
+			)
+			.addDelegate(loadingStateAD())
+			.addDelegate(loadingFooterAD())
+			.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
+			.addDelegate(errorStateListAD(listener))
+	}
+
+	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
+
+		override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+			return when {
+				oldItem is BookmarksGroup && newItem is BookmarksGroup -> {
+					oldItem.manga.id == newItem.manga.id
+				}
+
+				oldItem is LoadingFooter && newItem is LoadingFooter -> {
+					oldItem.key == newItem.key
+				}
+
+				else -> oldItem.javaClass == newItem.javaClass
+			}
+		}
+
+		override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
+			return Intrinsics.areEqual(oldItem, newItem)
+		}
+
+		override fun getChangePayload(oldItem: ListModel, newItem: ListModel): Any? {
+			return when {
+				oldItem is BookmarksGroup && newItem is BookmarksGroup -> Unit
+				else -> super.getChangePayload(oldItem, newItem)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.bookmarks.ui.model
+
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.areItemsEquals
+
+class BookmarksGroup(
+	val manga: Manga,
+	val bookmarks: List<Bookmark>,
+) : ListModel {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as BookmarksGroup
+
+		if (manga != other.manga) return false
+
+		return bookmarks.areItemsEquals(other.bookmarks) { a, b ->
+			a.imageUrl == b.imageUrl
+		}
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + bookmarks.sumOf { it.imageUrl.hashCode() }
+		return result
+	}
+}

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

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

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

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

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

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

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

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

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

@@ -8,15 +8,14 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.webkit.CookieManager
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
 import com.google.android.material.R as materialR
 
 @SuppressLint("SetJavaScriptEnabled")
@@ -35,9 +34,8 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 		with(viewBinding.webView.settings) {
 			javaScriptEnabled = true
-			userAgentString = UserAgents.CHROME_MOBILE
+			userAgentString = CommonHeadersInterceptor.userAgentChrome
 		}
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
@@ -105,7 +103,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onDestroy() {
 		super.onDestroy()
-		viewBinding.webView.stopLoading()
 		viewBinding.webView.destroy()
 	}
 

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

@@ -1,74 +0,0 @@
-package org.koitharu.kotatsu.browser.cloudflare
-
-import android.content.Context
-import androidx.core.app.NotificationChannelCompat
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
-import androidx.core.net.toUri
-import coil.EventListener
-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.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.parsers.model.ContentType
-
-class CaptchaNotifier(
-	private val context: Context,
-) : EventListener {
-
-	fun notify(exception: CloudFlareProtectedException) {
-		if (!context.checkNotificationPermission()) {
-			return
-		}
-		val manager = NotificationManagerCompat.from(context)
-		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
-			.setName(context.getString(R.string.captcha_required))
-			.setShowBadge(true)
-			.setVibrationEnabled(false)
-			.setSound(null, null)
-			.setLightsEnabled(false)
-			.build()
-		manager.createNotificationChannel(channel)
-
-		val intent = CloudFlareActivity.newIntent(context, exception.url, exception.headers)
-			.setData(exception.url.toUri())
-		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
-			.setContentTitle(channel.name)
-			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
-			.setDefaults(NotificationCompat.DEFAULT_SOUND)
-			.setSmallIcon(android.R.drawable.stat_notify_error)
-			.setAutoCancel(true)
-			.setVisibility(
-				if (exception.source?.contentType == ContentType.HENTAI) {
-					NotificationCompat.VISIBILITY_SECRET
-				} else {
-					NotificationCompat.VISIBILITY_PUBLIC
-				},
-			)
-			.setContentText(
-				context.getString(
-					R.string.captcha_required_summary,
-					exception.source?.title ?: context.getString(R.string.app_name),
-				),
-			)
-			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))
-			.build()
-		manager.notify(TAG, exception.source.hashCode(), notification)
-	}
-
-	override fun onError(request: ImageRequest, result: ErrorResult) {
-		super.onError(request, result)
-		val e = result.throwable
-		if (e is CloudFlareProtectedException) {
-			notify(e)
-		}
-	}
-
-	private companion object {
-
-		private const val CHANNEL_ID = "captcha"
-		private const val TAG = CHANNEL_ID
-	}
-}

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

@@ -1,204 +0,0 @@
-package org.koitharu.kotatsu.browser.cloudflare
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.webkit.CookieManager
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.core.graphics.Insets
-import androidx.core.net.toUri
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import dagger.hilt.android.AndroidEntryPoint
-import okhttp3.Headers
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
-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.catchingWebViewUnavailability
-import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
-import javax.inject.Inject
-import com.google.android.material.R as materialR
-
-@AndroidEntryPoint
-class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCallback {
-
-	private var pendingResult = RESULT_CANCELED
-
-	@Inject
-	lateinit var cookieJar: MutableCookieJar
-
-	private var onBackPressedCallback: WebViewBackPressedCallback? = null
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability {
-				setContentView(
-					ActivityBrowserBinding.inflate(
-						layoutInflater
-					)
-				)
-			}) {
-			return
-		}
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
-		}
-		val url = intent?.dataString.orEmpty()
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = intent?.getStringExtra(ARG_UA) ?: UserAgents.CHROME_MOBILE
-		}
-		viewBinding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
-		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
-			onBackPressedDispatcher.addCallback(it)
-		}
-		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
-		if (savedInstanceState != null) {
-			return
-		}
-		if (url.isEmpty()) {
-			finishAfterTransition()
-		} else {
-			onTitleChanged(getString(R.string.loading_), url)
-			viewBinding.webView.loadUrl(url)
-		}
-	}
-
-	override fun onDestroy() {
-		viewBinding.webView.run {
-			stopLoading()
-			destroy()
-		}
-		super.onDestroy()
-	}
-
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-		menuInflater.inflate(R.menu.opt_captcha, menu)
-		return super.onCreateOptionsMenu(menu)
-	}
-
-	override fun onWindowInsetsChanged(insets: Insets) {
-		viewBinding.appbar.updatePadding(
-			top = insets.top,
-		)
-		viewBinding.root.updatePadding(
-			left = insets.left,
-			right = insets.right,
-			bottom = insets.bottom,
-		)
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
-		android.R.id.home -> {
-			viewBinding.webView.stopLoading()
-			finishAfterTransition()
-			true
-		}
-
-		R.id.action_retry -> {
-			viewBinding.webView.stopLoading()
-			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
-			if (targetUrl != null) {
-				clearCfCookies(targetUrl)
-				viewBinding.webView.loadUrl(targetUrl.toString())
-			}
-			true
-		}
-
-		else -> super.onOptionsItemSelected(item)
-	}
-
-	override fun onResume() {
-		super.onResume()
-		viewBinding.webView.onResume()
-	}
-
-	override fun onPause() {
-		viewBinding.webView.onPause()
-		super.onPause()
-	}
-
-	override fun finish() {
-		setResult(pendingResult)
-		super.finish()
-	}
-
-	override fun onPageLoaded() {
-		viewBinding.progressBar.isInvisible = true
-	}
-
-	override fun onCheckPassed() {
-		pendingResult = RESULT_OK
-		finishAfterTransition()
-	}
-
-	override fun onLoadingStateChanged(isLoading: Boolean) {
-		viewBinding.progressBar.isVisible = isLoading
-	}
-
-	override fun onHistoryChanged() {
-		onBackPressedCallback?.onHistoryChanged()
-	}
-
-	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
-		setTitle(title)
-		supportActionBar?.subtitle =
-			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
-	}
-
-	private fun clearCfCookies(url: HttpUrl) {
-		cookieJar.removeCookies(url) { cookie ->
-			val name = cookie.name
-			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf")
-		}
-	}
-
-	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {
-		override fun createIntent(context: Context, input: Pair<String, Headers?>): Intent {
-			return newIntent(context, input.first, input.second)
-		}
-
-		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
-			return TaggedActivityResult(TAG, resultCode)
-		}
-	}
-
-	companion object {
-
-		const val TAG = "CloudFlareActivity"
-		private const val ARG_UA = "ua"
-
-		fun newIntent(
-			context: Context,
-			url: String,
-			headers: Headers?,
-		) = Intent(context, CloudFlareActivity::class.java).apply {
-			data = url.toUri()
-			headers?.get(CommonHeaders.USER_AGENT)?.let {
-				putExtra(ARG_UA, it)
-			}
-		}
-	}
-}

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

@@ -0,0 +1,123 @@
+package org.koitharu.kotatsu.browser.cloudflare
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.webkit.CookieManager
+import android.webkit.WebSettings
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isInvisible
+import androidx.fragment.app.setFragmentResult
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import okhttp3.Headers
+import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.network.CommonHeadersInterceptor
+import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
+import org.koitharu.kotatsu.core.ui.AlertDialogFragment
+import org.koitharu.kotatsu.core.util.ext.withArgs
+import org.koitharu.kotatsu.databinding.FragmentCloudflareBinding
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), CloudFlareCallback {
+
+	private lateinit var url: String
+	private val pendingResult = Bundle(1)
+
+	@Inject
+	lateinit var cookieJar: MutableCookieJar
+
+	private var onBackPressedCallback: WebViewBackPressedCallback? = null
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		url = requireArguments().getString(ARG_URL).orEmpty()
+	}
+
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	) = FragmentCloudflareBinding.inflate(inflater, container, false)
+
+	override fun onViewBindingCreated(binding: FragmentCloudflareBinding, savedInstanceState: Bundle?) {
+		super.onViewBindingCreated(binding, savedInstanceState)
+		with(binding.webView.settings) {
+			javaScriptEnabled = true
+			cacheMode = WebSettings.LOAD_DEFAULT
+			domStorageEnabled = true
+			databaseEnabled = true
+			userAgentString = arguments?.getString(ARG_UA) ?: CommonHeadersInterceptor.userAgentChrome
+		}
+		binding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
+		CookieManager.getInstance().setAcceptThirdPartyCookies(binding.webView, true)
+		if (url.isEmpty()) {
+			dismissAllowingStateLoss()
+		} else {
+			binding.webView.loadUrl(url)
+		}
+	}
+
+	override fun onDestroyView() {
+		requireViewBinding().webView.stopLoading()
+		requireViewBinding().webView.destroy()
+		onBackPressedCallback = null
+		super.onDestroyView()
+	}
+
+	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
+		return super.onBuildDialog(builder).setNegativeButton(android.R.string.cancel, null)
+	}
+
+	override fun onDialogCreated(dialog: AlertDialog) {
+		super.onDialogCreated(dialog)
+		onBackPressedCallback = WebViewBackPressedCallback(requireViewBinding().webView).also {
+			dialog.onBackPressedDispatcher.addCallback(it)
+		}
+	}
+
+	override fun onResume() {
+		super.onResume()
+		requireViewBinding().webView.onResume()
+	}
+
+	override fun onPause() {
+		requireViewBinding().webView.onPause()
+		super.onPause()
+	}
+
+	override fun onDismiss(dialog: DialogInterface) {
+		setFragmentResult(TAG, pendingResult)
+		super.onDismiss(dialog)
+	}
+
+	override fun onPageLoaded() {
+		viewBinding?.progressBar?.isInvisible = true
+	}
+
+	override fun onCheckPassed() {
+		pendingResult.putBoolean(EXTRA_RESULT, true)
+		dismissAllowingStateLoss()
+	}
+
+	override fun onHistoryChanged() {
+		onBackPressedCallback?.onHistoryChanged()
+	}
+
+	companion object {
+
+		const val TAG = "CloudFlareDialog"
+		const val EXTRA_RESULT = "result"
+		private const val ARG_URL = "url"
+		private const val ARG_UA = "ua"
+
+		fun newInstance(url: String, headers: Headers?) = CloudFlareDialog().withArgs(2) {
+			putString(ARG_URL, url)
+			headers?.get(CommonHeaders.USER_AGENT)?.let {
+				putString(ARG_UA, it)
+			}
+		}
+	}
+}

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

@@ -6,7 +6,6 @@ import android.provider.SearchRecentSuggestions
 import android.text.Html
 import androidx.collection.arraySetOf
 import androidx.room.InvalidationTracker
-import androidx.work.WorkManager
 import coil.ComponentRegistry
 import coil.ImageLoader
 import coil.decode.SvgDecoder
@@ -25,29 +24,28 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 import org.koitharu.kotatsu.core.cache.ContentCache
 import org.koitharu.kotatsu.core.cache.MemoryContentCache
 import org.koitharu.kotatsu.core.cache.StubContentCache
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.network.*
-import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.os.ShortcutsUpdater
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
-import org.koitharu.kotatsu.core.util.AcraScreenLogger
 import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
 import org.koitharu.kotatsu.core.util.ext.activityManager
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
+import org.koitharu.kotatsu.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.domain.ListExtraProviderImpl
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
-import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
@@ -67,6 +65,9 @@ interface AppModule {
 	@Binds
 	fun bindImageGetter(coilImageGetter: CoilImageGetter): Html.ImageGetter
 
+	@Binds
+	fun bindListExtraProvider(impl: ListExtraProviderImpl): ListExtraProvider
+
 	companion object {
 
 		@Provides
@@ -91,7 +92,6 @@ interface AppModule {
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
-			coverRestoreInterceptor: CoverRestoreInterceptor,
 		): ImageLoader {
 			val diskCacheFactory = {
 				val rootDir = context.externalCacheDir ?: context.cacheDir
@@ -108,7 +108,6 @@ interface AppModule {
 				.diskCache(diskCacheFactory)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
 				.allowRgb565(context.isLowRamDevice())
-				.eventListener(CaptchaNotifier(context))
 				.components(
 					ComponentRegistry.Builder()
 						.add(SvgDecoder.Factory())
@@ -116,7 +115,6 @@ interface AppModule {
 						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
 						.add(pageFetcherFactory)
 						.add(imageProxyInterceptor)
-						.add(coverRestoreInterceptor)
 						.build(),
 				).build()
 		}
@@ -132,12 +130,12 @@ interface AppModule {
 		@ElementsIntoSet
 		fun provideDatabaseObservers(
 			widgetUpdater: WidgetUpdater,
-			appShortcutManager: AppShortcutManager,
+			shortcutsUpdater: ShortcutsUpdater,
 			backupObserver: BackupObserver,
 			syncController: SyncController,
 		): Set<@JvmSuppressWildcards InvalidationTracker.Observer> = arraySetOf(
 			widgetUpdater,
-			appShortcutManager,
+			shortcutsUpdater,
 			backupObserver,
 			syncController,
 		)
@@ -148,12 +146,10 @@ interface AppModule {
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
 			incognitoModeIndicator: IncognitoModeIndicator,
-			acraScreenLogger: AcraScreenLogger,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
 			incognitoModeIndicator,
-			acraScreenLogger,
 		)
 
 		@Provides
@@ -178,10 +174,5 @@ interface AppModule {
 		fun provideLocalStorageChangesFlow(
 			@LocalStorageChanges flow: MutableSharedFlow<LocalManga?>,
 		): SharedFlow<LocalManga?> = flow.asSharedFlow()
-
-		@Provides
-		fun provideWorkManager(
-			@ApplicationContext context: Context,
-		): WorkManager = WorkManager.getInstance(context)
 	}
 }

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

@@ -13,7 +13,5 @@ class BackupEntry(
 		const val HISTORY = "history"
 		const val CATEGORIES = "categories"
 		const val FAVOURITES = "favourites"
-		const val SETTINGS = "settings"
-		const val BOOKMARKS = "bookmarks"
 	}
-}
+}

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

@@ -5,7 +5,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -13,10 +12,7 @@ import javax.inject.Inject
 
 private const val PAGE_SIZE = 10
 
-class BackupRepository @Inject constructor(
-	private val db: MangaDatabase,
-	private val settings: AppSettings,
-) {
+class BackupRepository @Inject constructor(private val db: MangaDatabase) {
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
@@ -71,36 +67,6 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
-	suspend fun dumpBookmarks(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
-		val all = db.bookmarksDao.findAll()
-		for ((m, b) in all) {
-			val json = JSONObject()
-			val manga = JsonSerializer(m.manga).toJson()
-			json.put("manga", manga)
-			val tags = JSONArray()
-			m.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
-			json.put("tags", tags)
-			val bookmarks = JSONArray()
-			b.forEach { bookmarks.put(JsonSerializer(it).toJson()) }
-			json.put("bookmarks", bookmarks)
-			entry.data.put(json)
-		}
-		return entry
-	}
-
-	fun dumpSettings(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.SETTINGS, JSONArray())
-		val settingsDump = settings.getAllValues().toMutableMap()
-		settingsDump.remove(AppSettings.KEY_APP_PASSWORD)
-		settingsDump.remove(AppSettings.KEY_PROXY_PASSWORD)
-		settingsDump.remove(AppSettings.KEY_PROXY_LOGIN)
-		settingsDump.remove(AppSettings.KEY_INCOGNITO_MODE)
-		val json = JsonSerializer(settingsDump).toJson()
-		entry.data.put(json)
-		return entry
-	}
-
 	fun createIndex(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
 		val json = JSONObject()
@@ -161,36 +127,4 @@ class BackupRepository @Inject constructor(
 		}
 		return result
 	}
-
-	suspend fun restoreBookmarks(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			val mangaJson = item.getJSONObject("manga")
-			val manga = JsonDeserializer(mangaJson).toMangaEntity()
-			val tags = item.getJSONArray("tags").mapJSON {
-				JsonDeserializer(it).toTagEntity()
-			}
-			val bookmarks = item.getJSONArray("bookmarks").mapJSON {
-				JsonDeserializer(it).toBookmarkEntity()
-			}
-			result += runCatchingCancellable {
-				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.bookmarksDao.upsert(bookmarks)
-				}
-			}
-		}
-		return result
-	}
-
-	fun restoreSettings(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.JSONIterator()) {
-			result += runCatchingCancellable {
-				settings.upsertAll(JsonDeserializer(item).toMap())
-			}
-		}
-		return result
-	}
 }

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

@@ -11,8 +11,8 @@ class BackupZipInput(val file: File) : Closeable {
 
 	private val zipFile = ZipFile(file)
 
-	suspend fun getEntry(name: String): BackupEntry? = runInterruptible(Dispatchers.IO) {
-		val entry = zipFile.getEntry(name) ?: return@runInterruptible null
+	suspend fun getEntry(name: String): BackupEntry = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name)
 		val json = zipFile.getInputStream(entry).use {
 			JSONArray(it.bufferedReader().readText())
 		}
@@ -22,4 +22,4 @@ class BackupZipInput(val file: File) : Closeable {
 	override fun close() {
 		zipFile.close()
 	}
-}
+}

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

@@ -11,9 +11,6 @@ class CompositeResult {
 	val failures: List<Throwable>
 		get() = errors.filterNotNull()
 
-	val isEmpty: Boolean
-		get() = errors.isEmpty() && successCount == 0
-
 	val isAllSuccess: Boolean
 		get() = errors.none { it != null }
 
@@ -39,4 +36,4 @@ class CompositeResult {
 		result.errors.addAll(other.errors)
 		return result
 	}
-}
+}

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.backup
 
 import org.json.JSONObject
-import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -35,14 +34,14 @@ class JsonDeserializer(private val json: JSONObject) {
 		largeCoverUrl = json.getStringOrNull("large_cover_url"),
 		state = json.getStringOrNull("state"),
 		author = json.getStringOrNull("author"),
-		source = json.getString("source"),
+		source = json.getString("source")
 	)
 
 	fun toTagEntity() = TagEntity(
 		id = json.getLong("id"),
 		title = json.getString("title"),
 		key = json.getString("key"),
-		source = json.getString("source"),
+		source = json.getString("source")
 	)
 
 	fun toHistoryEntity() = HistoryEntity(
@@ -66,28 +65,4 @@ class JsonDeserializer(private val json: JSONObject) {
 		isVisibleInLibrary = json.getBooleanOrDefault("show_in_lib", true),
 		deletedAt = 0L,
 	)
-
-	fun toBookmarkEntity() = BookmarkEntity(
-		mangaId = json.getLong("manga_id"),
-		pageId = json.getLong("page_id"),
-		chapterId = json.getLong("chapter_id"),
-		page = json.getInt("page"),
-		scroll = json.getInt("scroll"),
-		imageUrl = json.getString("image_url"),
-		createdAt = json.getLong("created_at"),
-		percent = json.getDouble("percent").toFloat(),
-	)
-
-	fun toMap(): Map<String, Any?> {
-		val map = mutableMapOf<String, Any?>()
-		val keys = json.keys()
-
-		while (keys.hasNext()) {
-			val key = keys.next()
-			val value = json.get(key)
-			map[key] = value
-		}
-
-		return map
-	}
 }

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.backup
 
 import org.json.JSONObject
-import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
@@ -16,7 +15,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("category_id", e.categoryId)
 			put("sort_key", e.sortKey)
 			put("created_at", e.createdAt)
-		},
+		}
 	)
 
 	constructor(e: FavouriteCategoryEntity) : this(
@@ -28,7 +27,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("order", e.order)
 			put("track", e.track)
 			put("show_in_lib", e.isVisibleInLibrary)
-		},
+		}
 	)
 
 	constructor(e: HistoryEntity) : this(
@@ -40,7 +39,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
-		},
+		}
 	)
 
 	constructor(e: TagEntity) : this(
@@ -49,7 +48,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("title", e.title)
 			put("key", e.key)
 			put("source", e.source)
-		},
+		}
 	)
 
 	constructor(e: MangaEntity) : this(
@@ -66,25 +65,8 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("state", e.state)
 			put("author", e.author)
 			put("source", e.source)
-		},
-	)
-
-	constructor(e: BookmarkEntity) : this(
-		JSONObject().apply {
-			put("manga_id", e.mangaId)
-			put("page_id", e.pageId)
-			put("chapter_id", e.chapterId)
-			put("page", e.page)
-			put("scroll", e.scroll)
-			put("image_url", e.imageUrl)
-			put("created_at", e.createdAt)
-			put("percent", e.percent)
-		},
-	)
-
-	constructor(m: Map<String, *>) : this(
-		JSONObject(m),
+		}
 	)
 
 	fun toJson(): JSONObject = json
-}
+}

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

@@ -16,10 +16,6 @@ interface ContentCache {
 
 	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
 
-	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>?
-
-	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
-
 	data class Key(
 		val source: MangaSource,
 		val url: String,

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

@@ -16,7 +16,6 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 
 	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(4, 5, TimeUnit.MINUTES)
 	private val pagesCache = ExpiringLruCache<SafeDeferred<List<MangaPage>>>(4, 10, TimeUnit.MINUTES)
-	private val relatedMangaCache = ExpiringLruCache<SafeDeferred<List<Manga>>>(4, 10, TimeUnit.MINUTES)
 
 	override val isCachingEnabled: Boolean = true
 
@@ -36,14 +35,6 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 		pagesCache[ContentCache.Key(source, url)] = pages
 	}
 
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
-		return relatedMangaCache[ContentCache.Key(source, url)]?.awaitOrNull()
-	}
-
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
-		relatedMangaCache[ContentCache.Key(source, url)] = related
-	}
-
 	override fun onConfigurationChanged(newConfig: Configuration) = Unit
 
 	override fun onLowMemory() = Unit
@@ -51,7 +42,6 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 	override fun onTrimMemory(level: Int) {
 		trimCache(detailsCache, level)
 		trimCache(pagesCache, level)
-		trimCache(relatedMangaCache, level)
 	}
 
 	private fun trimCache(cache: ExpiringLruCache<*>, level: Int) {

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

@@ -15,8 +15,4 @@ class StubContentCache : ContentCache {
 	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
 
 	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
-
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
-
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
 }

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

@@ -12,13 +12,11 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
-import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.dao.PreferencesDao
 import org.koitharu.kotatsu.core.db.dao.TagsDao
 import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
-import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.db.migrations.Migration10To11
@@ -27,7 +25,6 @@ import org.koitharu.kotatsu.core.db.migrations.Migration12To13
 import org.koitharu.kotatsu.core.db.migrations.Migration13To14
 import org.koitharu.kotatsu.core.db.migrations.Migration14To15
 import org.koitharu.kotatsu.core.db.migrations.Migration15To16
-import org.koitharu.kotatsu.core.db.migrations.Migration16To17
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
@@ -52,14 +49,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 = 17
+const val DATABASE_VERSION = 16
 
 @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,
+		ScrobblingEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -86,32 +83,30 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val bookmarksDao: BookmarksDao
 
 	abstract val scrobblingDao: ScrobblingDao
-
-	abstract val sourcesDao: MangaSourcesDao
 }
 
-fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
-	Migration1To2(),
-	Migration2To3(),
-	Migration3To4(),
-	Migration4To5(),
-	Migration5To6(),
-	Migration6To7(),
-	Migration7To8(),
-	Migration8To9(),
-	Migration9To10(),
-	Migration10To11(),
-	Migration11To12(),
-	Migration12To13(),
-	Migration13To14(),
-	Migration14To15(),
-	Migration15To16(),
-	Migration16To17(context),
-)
+val databaseMigrations: Array<Migration>
+	get() = arrayOf(
+		Migration1To2(),
+		Migration2To3(),
+		Migration3To4(),
+		Migration4To5(),
+		Migration5To6(),
+		Migration6To7(),
+		Migration7To8(),
+		Migration8To9(),
+		Migration9To10(),
+		Migration10To11(),
+		Migration11To12(),
+		Migration12To13(),
+		Migration13To14(),
+		Migration14To15(),
+		Migration15To16(),
+	)
 
 fun MangaDatabase(context: Context): MangaDatabase = Room
 	.databaseBuilder(context, MangaDatabase::class.java, "kotatsu-db")
-	.addMigrations(*getDatabaseMigrations(context))
+	.addMigrations(*databaseMigrations)
 	.addCallback(DatabasePrePopulateCallback(context.resources))
 	.build()
 

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

@@ -1,12 +1,6 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
-import androidx.room.Upsert
+import androidx.room.*
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaTagsEntity
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags
@@ -19,10 +13,6 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?
 
-	@Transaction
-	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
-	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
-
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
@@ -31,8 +21,8 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND source = :source AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, source: String, limit: Int): List<MangaWithTags>
 
-	@Upsert
-	abstract suspend fun upsert(manga: MangaEntity)
+	@Insert(onConflict = OnConflictStrategy.IGNORE)
+	abstract suspend fun insert(manga: MangaEntity): Long
 
 	@Update(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun update(manga: MangaEntity): Int
@@ -45,13 +35,15 @@ abstract class MangaDao {
 
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
-		upsert(manga)
-		if (tags != null) {
-			clearTagRelation(manga.id)
-			tags.map {
-				MangaTagsEntity(manga.id, it.id)
-			}.forEach {
-				insertTagRelation(it)
+		if (update(manga) <= 0) {
+			insert(manga)
+			if (tags != null) {
+				clearTagRelation(manga.id)
+				tags.map {
+					MangaTagsEntity(manga.id, it.id)
+				}.forEach {
+					insertTagRelation(it)
+				}
 			}
 		}
 	}

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

@@ -1,57 +0,0 @@
-package org.koitharu.kotatsu.core.db.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Upsert
-import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
-
-@Dao
-abstract class MangaSourcesDao {
-
-	@Query("SELECT * FROM sources ORDER BY sort_key")
-	abstract suspend fun findAll(): List<MangaSourceEntity>
-
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
-
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
-
-	@Query("SELECT * FROM sources ORDER BY sort_key")
-	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
-
-	@Query("SELECT IFNULL(MAX(sort_key),0) FROM sources")
-	abstract suspend fun getMaxSortKey(): Int
-
-	@Query("UPDATE sources SET enabled = 0")
-	abstract suspend fun disableAllSources()
-
-	@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
-	abstract suspend fun setSortKey(source: String, sortKey: Int)
-
-	@Insert(onConflict = OnConflictStrategy.IGNORE)
-	@Transaction
-	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
-
-	@Upsert
-	abstract suspend fun upsert(entry: MangaSourceEntity)
-
-	@Transaction
-	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
-		if (updateIsEnabled(source, isEnabled) == 0) {
-			val entity = MangaSourceEntity(
-				source = source,
-				isEnabled = isEnabled,
-				sortKey = getMaxSortKey() + 1,
-			)
-			upsert(entity)
-		}
-	}
-
-	@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
-	protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/TagsDao.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 org.koitharu.kotatsu.core.db.entity.TagEntity
 
 @Dao
@@ -14,7 +12,6 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id
-		WHERE manga_tags.manga_id IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites)
 		GROUP BY tags.title 
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -24,7 +21,7 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE tags.source = :source  
+		WHERE tags.source = :source 
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -34,7 +31,7 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE tags.source = :source AND title LIKE :query 
+		WHERE tags.source = :source AND title LIKE :query
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",
@@ -44,7 +41,7 @@ abstract class TagsDao {
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
-		WHERE title LIKE :query AND manga_tags.manga_id IN (SELECT manga_id FROM history UNION SELECT manga_id FROM favourites)
+		WHERE title LIKE :query
 		GROUP BY tags.title
 		ORDER BY COUNT(manga_id) DESC 
 		LIMIT :limit""",

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

@@ -1,16 +0,0 @@
-package org.koitharu.kotatsu.core.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(
-	tableName = "sources",
-)
-data class MangaSourceEntity(
-	@PrimaryKey(autoGenerate = false)
-	@ColumnInfo(name = "source")
-	val source: String,
-	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
-	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
-)

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

@@ -4,7 +4,7 @@ import androidx.room.Embedded
 import androidx.room.Junction
 import androidx.room.Relation
 
-data class MangaWithTags(
+class MangaWithTags(
 	@Embedded val manga: MangaEntity,
 	@Relation(
 		parentColumn = "manga_id",
@@ -12,4 +12,23 @@ data class MangaWithTags(
 		associateBy = Junction(MangaTagsEntity::class)
 	)
 	val tags: List<TagEntity>,
-)
+) {
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as MangaWithTags
+
+		if (manga != other.manga) return false
+		if (tags != other.tags) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = manga.hashCode()
+		result = 31 * result + tags.hashCode()
+		return result
+	}
+}

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

@@ -9,7 +9,5 @@ class Migration13To14 : Migration(13, 14) {
 		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
 		database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
 		database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
 	}
 }

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

@@ -5,5 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration14To15 : Migration(14, 15) {
 
-	override fun migrate(database: SupportSQLiteDatabase) = Unit
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
+		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
+	}
 }

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

@@ -1,41 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import android.content.Context
-import androidx.preference.PreferenceManager
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class Migration16To17(context: Context) : Migration(16, 17) {
-
-	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
-		database.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
-		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
-		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
-		val sources = MangaSource.entries
-		for (source in sources) {
-			if (source == MangaSource.LOCAL) {
-				continue
-			}
-			val name = source.name
-			val isHidden = name in hiddenSources
-			var sortKey = order.indexOf(name)
-			if (sortKey == -1) {
-				if (isHidden) {
-					sortKey = order.size + source.ordinal
-				} else {
-					continue
-				}
-			}
-			database.execSQL(
-				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
-				arrayOf(name, (!isHidden).toInt(), sortKey),
-			)
-		}
-	}
-
-	private fun Boolean.toInt() = if (this) 1 else 0
-}

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

@@ -2,10 +2,8 @@ package org.koitharu.kotatsu.core.exceptions
 
 import okhttp3.Headers
 import okio.IOException
-import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CloudFlareProtectedException(
 	val url: String,
-	val source: MangaSource?,
 	@Transient val headers: Headers,
 ) : IOException("Protected by CloudFlare")

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import okio.IOException
-import java.util.Date
-
-class TooManyRequestExceptions(
-	val url: String,
-	val retryAt: Date?,
-) : IOException() {
-
-	val retryAfter: Long
-		get() = if (retryAt == null) 0 else (retryAt.time - System.currentTimeMillis()).coerceAtLeast(0)
-}

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

@@ -33,21 +33,11 @@ abstract class ErrorObserver(
 		return resolver != null && ExceptionResolver.canResolve(error)
 	}
 
-	private fun isAlive(): Boolean {
-		return when {
-			fragment != null -> fragment.view != null
-			activity != null -> !activity.isDestroyed
-			else -> true
-		}
-	}
-
 	protected fun resolve(error: Throwable) {
-		if (isAlive()) {
-			lifecycleScope.launch {
-				val isResolved = resolver?.resolve(error) ?: false
-				if (isActive) {
-					onResolved?.accept(isResolved)
-				}
+		lifecycleScope.launch {
+			val isResolved = resolver?.resolve(error) ?: false
+			if (isActive) {
+				onResolved?.accept(isResolved)
 			}
 		}
 	}

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

@@ -6,13 +6,15 @@ import androidx.annotation.StringRes
 import androidx.collection.ArrayMap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Headers
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.BrowserActivity
-import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
+import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
+import org.koitharu.kotatsu.core.util.isSuccess
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -21,26 +23,20 @@ import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
+class ExceptionResolver private constructor(
+	private val activity: FragmentActivity?,
+	private val fragment: Fragment?,
+) : ActivityResultCallback<TaggedActivityResult> {
 
 	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<Pair<String, Headers?>>
+	private lateinit var sourceAuthContract: ActivityResultLauncher<MangaSource>
 
-	constructor(activity: FragmentActivity) {
-		this.activity = activity
-		fragment = null
+	constructor(activity: FragmentActivity) : this(activity = activity, fragment = null) {
 		sourceAuthContract = activity.registerForActivityResult(SourceAuthActivity.Contract(), this)
-		cloudflareContract = activity.registerForActivityResult(CloudFlareActivity.Contract(), this)
 	}
 
-	constructor(fragment: Fragment) {
-		this.fragment = fragment
-		activity = null
+	constructor(fragment: Fragment) : this(activity = null, fragment = fragment) {
 		sourceAuthContract = fragment.registerForActivityResult(SourceAuthActivity.Contract(), this)
-		cloudflareContract = fragment.registerForActivityResult(CloudFlareActivity.Contract(), this)
 	}
 
 	override fun onActivityResult(result: TaggedActivityResult) {
@@ -62,9 +58,22 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 		else -> false
 	}
 
-	private suspend fun resolveCF(url: String, headers: Headers): Boolean = suspendCoroutine { cont ->
-		continuations[CloudFlareActivity.TAG] = cont
-		cloudflareContract.launch(url to headers)
+	private suspend fun resolveCF(url: String, headers: Headers): Boolean {
+		val dialog = CloudFlareDialog.newInstance(url, headers)
+		val fm = getFragmentManager()
+		return suspendCancellableCoroutine { cont ->
+			fm.clearFragmentResult(CloudFlareDialog.TAG)
+			continuations[CloudFlareDialog.TAG] = cont
+			fm.setFragmentResultListener(CloudFlareDialog.TAG, checkNotNull(fragment ?: activity)) { key, result ->
+				continuations.remove(key)?.resume(result.getBoolean(CloudFlareDialog.EXTRA_RESULT))
+			}
+			dialog.show(fm, CloudFlareDialog.TAG)
+			cont.invokeOnCancellation {
+				continuations.remove(CloudFlareDialog.TAG, cont)
+				fm.clearFragmentResultListener(CloudFlareDialog.TAG)
+				dialog.dismissAllowingStateLoss()
+			}
+		}
 	}
 
 	private suspend fun resolveAuthException(source: MangaSource): Boolean = suspendCoroutine { cont ->

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

@@ -1,17 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions.resolve
-
-import android.view.View
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-
-class ToastErrorObserver(
-	host: View,
-	fragment: Fragment?,
-) : ErrorObserver(host, fragment, null, null) {
-
-	override suspend fun emit(value: Throwable) {
-		val toast = Toast.makeText(host.context, value.getDisplayMessage(host.context.resources), Toast.LENGTH_SHORT)
-		toast.show()
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/fs/FileSequence.kt

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

app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt

@@ -1,5 +1,9 @@
 package org.koitharu.kotatsu.core.github
 
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -10,22 +14,28 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.BaseHttpClient
-import org.koitharu.kotatsu.core.os.AppValidator
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.asArrayList
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.parseJsonArray
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
 import javax.inject.Inject
 import javax.inject.Singleton
 
+private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
 private const val CONTENT_TYPE_APK = "application/vnd.android.package-archive"
 
 @Singleton
 class AppUpdateRepository @Inject constructor(
-	private val appValidator: AppValidator,
+	@ApplicationContext private val context: Context,
 	private val settings: AppSettings,
 	@BaseHttpClient private val okHttp: OkHttpClient,
 ) {
@@ -75,7 +85,7 @@ class AppUpdateRepository @Inject constructor(
 	}
 
 	fun isUpdateSupported(): Boolean {
-		return BuildConfig.DEBUG || appValidator.isOriginalApp
+		return BuildConfig.DEBUG || getCertificateSHA1Fingerprint() == CERT_SHA1
 	}
 
 	suspend fun getCurrentVersionChangelog(): String? {
@@ -84,6 +94,22 @@ class AppUpdateRepository @Inject constructor(
 		return available.find { x -> x.versionId == currentVersion }?.description
 	}
 
+	@Suppress("DEPRECATION")
+	@SuppressLint("PackageManagerGetSignatures")
+	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
+		val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
+		val signatures = requireNotNull(packageInfo?.signatures)
+		val cert: ByteArray = signatures.first().toByteArray()
+		val input: InputStream = ByteArrayInputStream(cert)
+		val cf = CertificateFactory.getInstance("X509")
+		val c = cf.generateCertificate(input) as X509Certificate
+		val md: MessageDigest = MessageDigest.getInstance("SHA1")
+		val publicKey: ByteArray = md.digest(c.encoded)
+		return publicKey.byte2HexFormatted()
+	}.onFailure { error ->
+		error.printStackTraceDebug()
+	}.getOrNull()
+
 	private inline fun JSONArray.find(predicate: (JSONObject) -> Boolean): JSONObject? {
 		val size = length()
 		for (i in 0 until size) {

app/src/main/kotlin/org/koitharu/kotatsu/core/github/VersionId.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.github
 
 import java.util.*
 
-data class VersionId(
+class VersionId(
 	val major: Int,
 	val minor: Int,
 	val build: Int,
@@ -30,6 +30,30 @@ data class VersionId(
 		return variantNumber.compareTo(other.variantNumber)
 	}
 
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as VersionId
+
+		if (major != other.major) return false
+		if (minor != other.minor) return false
+		if (build != other.build) return false
+		if (variantType != other.variantType) return false
+		if (variantNumber != other.variantNumber) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = major
+		result = 31 * result + minor
+		result = 31 * result + build
+		result = 31 * result + variantType.hashCode()
+		result = 31 * result + variantNumber
+		return result
+	}
+
 	private fun variantWeight(variantType: String) = when (variantType.lowercase(Locale.ROOT)) {
 		"a", "alpha" -> 1
 		"b", "beta" -> 2

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

@@ -17,7 +17,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.core.util.ext.subdir
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.io.File
 import java.io.FileOutputStream
 import java.text.SimpleDateFormat

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

@@ -2,10 +2,8 @@ package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.Date
+import java.util.*
 
 @Parcelize
 data class FavouriteCategory(
@@ -16,20 +14,4 @@ data class FavouriteCategory(
 	val createdAt: Date,
 	val isTrackingEnabled: Boolean,
 	val isVisibleInLibrary: Boolean,
-) : Parcelable, ListModel {
-
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is FavouriteCategory && id == other.id
-	}
-
-	override fun getChangePayload(previousState: ListModel): Any? {
-		if (previousState !is FavouriteCategory) {
-			return null
-		}
-		return if (isTrackingEnabled != previousState.isTrackingEnabled || isVisibleInLibrary != previousState.isVisibleInLibrary) {
-			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
-		} else {
-			null
-		}
-	}
-}
+) : Parcelable

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.model
 
-import android.net.Uri
 import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.core.util.ext.iterator
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -9,14 +8,10 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 
-@JvmName("mangaIds")
 fun Collection<Manga>.ids() = mapToSet { it.id }
 
 fun Collection<Manga>.distinctById() = distinctBy { it.id }
 
-@JvmName("chaptersIds")
-fun Collection<MangaChapter>.ids() = mapToSet { it.id }
-
 fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size
@@ -48,10 +43,10 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 	if (groups.size == 1) {
 		return groups.keys.first()
 	}
+	val candidates = HashMap<String?, List<MangaChapter>>(groups.size)
 	for (locale in LocaleListCompat.getAdjustedDefault()) {
 		val displayLanguage = locale.getDisplayLanguage(locale)
 		val displayName = locale.getDisplayName(locale)
-		val candidates = HashMap<String?, List<MangaChapter>>(3)
 		for (branch in groups.keys) {
 			if (branch != null && (
 					branch.contains(displayLanguage, ignoreCase = true) ||
@@ -61,19 +56,9 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 				candidates[branch] = groups[branch] ?: continue
 			}
 		}
-		if (candidates.isNotEmpty()) {
-			return candidates.maxBy { it.value.size }.key
-		}
 	}
-	return groups.maxByOrNull { it.value.size }?.key
+	return candidates.ifEmpty { groups }.maxByOrNull { it.value.size }?.key
 }
 
 val Manga.isLocal: Boolean
 	get() = source == MangaSource.LOCAL
-
-val Manga.appUrl: Uri
-	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
-		.appendQueryParameter("source", source.name)
-		.appendQueryParameter("name", title)
-		.appendQueryParameter("url", url)
-		.build()

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

@@ -10,7 +10,7 @@ fun MangaSource.getLocaleTitle(): String? {
 }
 
 fun MangaSource(name: String): MangaSource {
-	MangaSource.entries.forEach {
+	MangaSource.values().forEach {
 		if (it.name == name) return it
 	}
 	return MangaSource.DUMMY

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

@@ -0,0 +1,98 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import androidx.core.os.ParcelCompat
+import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
+import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
+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.model.MangaTag
+
+fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
+	out.writeLong(id)
+	out.writeString(title)
+	out.writeString(altTitle)
+	out.writeString(url)
+	out.writeString(publicUrl)
+	out.writeFloat(rating)
+	ParcelCompat.writeBoolean(out, isNsfw)
+	out.writeString(coverUrl)
+	out.writeString(largeCoverUrl)
+	out.writeString(description)
+	out.writeParcelable(ParcelableMangaTags(tags), flags)
+	out.writeSerializable(state)
+	out.writeString(author)
+	if (withChapters) {
+		out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
+	} else {
+		out.writeString(null)
+	}
+	out.writeSerializable(source)
+}
+
+fun Parcel.readManga() = Manga(
+	id = readLong(),
+	title = requireNotNull(readString()),
+	altTitle = readString(),
+	url = requireNotNull(readString()),
+	publicUrl = requireNotNull(readString()),
+	rating = readFloat(),
+	isNsfw = ParcelCompat.readBoolean(this),
+	coverUrl = requireNotNull(readString()),
+	largeCoverUrl = readString(),
+	description = readString(),
+	tags = requireNotNull(readParcelableCompat<ParcelableMangaTags>()).tags,
+	state = readSerializableCompat(),
+	author = readString(),
+	chapters = readParcelableCompat<ParcelableMangaChapters>()?.chapters,
+	source = checkNotNull(readSerializableCompat()),
+)
+
+fun MangaPage.writeToParcel(out: Parcel) {
+	out.writeLong(id)
+	out.writeString(url)
+	out.writeString(preview)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaPage() = MangaPage(
+	id = readLong(),
+	url = requireNotNull(readString()),
+	preview = readString(),
+	source = checkNotNull(readSerializableCompat()),
+)
+
+fun MangaChapter.writeToParcel(out: Parcel) {
+	out.writeLong(id)
+	out.writeString(name)
+	out.writeInt(number)
+	out.writeString(url)
+	out.writeString(scanlator)
+	out.writeLong(uploadDate)
+	out.writeString(branch)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaChapter() = MangaChapter(
+	id = readLong(),
+	name = requireNotNull(readString()),
+	number = readInt(),
+	url = requireNotNull(readString()),
+	scanlator = readString(),
+	uploadDate = readLong(),
+	branch = readString(),
+	source = checkNotNull(readSerializableCompat()),
+)
+
+fun MangaTag.writeToParcel(out: Parcel) {
+	out.writeString(title)
+	out.writeString(key)
+	out.writeSerializable(source)
+}
+
+fun Parcel.readMangaTag() = MangaTag(
+	title = requireNotNull(readString()),
+	key = requireNotNull(readString()),
+	source = checkNotNull(readSerializableCompat()),
+)

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

@@ -2,83 +2,52 @@ package org.koitharu.kotatsu.core.model.parcelable
 
 import android.os.Parcel
 import android.os.Parcelable
-import androidx.core.os.ParcelCompat
-import kotlinx.parcelize.Parceler
-import kotlinx.parcelize.Parcelize
-import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
-import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.Manga
 
 // Limits to avoid TransactionTooLargeException
 private const val MAX_SAFE_SIZE = 1024 * 100 // Assume that 100 kb is safe parcel size
 private const val MAX_SAFE_CHAPTERS_COUNT = 24 // this is 100% safe
 
-@Parcelize
-data class ParcelableManga(
+class ParcelableManga(
 	val manga: Manga,
 	private val withChapters: Boolean,
 ) : Parcelable {
-	companion object : Parceler<ParcelableManga> {
-		private fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
-			out.writeLong(id)
-			out.writeString(title)
-			out.writeString(altTitle)
-			out.writeString(url)
-			out.writeString(publicUrl)
-			out.writeFloat(rating)
-			ParcelCompat.writeBoolean(out, isNsfw)
-			out.writeString(coverUrl)
-			out.writeString(largeCoverUrl)
-			out.writeString(description)
-			out.writeParcelable(ParcelableMangaTags(tags), flags)
-			out.writeSerializable(state)
-			out.writeString(author)
-			val parcelableChapters = if (withChapters) null else chapters?.let(::ParcelableMangaChapters)
-			out.writeParcelable(parcelableChapters, flags)
-			out.writeSerializable(source)
+
+	constructor(parcel: Parcel) : this(parcel.readManga(), true)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		val chapters = manga.chapters
+		if (!withChapters || chapters == null) {
+			manga.writeToParcel(parcel, flags, withChapters = false)
+			return
+		}
+		if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
+			// fast path
+			manga.writeToParcel(parcel, flags, withChapters = true)
+			return
+		}
+		val tempParcel = Parcel.obtain()
+		manga.writeToParcel(tempParcel, flags, withChapters = true)
+		val size = tempParcel.dataSize()
+		if (size < MAX_SAFE_SIZE) {
+			parcel.appendFrom(tempParcel, 0, size)
+		} else {
+			manga.writeToParcel(parcel, flags, withChapters = false)
+		}
+		tempParcel.recycle()
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableManga> {
+		override fun createFromParcel(parcel: Parcel): ParcelableManga {
+			return ParcelableManga(parcel)
 		}
 
-		override fun ParcelableManga.write(parcel: Parcel, flags: Int) {
-			val chapters = manga.chapters
-			if (!withChapters || chapters == null) {
-				manga.writeToParcel(parcel, flags, withChapters = false)
-				return
-			}
-			if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
-				// fast path
-				manga.writeToParcel(parcel, flags, withChapters = true)
-				return
-			}
-			val tempParcel = Parcel.obtain()
-			manga.writeToParcel(tempParcel, flags, withChapters = true)
-			val size = tempParcel.dataSize()
-			if (size < MAX_SAFE_SIZE) {
-				parcel.appendFrom(tempParcel, 0, size)
-			} else {
-				manga.writeToParcel(parcel, flags, withChapters = false)
-			}
-			tempParcel.recycle()
+		override fun newArray(size: Int): Array<ParcelableManga?> {
+			return arrayOfNulls(size)
 		}
-
-		override fun create(parcel: Parcel) = ParcelableManga(
-			Manga(
-				id = parcel.readLong(),
-				title = requireNotNull(parcel.readString()),
-				altTitle = parcel.readString(),
-				url = requireNotNull(parcel.readString()),
-				publicUrl = requireNotNull(parcel.readString()),
-				rating = parcel.readFloat(),
-				isNsfw = ParcelCompat.readBoolean(parcel),
-				coverUrl = requireNotNull(parcel.readString()),
-				largeCoverUrl = parcel.readString(),
-				description = parcel.readString(),
-				tags = requireNotNull(parcel.readParcelableCompat<ParcelableMangaTags>()).tags,
-				state = parcel.readSerializableCompat(),
-				author = parcel.readString(),
-				chapters = parcel.readParcelableCompat<ParcelableMangaChapters>()?.chapters,
-				source = requireNotNull(parcel.readSerializableCompat()),
-			),
-			withChapters = true
-		)
 	}
 }

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

@@ -2,36 +2,34 @@ 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.readSerializableCompat
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
-object MangaChapterParceler : Parceler<MangaChapter> {
-	override fun create(parcel: Parcel) = MangaChapter(
-		id = parcel.readLong(),
-		name = requireNotNull(parcel.readString()),
-		number = parcel.readInt(),
-		url = requireNotNull(parcel.readString()),
-		scanlator = parcel.readString(),
-		uploadDate = parcel.readLong(),
-		branch = parcel.readString(),
-		source = requireNotNull(parcel.readSerializableCompat()),
+class ParcelableMangaChapters(
+	val chapters: List<MangaChapter>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		List(parcel.readInt()) { parcel.readMangaChapter() }
 	)
 
-	override fun MangaChapter.write(parcel: Parcel, flags: Int) {
-		parcel.writeLong(id)
-		parcel.writeString(name)
-		parcel.writeInt(number)
-		parcel.writeString(url)
-		parcel.writeString(scanlator)
-		parcel.writeLong(uploadDate)
-		parcel.writeString(branch)
-		parcel.writeSerializable(source)
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(chapters.size)
+		for (chapter in chapters) {
+			chapter.writeToParcel(parcel)
+		}
 	}
-}
 
-@Parcelize
-@TypeParceler<MangaChapter, MangaChapterParceler>
-data class ParcelableMangaChapters(val chapters: List<MangaChapter>) : Parcelable
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaChapters> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
+			return ParcelableMangaChapters(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaChapters?> {
+			return arrayOfNulls(size)
+		}
+	}
+}

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

@@ -1,29 +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.readSerializableCompat
-import org.koitharu.kotatsu.parsers.model.MangaPage
-
-object MangaPageParceler : Parceler<MangaPage> {
-	override fun create(parcel: Parcel) = MangaPage(
-		id = parcel.readLong(),
-		url = requireNotNull(parcel.readString()),
-		preview = parcel.readString(),
-		source = requireNotNull(parcel.readSerializableCompat()),
-	)
-
-	override fun MangaPage.write(parcel: Parcel, flags: Int) {
-		parcel.writeLong(id)
-		parcel.writeString(url)
-		parcel.writeString(preview)
-		parcel.writeSerializable(source)
-	}
-}
-
-@Parcelize
-@TypeParceler<MangaPage, MangaPageParceler>
-class ParcelableMangaPage(val page: MangaPage) : Parcelable

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

@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.core.model.parcelable
+
+import android.os.Parcel
+import android.os.Parcelable
+import org.koitharu.kotatsu.parsers.model.MangaPage
+
+class ParcelableMangaPages(
+	val pages: List<MangaPage>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		List(parcel.readInt()) { parcel.readMangaPage() }
+	)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(pages.size)
+		for (page in pages) {
+			page.writeToParcel(parcel)
+		}
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaPages> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
+			return ParcelableMangaPages(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaPages?> {
+			return arrayOfNulls(size)
+		}
+	}
+}

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

@@ -2,26 +2,35 @@ 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.readSerializableCompat
+import org.koitharu.kotatsu.core.util.ext.Set
 import org.koitharu.kotatsu.parsers.model.MangaTag
 
-object MangaTagParceler : Parceler<MangaTag> {
-	override fun create(parcel: Parcel) = MangaTag(
-		title = requireNotNull(parcel.readString()),
-		key = requireNotNull(parcel.readString()),
-		source = requireNotNull(parcel.readSerializableCompat()),
+class ParcelableMangaTags(
+	val tags: Set<MangaTag>,
+) : Parcelable {
+
+	constructor(parcel: Parcel) : this(
+		Set(parcel.readInt()) { parcel.readMangaTag() },
 	)
 
-	override fun MangaTag.write(parcel: Parcel, flags: Int) {
-		parcel.writeString(title)
-		parcel.writeString(key)
-		parcel.writeSerializable(source)
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.writeInt(tags.size)
+		for (tag in tags) {
+			tag.writeToParcel(parcel)
+		}
+	}
+
+	override fun describeContents(): Int {
+		return 0
+	}
+
+	companion object CREATOR : Parcelable.Creator<ParcelableMangaTags> {
+		override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
+			return ParcelableMangaTags(parcel)
+		}
+
+		override fun newArray(size: Int): Array<ParcelableMangaTags?> {
+			return arrayOfNulls(size)
+		}
 	}
 }
-
-@Parcelize
-@TypeParceler<MangaTag, MangaTagParceler>
-data class ParcelableMangaTags(val tags: Set<MangaTag>) : Parcelable

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

@@ -1,7 +1,7 @@
 package org.koitharu.kotatsu.core.network
 
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Proxy

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

@@ -3,26 +3,23 @@ package org.koitharu.kotatsu.core.network
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
-import org.jsoup.Jsoup
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.net.HttpURLConnection.HTTP_FORBIDDEN
 import java.net.HttpURLConnection.HTTP_UNAVAILABLE
 
+private const val HEADER_SERVER = "Server"
+private const val SERVER_CLOUDFLARE = "cloudflare"
+
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
-		val response = chain.proceed(chain.request())
+		val request = chain.request()
+		val response = chain.proceed(request)
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
-			val content = response.body?.source()?.peek()?.use {
-				Jsoup.parse(it.inputStream(), Charsets.UTF_8.name(), response.request.url.toString())
-			} ?: return response
-			if (content.getElementById("challenge-error-title") != null) {
-				val request = response.request
+			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				response.closeQuietly()
 				throw CloudFlareProtectedException(
-					url = request.url.toString(),
-					source = request.tag(MangaSource::class.java),
+					url = response.request.url.toString(),
 					headers = request.headers,
 				)
 			}

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

@@ -15,7 +15,6 @@ object CommonHeaders {
 	const val AUTHORIZATION = "Authorization"
 	const val CACHE_CONTROL = "Cache-Control"
 	const val PROXY_AUTHORIZATION = "Proxy-Authorization"
-	const val RETRY_AFTER = "Retry-After"
 
 	val CACHE_CONTROL_NO_STORE: CacheControl
 		get() = CacheControl.Builder().noStore().build()

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.network
 
+import android.os.Build
 import android.util.Log
 import dagger.Lazy
 import okhttp3.Headers
@@ -9,11 +10,11 @@ import okhttp3.Response
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.parser.MangaRepository
 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.network.UserAgents
 import org.koitharu.kotatsu.parsers.util.mergeWith
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.net.IDN
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -38,7 +39,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.mergeWith(it, replaceExisting = false)
 		}
 		if (headersBuilder[CommonHeaders.USER_AGENT] == null) {
-			headersBuilder[CommonHeaders.USER_AGENT] = UserAgents.CHROME_MOBILE
+			headersBuilder[CommonHeaders.USER_AGENT] = userAgentFallback
 		}
 		if (headersBuilder[CommonHeaders.REFERER] == null && repository != null) {
 			val idn = IDN.toASCII(repository.domain)
@@ -61,4 +62,26 @@ class CommonHeadersInterceptor @Inject constructor(
 
 		override fun request(): Request = request
 	}
+
+	companion object {
+
+		val userAgentFallback
+			get() = "Kotatsu/%s (Android %s; %s; %s %s; %s)".format(
+				BuildConfig.VERSION_NAME,
+				Build.VERSION.RELEASE,
+				Build.MODEL,
+				Build.BRAND,
+				Build.DEVICE,
+				Locale.getDefault().language,
+			)
+
+		val userAgentChrome
+			get() = (
+				"Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) " +
+					"Chrome/100.0.4896.127 Mobile Safari/537.36"
+				).format(
+					Build.VERSION.RELEASE,
+					Build.MODEL,
+				)
+	}
 }

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

@@ -6,7 +6,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.dnsoverhttps.DnsOverHttps
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.net.InetAddress
 import java.net.UnknownHostException
 

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

@@ -67,7 +67,6 @@ interface NetworkModule {
 			cache(cache)
 			addInterceptor(GZipInterceptor())
 			addInterceptor(CloudFlareInterceptor())
-			addInterceptor(RateLimitInterceptor())
 			if (BuildConfig.DEBUG) {
 				addInterceptor(CurlLoggingInterceptor())
 			}

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

@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import okhttp3.Interceptor
-import okhttp3.Response
-import okhttp3.internal.closeQuietly
-import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.concurrent.TimeUnit
-
-class RateLimitInterceptor : Interceptor {
-
-	private val dateFormat = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ZZZ", Locale.ENGLISH)
-
-	override fun intercept(chain: Interceptor.Chain): Response {
-		val response = chain.proceed(chain.request())
-		if (response.code == 429) {
-			val retryDate = response.header(CommonHeaders.RETRY_AFTER)?.parseRetryDate()
-			val request = response.request
-			response.closeQuietly()
-			throw TooManyRequestExceptions(
-				url = request.url.toString(),
-				retryAt = retryDate,
-			)
-		}
-		return response
-	}
-
-	private fun String.parseRetryDate(): Date? {
-		toIntOrNull()?.let {
-			return Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(it.toLong()))
-		}
-		return dateFormat.parse(this)
-	}
-}

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.core.network
 
 import android.annotation.SuppressLint
 import okhttp3.OkHttpClient
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
 import javax.net.ssl.SSLContext

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

@@ -2,10 +2,8 @@ package org.koitharu.kotatsu.core.network.cookies
 
 import android.webkit.CookieManager
 import androidx.annotation.WorkerThread
-import androidx.core.util.Predicate
 import okhttp3.Cookie
 import okhttp3.HttpUrl
-import org.koitharu.kotatsu.core.util.ext.newBuilder
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -32,24 +30,6 @@ class AndroidCookieJar : MutableCookieJar {
 		}
 	}
 
-	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
-		val cookies = loadForRequest(url)
-		if (cookies.isEmpty()) {
-			return
-		}
-		val urlString = url.toString()
-		for (c in cookies) {
-			if (predicate != null && !predicate.test(c)) {
-				continue
-			}
-			val nc = c.newBuilder()
-				.expiresAt(System.currentTimeMillis() - 100000)
-				.build()
-			cookieManager.setCookie(urlString, nc.toString())
-		}
-		check(loadForRequest(url).isEmpty())
-	}
-
 	override suspend fun clear() = suspendCoroutine<Boolean> { continuation ->
 		cookieManager.removeAllCookies(continuation::resume)
 	}

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

@@ -8,7 +8,7 @@ import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 
 
-data class CookieWrapper(
+class CookieWrapper(
 	val cookie: Cookie,
 ) {
 
@@ -66,4 +66,19 @@ data class CookieWrapper(
 	fun key(): String {
 		return (if (cookie.secure) "https" else "http") + "://" + cookie.domain + cookie.path + "|" + cookie.name
 	}
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as CookieWrapper
+
+		if (cookie != other.cookie) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		return cookie.hashCode()
+	}
 }

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.network.cookies
 
 import androidx.annotation.WorkerThread
-import androidx.core.util.Predicate
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
@@ -14,8 +13,5 @@ interface MutableCookieJar : CookieJar {
 	@WorkerThread
 	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>)
 
-	@WorkerThread
-	fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?)
-
 	suspend fun clear(): Boolean
 }

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

@@ -4,12 +4,11 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import androidx.collection.ArrayMap
 import androidx.core.content.edit
-import androidx.core.util.Predicate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.Cookie
 import okhttp3.HttpUrl
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 
 private const val PREFS_NAME = "cookies"
 
@@ -22,7 +21,6 @@ class PreferencesCookieJar(
 	private var isLoaded = false
 
 	@WorkerThread
-	@Synchronized
 	override fun loadForRequest(url: HttpUrl): List<Cookie> {
 		loadPersistent()
 		val expired = HashSet<String>()
@@ -42,7 +40,6 @@ class PreferencesCookieJar(
 	}
 
 	@WorkerThread
-	@Synchronized
 	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
 		val wrapped = cookies.map { CookieWrapper(it) }
 		prefs.edit(commit = true) {
@@ -56,24 +53,6 @@ class PreferencesCookieJar(
 		}
 	}
 
-	@Synchronized
-	@WorkerThread
-	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
-		loadPersistent()
-		val toRemove = HashSet<String>()
-		for ((key, cookie) in cache) {
-			if (cookie.isExpired() || cookie.cookie.matches(url)) {
-				if (predicate == null || predicate.test(cookie.cookie)) {
-					toRemove += key
-				}
-			}
-		}
-		if (toRemove.isNotEmpty()) {
-			cache.removeAll(toRemove)
-			removePersistent(toRemove)
-		}
-	}
-
 	override suspend fun clear(): Boolean {
 		cache.clear()
 		withContext(Dispatchers.IO) {

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

@@ -1,46 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import dagger.hilt.android.qualifiers.ApplicationContext
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
-import java.io.ByteArrayInputStream
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AppValidator @Inject constructor(
-	@ApplicationContext private val context: Context,
-) {
-
-	val isOriginalApp by lazy {
-		getCertificateSHA1Fingerprint() == CERT_SHA1
-	}
-
-	@Suppress("DEPRECATION")
-	@SuppressLint("PackageManagerGetSignatures")
-	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
-		val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
-		val signatures = requireNotNull(packageInfo?.signatures)
-		val cert: ByteArray = signatures.first().toByteArray()
-		val input: InputStream = ByteArrayInputStream(cert)
-		val cf = CertificateFactory.getInstance("X509")
-		val c = cf.generateCertificate(input) as X509Certificate
-		val md: MessageDigest = MessageDigest.getInstance("SHA1")
-		val publicKey: ByteArray = md.digest(c.encoded)
-		return publicKey.byte2HexFormatted()
-	}.onFailure { error ->
-		error.printStackTraceDebug()
-	}.getOrNull()
-
-	private companion object {
-
-		private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
-	}
-}

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

@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import android.content.Intent
-import android.os.Build
-import android.provider.Settings
-
-@Suppress("FunctionName")
-fun NetworkManageIntent(): Intent {
-	val action = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		Settings.Panel.ACTION_INTERNET_CONNECTIVITY
-	} else {
-		Settings.ACTION_WIRELESS_SETTINGS
-	}
-	return Intent(action)
-}

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

@@ -1,9 +1,12 @@
 package org.koitharu.kotatsu.core.os
 
+import android.app.ActivityManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.ShortcutManager
 import android.os.Build
+import android.util.Size
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -12,8 +15,8 @@ import androidx.core.graphics.drawable.toBitmap
 import androidx.room.InvalidationTracker
 import coil.ImageLoader
 import coil.request.ImageRequest
+import coil.size.Precision
 import coil.size.Scale
-import coil.size.Size
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -22,20 +25,18 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.image.ThumbnailTransformation
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
-import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AppShortcutManager @Inject constructor(
+class ShortcutsUpdater @Inject constructor(
 	@ApplicationContext private val context: Context,
 	private val coil: ImageLoader,
 	private val historyRepository: HistoryRepository,
@@ -43,9 +44,7 @@ class AppShortcutManager @Inject constructor(
 	private val settings: AppSettings,
 ) : InvalidationTracker.Observer(TABLE_HISTORY), SharedPreferences.OnSharedPreferenceChangeListener {
 
-	private val iconSize by lazy {
-		Size(ShortcutManagerCompat.getIconMaxWidth(context), ShortcutManagerCompat.getIconMaxHeight(context))
-	}
+	private val iconSize by lazy { getIconSize(context) }
 	private var shortcutsUpdateJob: Job? = null
 
 	init {
@@ -53,7 +52,7 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	override fun onInvalidated(tables: Set<String>) {
-		if (!settings.isDynamicShortcutsEnabled) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1 || !settings.isDynamicShortcutsEnabled) {
 			return
 		}
 		val prevJob = shortcutsUpdateJob
@@ -64,7 +63,7 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-		if (key == AppSettings.KEY_SHORTCUTS) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && key == AppSettings.KEY_SHORTCUTS) {
 			if (settings.isDynamicShortcutsEnabled) {
 				onInvalidated(emptySet())
 			} else {
@@ -74,7 +73,11 @@ class AppShortcutManager @Inject constructor(
 	}
 
 	suspend fun requestPinShortcut(manga: Manga): Boolean {
-		return ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(manga), null)
+		return ShortcutManagerCompat.requestPinShortcut(
+			context,
+			buildShortcutInfo(manga).build(),
+			null,
+		)
 	}
 
 	@VisibleForTesting
@@ -82,36 +85,51 @@ class AppShortcutManager @Inject constructor(
 		return shortcutsUpdateJob?.join() != null
 	}
 
-	fun notifyMangaOpened(mangaId: Long) {
-		ShortcutManagerCompat.reportShortcutUsed(context, mangaId.toString())
+	fun isDynamicShortcutsAvailable(): Boolean {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+			return false
+		}
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		return manager.maxShortcutCountPerActivity > 0
 	}
 
+	fun notifyMangaOpened(mangaId: Long) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+			return
+		}
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		manager.reportShortcutUsed(mangaId.toString())
+	}
+
+	@RequiresApi(Build.VERSION_CODES.N_MR1)
 	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
-		val maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context).coerceAtLeast(5)
-		val shortcuts = historyRepository.getList(0, maxShortcuts)
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
 			.filter { x -> x.title.isNotEmpty() }
-			.map { buildShortcutInfo(it) }
-		ShortcutManagerCompat.setDynamicShortcuts(context, shortcuts)
+			.map { buildShortcutInfo(it).build().toShortcutInfo() }
+		manager.dynamicShortcuts = shortcuts
 	}.onFailure {
 		it.printStackTraceDebug()
 	}
 
+	@RequiresApi(Build.VERSION_CODES.N_MR1)
 	private fun clearShortcuts() {
+		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		try {
-			ShortcutManagerCompat.removeAllDynamicShortcuts(context)
+			manager.removeAllDynamicShortcuts()
 		} catch (_: IllegalStateException) {
 		}
 	}
 
-	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat {
+	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
 		val icon = runCatchingCancellable {
 			coil.execute(
 				ImageRequest.Builder(context)
 					.data(manga.coverUrl)
-					.size(iconSize)
-					.source(manga.source)
+					.size(iconSize.width, iconSize.height)
+					.tag(manga.source)
+					.precision(Precision.EXACT)
 					.scale(Scale.FILL)
-					.transformations(ThumbnailTransformation())
 					.build(),
 			).getDrawableOrThrow().toBitmap()
 		}.fold(
@@ -123,17 +141,21 @@ class AppShortcutManager @Inject constructor(
 			.setShortLabel(manga.title)
 			.setLongLabel(manga.title)
 			.setIcon(icon)
-			.setLongLived(true)
 			.setIntent(
-				ReaderActivity.IntentBuilder(context)
-					.mangaId(manga.id)
-					.build(),
+				ReaderActivity.newIntent(context, manga.id)
+					.setAction(ReaderActivity.ACTION_MANGA_READ),
 			)
-			.build()
 	}
 
-	fun isDynamicShortcutsAvailable(): Boolean {
-		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
-			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
+	private fun getIconSize(context: Context): Size {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+			(context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager).let {
+				Size(it.iconMaxWidth, it.iconMaxHeight)
+			}
+		} else {
+			(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).launcherLargeIconSize.let {
+				Size(it, it)
+			}
+		}
 	}
 }

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

@@ -17,12 +17,10 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 import javax.inject.Inject
-import javax.inject.Provider
 
 @Reusable
 class MangaDataRepository @Inject constructor(
 	private val db: MangaDatabase,
-	private val resolverProvider: Provider<MangaLinkResolver>,
 ) {
 
 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
@@ -65,15 +63,10 @@ class MangaDataRepository @Inject constructor(
 		return db.mangaDao.find(mangaId)?.toManga()
 	}
 
-	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
-		return db.mangaDao.findByPublicUrl(publicUrl)?.toManga()
-	}
-
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
 		intent.mangaId != 0L -> findMangaById(intent.mangaId)
-		intent.uri != null -> resolverProvider.get().resolve(intent.uri)
-		else -> null
+		else -> null // TODO resolve uri
 	}
 
 	suspend fun storeManga(manga: Manga) {

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

@@ -1,119 +0,0 @@
-package org.koitharu.kotatsu.core.parser
-
-import android.net.Uri
-import dagger.Reusable
-import org.koitharu.kotatsu.core.model.MangaSource
-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.MangaSource
-import org.koitharu.kotatsu.parsers.util.almostEquals
-import org.koitharu.kotatsu.parsers.util.levenshteinDistance
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.parsers.util.toRelativeUrl
-import javax.inject.Inject
-
-@Reusable
-class MangaLinkResolver @Inject constructor(
-	private val repositoryFactory: MangaRepository.Factory,
-	private val sourcesRepository: MangaSourcesRepository,
-	private val dataRepository: MangaDataRepository,
-) {
-
-	suspend fun resolve(uri: Uri): Manga {
-		return if (uri.host == "kotatsu.app") {
-			resolveAppLink(uri)
-		} else {
-			resolveExternalLink(uri)
-		} ?: throw NotFoundException("Manga not found", uri.toString())
-	}
-
-	suspend fun resolveAppLink(uri: Uri): Manga? {
-		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
-		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
-		val source = MangaSource(sourceName)
-		require(source != MangaSource.DUMMY) { "Manga source $sourceName is not supported" }
-		val repo = repositoryFactory.create(source)
-		return repo.findExact(
-			url = uri.getQueryParameter("url"),
-			title = uri.getQueryParameter("name"),
-		)
-	}
-
-	suspend fun resolveExternalLink(uri: Uri): Manga? {
-		dataRepository.findMangaByPublicUrl(uri.toString())?.let {
-			return it
-		}
-		val host = uri.host ?: return null
-		val repo = sourcesRepository.allMangaSources.asSequence()
-			.map { source ->
-				repositoryFactory.create(source) as RemoteMangaRepository
-			}.find { repo ->
-				host in repo.domains
-			} ?: return null
-		return repo.findExact(uri.toString().toRelativeUrl(host), null)
-	}
-
-	private suspend fun MangaRepository.findExact(url: String?, title: String?): Manga? {
-		if (!title.isNullOrEmpty()) {
-			val list = getList(0, title)
-			if (url != null) {
-				list.find { it.url == url }?.let {
-					return it
-				}
-			}
-			list.minByOrNull { it.title.levenshteinDistance(title) }
-				?.takeIf { it.title.almostEquals(title, 0.2f) }
-				?.let { return it }
-		}
-		val seed = getDetailsNoCache(
-			getSeedManga(source, url ?: return null, title),
-		)
-		return runCatchingCancellable {
-			val seedTitle = seed.title.ifEmpty {
-				seed.altTitle
-			}.ifNullOrEmpty {
-				seed.author
-			} ?: return@runCatchingCancellable null
-			val seedList = getList(0, seedTitle)
-			seedList.first { x -> x.url == url }
-		}.getOrThrow()
-	}
-
-	private suspend fun MangaRepository.getDetailsNoCache(manga: Manga): Manga {
-		return if (this is RemoteMangaRepository) {
-			getDetails(manga, withCache = false)
-		} else {
-			getDetails(manga)
-		}
-	}
-
-	private fun getSeedManga(source: MangaSource, url: String, title: String?) = Manga(
-		id = run {
-			var h = 1125899906842597L
-			source.name.forEach { c ->
-				h = 31 * h + c.code
-			}
-			url.forEach { c ->
-				h = 31 * h + c.code
-			}
-			h
-		},
-		title = title.orEmpty(),
-		altTitle = null,
-		url = url,
-		publicUrl = "",
-		rating = 0.0f,
-		isNsfw = source.contentType == ContentType.HENTAI,
-		coverUrl = "",
-		tags = emptySet(),
-		state = null,
-		author = null,
-		largeCoverUrl = null,
-		description = null,
-		chapters = null,
-		source = source,
-	)
-}

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

@@ -3,11 +3,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.MangaSource
+import org.koitharu.kotatsu.parsers.newParser
 
 fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
 	return if (source == MangaSource.DUMMY) {
 		DummyParser(loaderContext)
 	} else {
-		loaderContext.newParserInstance(source)
+		source.newParser(loaderContext)
 	}
-}
+}

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

@@ -36,8 +36,6 @@ interface MangaRepository {
 
 	suspend fun getTags(): Set<MangaTag>
 
-	suspend fun getRelated(seed: Manga): List<Manga>
-
 	@Singleton
 	class Factory @Inject constructor(
 		private val localMangaRepository: LocalMangaRepository,

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

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.content.Context
+import androidx.annotation.ColorRes
+import dagger.Reusable
+import dagger.hilt.android.qualifiers.ApplicationContext
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import javax.inject.Inject
+
+@Reusable
+class MangaTagHighlighter @Inject constructor(
+	@ApplicationContext context: Context,
+) {
+
+	private val dict by lazy {
+		context.resources.openRawResource(R.raw.tags_redlist).use {
+			val set = HashSet<String>()
+			it.bufferedReader().forEachLine { x ->
+				val line = x.trim()
+				if (line.isNotEmpty()) {
+					set.add(line)
+				}
+			}
+			set
+		}
+	}
+
+	@ColorRes
+	fun getTint(tag: MangaTag): Int {
+		return if (tag.title.lowercase() in dict) {
+			R.color.warning
+		} else {
+			0
+		}
+	}
+}

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

@@ -51,10 +51,7 @@ class RemoteMangaRepository(
 			getConfig()[parser.configKeyDomain] = value
 		}
 
-	val domains: Array<out String>
-		get() = parser.configKeyDomain.presetValues
-
-	val headers: Headers
+	val headers: Headers?
 		get() = parser.headers
 
 	override fun intercept(chain: Interceptor.Chain): Response {
@@ -73,7 +70,14 @@ class RemoteMangaRepository(
 		return parser.getList(offset, tags, sortOrder)
 	}
 
-	override suspend fun getDetails(manga: Manga): Manga = getDetails(manga, withCache = true)
+	override suspend fun getDetails(manga: Manga): Manga {
+		cache.getDetails(source, manga.url)?.let { return it }
+		val details = asyncSafe {
+			parser.getDetails(manga)
+		}
+		cache.putDetails(source, manga.url, details)
+		return details.await()
+	}
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		cache.getPages(source, chapter.url)?.let { return it }
@@ -90,32 +94,6 @@ class RemoteMangaRepository(
 
 	suspend fun getFavicons(): Favicons = parser.getFavicons()
 
-	override suspend fun getRelated(seed: Manga): List<Manga> {
-		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)
-		return related.await()
-	}
-
-	suspend fun getDetails(manga: Manga, withCache: Boolean): Manga {
-		if (!withCache) {
-			return parser.getDetails(manga)
-		}
-		cache.getDetails(source, manga.url)?.let { return it }
-		val details = asyncSafe {
-			parser.getDetails(manga)
-		}
-		cache.putDetails(source, manga.url, details)
-		return details.await()
-	}
-
-	suspend fun find(manga: Manga): Manga? {
-		val list = getList(0, manga.title)
-		return list.find { x -> x.id == manga.id }
-	}
-
 	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider
 
 	fun getConfigKeys(): List<ConfigKey<*>> = ArrayList<ConfigKey<*>>().also {

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

@@ -14,7 +14,6 @@ import coil.network.HttpException
 import coil.request.Options
 import coil.size.Size
 import coil.size.pxOrElse
-import kotlinx.coroutines.ensureActive
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -22,17 +21,14 @@ import okhttp3.ResponseBody
 import okhttp3.internal.closeQuietly
 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.MangaRepository
 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 java.net.HttpURLConnection
-import kotlin.coroutines.coroutineContext
 
 private const val FALLBACK_SIZE = 9999 // largest icon
 
@@ -53,35 +49,22 @@ class FaviconFetcher(
 	override suspend fun fetch(): FetchResult {
 		getCached(options)?.let { return it }
 		val repo = mangaRepositoryFactory.create(mangaSource) as RemoteMangaRepository
+		val favicons = repo.getFavicons()
 		val sizePx = maxOf(
 			options.size.width.pxOrElse { FALLBACK_SIZE },
 			options.size.height.pxOrElse { FALLBACK_SIZE },
 		)
-		var favicons = repo.getFavicons()
-		var lastError: Exception? = null
-		while (favicons.isNotEmpty()) {
-			coroutineContext.ensureActive()
-			val icon = favicons.find(sizePx) ?: throwNSEE(lastError)
-			val response = try {
-				loadIcon(icon.url, mangaSource)
-			} catch (e: CloudFlareProtectedException) {
-				throw e
-			} catch (e: HttpException) {
-				lastError = e
-				favicons -= icon
-				continue
-			}
-			val responseBody = response.requireBody()
-			val source = writeToDiskCache(responseBody)?.toImageSource()?.also {
-				response.closeQuietly()
-			} ?: responseBody.toImageSource(response)
-			return SourceResult(
-				source = source,
-				mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(icon.type),
-				dataSource = response.toDataSource(),
-			)
-		}
-		throwNSEE(lastError)
+		val icon = checkNotNull(favicons.find(sizePx)) { "No favicons found" }
+		val response = loadIcon(icon.url, mangaSource)
+		val responseBody = response.requireBody()
+		val source = writeToDiskCache(responseBody)?.toImageSource()?.also {
+			response.closeQuietly()
+		} ?: responseBody.toImageSource(response)
+		return SourceResult(
+			source = source,
+			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(icon.type),
+			dataSource = response.toDataSource(),
+		)
 	}
 
 	private suspend fun loadIcon(url: String, source: MangaSource): Response {
@@ -111,14 +94,14 @@ class FaviconFetcher(
 		)
 	}
 
-	private suspend fun writeToDiskCache(body: ResponseBody): DiskCache.Snapshot? {
+	private fun writeToDiskCache(body: ResponseBody): DiskCache.Snapshot? {
 		if (!options.diskCachePolicy.writeEnabled || body.contentLength() == 0L) {
 			return null
 		}
 		val editor = diskCache.value?.openEditor(diskCacheKey) ?: return null
 		try {
 			fileSystem.write(editor.data) {
-				writeAllCancellable(body.source())
+				body.source().readAll(this)
 			}
 			return editor.commitAndOpenSnapshot()
 		} catch (e: Throwable) {
@@ -160,14 +143,6 @@ class FaviconFetcher(
 		append(height.toString())
 	}
 
-	private fun throwNSEE(lastError: Exception?): Nothing {
-		if (lastError != null) {
-			throw lastError
-		} else {
-			throw NoSuchElementException("No favicons found")
-		}
-	}
-
 	class Factory(
 		context: Context,
 		private val okHttpClient: OkHttpClient,