Revert "Use ConnectivityManagerCompat.getRestrictBackgroundStatus()"

This reverts commit bfad632b8c.

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

@@ -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,30 @@ 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 = 581
-		versionName = '6.1.3'
+		minSdkVersion 21
+		//TODO: update as soon as sources becomes available
+		//noinspection OldTargetApi
+		targetSdkVersion 33
+		versionCode 567
+		versionName '5.3.10'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
-		ksp {
-			arg("room.schemaLocation", "$projectDir/schemas")
-		}
-		androidResources {
-			generateLocaleConfig true
+
+		kapt {
+			arguments {
+				arg 'room.schemaLocation', "$projectDir/schemas".toString()
+			}
 		}
 	}
 	buildTypes {
@@ -40,7 +41,6 @@ android {
 	}
 	buildFeatures {
 		viewBinding true
-		buildConfig true
 	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
@@ -81,29 +81,30 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:0004be15ba') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:03b4fc9f00') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.12.0'
+	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.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
+	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.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.2'
+	//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'
@@ -116,28 +117,29 @@ dependencies {
 
 	implementation 'androidx.room:room-runtime:2.5.2'
 	implementation 'androidx.room:room-ktx:2.5.2'
-	ksp 'androidx.room:room-compiler:2.5.2'
+	//noinspection KaptUsageInsteadOfKsp
+	kapt 'androidx.room:room-compiler:2.5.2'
 
 	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.4.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.48'
-	kapt 'com.google.dagger:hilt-compiler:2.48'
+	implementation 'com.google.dagger:hilt-android:2.47'
+	kapt 'com.google.dagger:hilt-compiler:2.47'
 	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:169806d928'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:9b1d20be67'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.2'
-	implementation 'ch.acra:acra-dialog:5.11.2'
+	implementation 'ch.acra:acra-http:5.11.0'
+	implementation 'ch.acra:acra-dialog:5.11.0'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
@@ -155,6 +157,6 @@ dependencies {
 	androidTestImplementation 'androidx.room:room-testing:2.5.2'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.48'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.47'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.47'
 }

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

@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.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/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,8 +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.REQUEST_INSTALL_PACKAGES" />
 	<uses-permission
 		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 		android:maxSdkVersion="29" />
@@ -48,6 +46,7 @@
 		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"
@@ -72,17 +71,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"
@@ -96,12 +84,7 @@
 			android:label="@string/search" />
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
-			android:exported="true"
-			android:label="@string/manga_list">
-			<intent-filter>
-				<action android:name="${applicationId}.action.EXPLORE_MANGA" />
-			</intent-filter>
-		</activity>
+			android:label="@string/search_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.history.ui.HistoryActivity"
 			android:label="@string/history" />
@@ -144,7 +127,6 @@
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
-			android:autoRemoveFromRecents="true"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
@@ -155,21 +137,13 @@
 			android:name="org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity"
 			android:label="@string/manage_categories" />
 		<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" />
@@ -192,6 +166,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"
@@ -212,13 +189,7 @@
 
 		</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" />
@@ -320,13 +291,6 @@
 				android:name="android.appwidget.provider"
 				android:resource="@xml/widget_recent" />
 		</receiver>
-		<receiver
-			android:name="org.koitharu.kotatsu.settings.about.UpdateDownloadReceiver"
-			android:exported="true">
-			<intent-filter>
-				<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-			</intent-filter>
-		</receiver>
 
 		<meta-data
 			android:name="android.webkit.WebView.EnableSafeBrowsing"
@@ -338,660 +302,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,9 +1,11 @@
-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
@@ -18,19 +20,21 @@ 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.local.data.LocalMangaRepository
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 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>
@@ -59,6 +63,9 @@ open class BaseApp : Application(), Configuration.Provider {
 	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()
@@ -129,4 +136,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() FIXME: migrate to ViewPager2
+			.detectRetainInstanceUsage()
+			.detectSetUserVisibleHint()
+			.detectFragmentTagUsage()
+			.build()
+	}
 }

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

@@ -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"

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

@@ -14,6 +14,7 @@ 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.domain.Bookmark
@@ -24,9 +25,11 @@ 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.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+import org.koitharu.kotatsu.core.ui.util.ReversibleAction
+import org.koitharu.kotatsu.core.ui.util.reverseAsync
 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
@@ -36,6 +39,7 @@ 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.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
@@ -58,17 +62,11 @@ class BookmarksFragment :
 	private var bookmarksAdapter: BookmarksAdapter? = null
 	private var selectionController: ListSelectionController? = null
 
-	override fun onCreateViewBinding(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	): FragmentListSimpleBinding {
+	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
 		return FragmentListSimpleBinding.inflate(inflater, container, false)
 	}
 
-	override fun onViewBindingCreated(
-		binding: FragmentListSimpleBinding,
-		savedInstanceState: Bundle?,
-	) {
+	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		selectionController = ListSelectionController(
 			activity = requireActivity(),
@@ -86,7 +84,7 @@ class BookmarksFragment :
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
 			val spanResolver = MangaListSpanResolver(resources)
-			addItemDecoration(TypedListSpacingDecoration(context, false))
+			addItemDecoration(TypedListSpacingDecoration(context))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver.setGridSize(settings.gridSize / 100f, this)
@@ -98,11 +96,8 @@ class BookmarksFragment :
 		viewModel.content.observe(viewLifecycleOwner) {
 			bookmarksAdapter?.setItems(it, spanSizeLookup)
 		}
-		viewModel.onError.observeEvent(
-			viewLifecycleOwner,
-			SnackbarErrorObserver(binding.recyclerView, this)
-		)
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
+		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
 	}
 
 	override fun onDestroyView() {
@@ -117,7 +112,7 @@ class BookmarksFragment :
 				.bookmark(item)
 				.incognito(true)
 				.build()
-			startActivity(intent)
+			startActivity(intent, scaleUpActivityOptionsOf(view))
 			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}
@@ -145,20 +140,12 @@ class BookmarksFragment :
 		requireViewBinding().recyclerView.invalidateItemDecorations()
 	}
 
-	override fun onCreateActionMode(
-		controller: ListSelectionController,
-		mode: ActionMode,
-		menu: Menu,
-	): Boolean {
+	override fun onCreateActionMode(controller: ListSelectionController, 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: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
@@ -172,15 +159,24 @@ class BookmarksFragment :
 	}
 
 	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 onActionDone(action: ReversibleAction) {
+		val handle = action.handle
+		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
+		val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
+		if (handle != null) {
+			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
+		}
+		snackbar.show()
+	}
+
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
 
 		init {
@@ -189,8 +185,7 @@ class BookmarksFragment :
 		}
 
 		override fun getSpanSize(position: Int): Int {
-			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount
-				?: return 1
+			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
 			return when (bookmarksAdapter?.getItemViewType(position)) {
 				ListItemType.PAGE_THUMB.ordinal -> 1
 				else -> total
@@ -205,12 +200,6 @@ class BookmarksFragment :
 
 	companion object {
 
-		@Deprecated(
-			"", ReplaceWith(
-				"BookmarksFragment()",
-				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment"
-			)
-		)
 		fun newInstance() = BookmarksFragment()
 	}
 }

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
@@ -33,10 +34,13 @@ fun bookmarkListAD(
 			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

@@ -5,15 +5,11 @@ 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.list.ui.adapter.ListItemType
 
 class BookmarksAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Bookmark>,
-) : BaseListAdapter<Bookmark>() {
-
-	init {
-		addDelegate(ListItemType.PAGE_THUMB, bookmarkListAD(coil, lifecycleOwner, clickListener))
-	}
-}
+) : BaseListAdapter<Bookmark>(
+	bookmarkListAD(coil, lifecycleOwner, clickListener),
+)

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/sheet/BookmarkLargeAD.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
@@ -34,11 +35,14 @@ fun bookmarkLargeAD(
 			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
 	}
+
+	onViewRecycled {
+		binding.imageViewThumb.disposeImageRequest()
+	}
 }

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

@@ -9,7 +9,6 @@ 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
@@ -28,7 +27,6 @@ class BookmarksAdapter(
 		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? {

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

@@ -22,6 +22,7 @@ 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.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetPagesBinding
@@ -75,7 +76,7 @@ class BookmarksSheet :
 		)
 		viewBinding?.headerBar?.setTitle(R.string.bookmarks)
 		with(binding.recyclerView) {
-			addItemDecoration(TypedListSpacingDecoration(context, false))
+			addItemDecoration(TypedListSpacingDecoration(context))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver?.setGridSize(settings.gridSize / 100f, this)
@@ -102,7 +103,7 @@ class BookmarksSheet :
 				.bookmark(item)
 				.incognito(true)
 				.build()
-			startActivity(intent)
+			startActivity(intent, scaleUpActivityOptionsOf(view))
 		}
 		dismiss()
 	}
@@ -162,7 +163,7 @@ class BookmarksSheet :
 
 		fun show(fm: FragmentManager, manga: Manga) {
 			BookmarksSheet().withArgs(1) {
-				putParcelable(ARG_MANGA, ParcelableManga(manga))
+				putParcelable(ARG_MANGA, ParcelableManga(manga, withChapters = true))
 			}.showDistinct(fm, TAG)
 		}
 	}

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

@@ -35,7 +35,6 @@ class BookmarksSheetViewModel @Inject constructor(
 
 	val content: StateFlow<List<ListModel>> = bookmarksRepository.observeBookmarks(manga)
 		.map { mapList(it) }
-		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, listOf(LoadingFooter()))
 
 	private suspend fun mapList(bookmarks: List<Bookmark>): List<ListModel> {

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

@@ -13,6 +13,7 @@ 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

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

@@ -1,28 +1,28 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
+import android.annotation.SuppressLint
 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 {
+) : ImageRequest.Listener {
 
+	@SuppressLint("MissingPermission")
 	fun notify(exception: CloudFlareProtectedException) {
-		if (!context.checkNotificationPermission()) {
+		val manager = NotificationManagerCompat.from(context)
+		if (!manager.areNotificationsEnabled()) {
 			return
 		}
-		val manager = NotificationManagerCompat.from(context)
 		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_DEFAULT)
 			.setName(context.getString(R.string.captcha_required))
 			.setShowBadge(true)

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

@@ -3,27 +3,22 @@ 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 android.webkit.WebSettings
 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 androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.yield
 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.CommonHeadersInterceptor
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
@@ -45,13 +40,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability {
-				setContentView(
-					ActivityBrowserBinding.inflate(
-						layoutInflater
-					)
-				)
-			}) {
+		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
 			return
 		}
 		supportActionBar?.run {
@@ -99,11 +88,6 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		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,
@@ -122,19 +106,6 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			true
 		}
 
-		R.id.action_retry -> {
-			lifecycleScope.launch {
-				viewBinding.webView.stopLoading()
-				yield()
-				val targetUrl = intent?.dataString?.toHttpUrlOrNull()
-				if (targetUrl != null) {
-					clearCfCookies(targetUrl)
-					viewBinding.webView.loadUrl(targetUrl.toString())
-				}
-			}
-			true
-		}
-
 		else -> super.onOptionsItemSelected(item)
 	}
 
@@ -172,15 +143,7 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
 		setTitle(title)
-		supportActionBar?.subtitle =
-			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
-	}
-
-	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
-		cookieJar.removeCookies(url) { cookie ->
-			val name = cookie.name
-			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf")
-		}
+		supportActionBar?.subtitle = subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}
 
 	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {

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

@@ -25,13 +25,11 @@ 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.ImageProxyInterceptor
-import org.koitharu.kotatsu.core.network.MangaHttpClient
+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.parser.MangaLoaderContextImpl
@@ -41,13 +39,13 @@ 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.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
@@ -91,7 +89,6 @@ interface AppModule {
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
-			coverRestoreInterceptor: CoverRestoreInterceptor,
 		): ImageLoader {
 			val diskCacheFactory = {
 				val rootDir = context.externalCacheDir ?: context.cacheDir
@@ -108,7 +105,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 +112,6 @@ interface AppModule {
 						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
 						.add(pageFetcherFactory)
 						.add(imageProxyInterceptor)
-						.add(coverRestoreInterceptor)
 						.build(),
 				).build()
 		}
@@ -161,7 +156,7 @@ interface AppModule {
 		fun provideContentCache(
 			application: Application,
 		): ContentCache {
-			return if (application.isLowRamDevice()) {
+			return if (application.activityManager?.isLowRamDevice == true) {
 				StubContentCache()
 			} else {
 				MemoryContentCache(application)

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

@@ -20,8 +20,25 @@ interface ContentCache {
 
 	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
 
-	data class Key(
+	class Key(
 		val source: MangaSource,
 		val url: String,
-	)
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Key
+
+			if (source != other.source) return false
+			return url == other.url
+		}
+
+		override fun hashCode(): Int {
+			var result = source.hashCode()
+			result = 31 * result + url.hashCode()
+			return result
+		}
+	}
 }

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

@@ -6,7 +6,6 @@ import androidx.room.InvalidationTracker
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
-import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -119,7 +118,7 @@ fun MangaDatabase(context: Context): MangaDatabase = Room
 fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
 	val scope = processLifecycleScope
 	if (scope.isActive) {
-		processLifecycleScope.launch(Dispatchers.Default, CoroutineStart.ATOMIC) {
+		processLifecycleScope.launch(Dispatchers.Default) {
 			removeObserver(observer)
 		}
 	}

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

@@ -6,4 +6,3 @@ const val TABLE_TAGS = "tags"
 const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
 const val TABLE_HISTORY = "history"
 const val TABLE_MANGA_TAGS = "manga_tags"
-const val TABLE_SOURCES = "sources"

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

@@ -19,10 +19,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>

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

@@ -3,10 +3,9 @@ package org.koitharu.kotatsu.core.db.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.koitharu.kotatsu.core.db.TABLE_SOURCES
 
 @Entity(
-	tableName = TABLE_SOURCES,
+	tableName = "sources",
 )
 data class MangaSourceEntity(
 	@PrimaryKey(autoGenerate = false)

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,21 @@ 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
+		return tags == other.tags
+	}
+
+	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/Migration16To17.kt

@@ -15,24 +15,19 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 		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
+		val sources = MangaSource.values()
 		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
-				}
+				sortKey = order.size + source.ordinal
 			}
 			database.execSQL(
 				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
-				arrayOf(name, (!isHidden).toInt(), sortKey),
+				arrayOf(name, (name !in hiddenSources).toInt(), sortKey),
 			)
 		}
 	}

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/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/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,28 @@ 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
+		return variantNumber == other.variantNumber
+	}
+
+	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/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
@@ -17,8 +16,6 @@ fun Collection<Manga>.distinctById() = distinctBy { it.id }
 @JvmName("chaptersIds")
 fun Collection<MangaChapter>.ids() = mapToSet { it.id }
 
-fun Collection<MangaChapter>.findById(id: Long) = find { x -> x.id == id }
-
 fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size
@@ -32,7 +29,7 @@ fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 }
 
 fun Manga.findChapter(id: Long): MangaChapter? {
-	return chapters?.findById(id)
+	return chapters?.find { it.id == id }
 }
 
 fun Manga.getPreferredBranch(history: MangaHistory?): String? {
@@ -41,7 +38,7 @@ fun Manga.getPreferredBranch(history: MangaHistory?): String? {
 		return null
 	}
 	if (history != null) {
-		val currentChapter = ch.findById(history.chapterId)
+		val currentChapter = ch.find { it.id == history.chapterId }
 		if (currentChapter != null) {
 			return currentChapter.branch
 		}
@@ -50,10 +47,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) ||
@@ -63,19 +60,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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.core.model
 
-import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
@@ -11,10 +10,8 @@ fun MangaSource.getLocaleTitle(): String? {
 }
 
 fun MangaSource(name: String): MangaSource {
-	MangaSource.entries.forEach {
+	MangaSource.values().forEach {
 		if (it.name == name) return it
 	}
 	return MangaSource.DUMMY
 }
-
-fun MangaSource.isNsfw() = contentType == ContentType.HENTAI

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

@@ -1,42 +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 org.koitharu.kotatsu.core.util.ext.readSerializableCompat
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-@Parcelize
-data class ParcelableChapter(
-	val chapter: MangaChapter,
-) : Parcelable {
-
-	companion object : Parceler<ParcelableChapter> {
-
-		override fun create(parcel: Parcel) = ParcelableChapter(
-			MangaChapter(
-				id = parcel.readLong(),
-				name = parcel.readString().orEmpty(),
-				number = parcel.readInt(),
-				url = parcel.readString().orEmpty(),
-				scanlator = parcel.readString(),
-				uploadDate = parcel.readLong(),
-				branch = parcel.readString(),
-				source = parcel.readSerializableCompat() ?: MangaSource.DUMMY,
-			)
-		)
-
-		override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
-			parcel.writeLong(id)
-			parcel.writeString(name)
-			parcel.writeInt(number)
-			parcel.writeString(url)
-			parcel.writeString(scanlator)
-			parcel.writeLong(uploadDate)
-			parcel.writeString(branch)
-			parcel.writeSerializable(source)
-		}
-	}
-}

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

@@ -9,28 +9,55 @@ 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(
 	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)
+		}
 
-		override fun ParcelableManga.write(parcel: Parcel, flags: Int) = with(manga) {
-			parcel.writeLong(id)
-			parcel.writeString(title)
-			parcel.writeString(altTitle)
-			parcel.writeString(url)
-			parcel.writeString(publicUrl)
-			parcel.writeFloat(rating)
-			ParcelCompat.writeBoolean(parcel, isNsfw)
-			parcel.writeString(coverUrl)
-			parcel.writeString(largeCoverUrl)
-			parcel.writeString(description)
-			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
-			parcel.writeSerializable(state)
-			parcel.writeString(author)
-			parcel.writeSerializable(source)
+		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 create(parcel: Parcel) = ParcelableManga(
@@ -48,9 +75,10 @@ data class ParcelableManga(
 				tags = requireNotNull(parcel.readParcelableCompat<ParcelableMangaTags>()).tags,
 				state = parcel.readSerializableCompat(),
 				author = parcel.readString(),
-				chapters = null,
+				chapters = parcel.readParcelableCompat<ParcelableMangaChapters>()?.chapters,
 				source = requireNotNull(parcel.readSerializableCompat()),
-			)
+			),
+			withChapters = true
 		)
 	}
 }

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

@@ -0,0 +1,37 @@
+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()),
+	)
+
+	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)
+	}
+}
+
+@Parcelize
+@TypeParceler<MangaChapter, MangaChapterParceler>
+data class ParcelableMangaChapters(val chapters: List<MangaChapter>) : Parcelable

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

@@ -3,21 +3,20 @@ 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())
 		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) {
+			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
 				val request = response.request
 				response.closeQuietly()
 				throw CloudFlareProtectedException(

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/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/cookies/AndroidCookieJar.kt

@@ -2,7 +2,6 @@ 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
@@ -32,21 +31,19 @@ class AndroidCookieJar : MutableCookieJar {
 		}
 	}
 
-	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
+	override fun removeCookies(url: HttpUrl) {
 		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 ->

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,17 @@ 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
+
+		return cookie == other.cookie
+	}
+
+	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
@@ -15,7 +14,7 @@ interface MutableCookieJar : CookieJar {
 	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>)
 
 	@WorkerThread
-	fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?)
+	fun removeCookies(url: HttpUrl)
 
 	suspend fun clear(): Boolean
 }

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

@@ -4,7 +4,6 @@ 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
@@ -58,14 +57,12 @@ class PreferencesCookieJar(
 
 	@Synchronized
 	@WorkerThread
-	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
+	override fun removeCookies(url: HttpUrl) {
 		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
-				}
+				toRemove += key
 			}
 		}
 		if (toRemove.isNotEmpty()) {

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

@@ -21,7 +21,6 @@ import kotlinx.coroutines.launch
 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.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.image.ThumbnailTransformation
 import org.koitharu.kotatsu.core.util.ext.getDrawableOrThrow
@@ -30,10 +29,8 @@ 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.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -80,10 +77,6 @@ class AppShortcutManager @Inject constructor(
 		return ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(manga), null)
 	}
 
-	suspend fun requestPinShortcut(source: MangaSource): Boolean {
-		return ShortcutManagerCompat.requestPinShortcut(context, buildShortcutInfo(source), null)
-	}
-
 	@VisibleForTesting
 	suspend fun await(): Boolean {
 		return shortcutsUpdateJob?.join() != null
@@ -93,11 +86,6 @@ class AppShortcutManager @Inject constructor(
 		ShortcutManagerCompat.reportShortcutUsed(context, mangaId.toString())
 	}
 
-	fun isDynamicShortcutsAvailable(): Boolean {
-		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
-			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
-	}
-
 	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
 		val maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context).coerceAtLeast(5)
 		val shortcuts = historyRepository.getList(0, maxShortcuts)
@@ -144,25 +132,8 @@ class AppShortcutManager @Inject constructor(
 			.build()
 	}
 
-	private suspend fun buildShortcutInfo(source: MangaSource): ShortcutInfoCompat {
-		val icon = runCatchingCancellable {
-			coil.execute(
-				ImageRequest.Builder(context)
-					.data(source.faviconUri())
-					.size(iconSize)
-					.scale(Scale.FIT)
-					.build(),
-			).getDrawableOrThrow().toBitmap()
-		}.fold(
-			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
-			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
-		)
-		return ShortcutInfoCompat.Builder(context, source.name)
-			.setShortLabel(source.title)
-			.setLongLabel(source.title)
-			.setIcon(icon)
-			.setLongLived(true)
-			.setIntent(MangaListActivity.newIntent(context, source))
-			.build()
+	fun isDynamicShortcutsAvailable(): Boolean {
+		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 &&
+			context.getSystemService(ShortcutManager::class.java).maxShortcutCountPerActivity > 0
 	}
 }

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

@@ -51,9 +51,6 @@ class RemoteMangaRepository(
 			getConfig()[parser.configKeyDomain] = value
 		}
 
-	val domains: Array<out String>
-		get() = parser.configKeyDomain.presetValues
-
 	val headers: Headers
 		get() = parser.headers
 
@@ -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 }
@@ -99,23 +103,6 @@ class RemoteMangaRepository(
 		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,

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

@@ -9,6 +9,7 @@ import android.provider.Settings
 import androidx.annotation.FloatRange
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.ArraySet
+import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
 import androidx.preference.PreferenceManager
@@ -24,7 +25,6 @@ import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.history.domain.model.HistoryOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.find
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.io.File
@@ -44,8 +44,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
 
 	val theme: Int
-		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull()
-			?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+		get() = prefs.getString(KEY_THEME, null)?.toIntOrNull() ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 
 	val colorScheme: ColorScheme
 		get() = prefs.getEnumValue(KEY_COLOR_THEME, ColorScheme.default)
@@ -53,29 +52,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isAmoledTheme: Boolean
 		get() = prefs.getBoolean(KEY_THEME_AMOLED, false)
 
-	var mainNavItems: List<NavItem>
-		get() {
-			val raw = prefs.getString(KEY_NAV_MAIN, null)?.split(',')
-			return if (raw.isNullOrEmpty()) {
-				listOf(NavItem.HISTORY, NavItem.FAVORITES, NavItem.EXPLORE, NavItem.FEED)
-			} else {
-				raw.mapNotNull { x -> NavItem.entries.find(x) }.ifEmpty { listOf(NavItem.EXPLORE) }
-			}
-		}
-		set(value) {
-			prefs.edit {
-				putString(KEY_NAV_MAIN, value.joinToString(",") { it.name })
-			}
-		}
-
 	var gridSize: Int
 		get() = prefs.getInt(KEY_GRID_SIZE, 100)
 		set(value) = prefs.edit { putInt(KEY_GRID_SIZE, value) }
 
-	var isNsfwContentDisabled: Boolean
-		get() = prefs.getBoolean(KEY_DISABLE_NSFW, false)
-		set(value) = prefs.edit { putBoolean(KEY_DISABLE_NSFW, value) }
-
 	var appLocales: LocaleListCompat
 		get() {
 			val raw = prefs.getString(KEY_APP_LOCALE, null)
@@ -90,9 +70,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val readerPageSwitch: Set<String>
 		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
-	val isReaderZoomButtonsEnabled: Boolean
-		get() = prefs.getBoolean(KEY_READER_ZOOM_BUTTONS, false)
-
 	val isReaderTapsAdaptive: Boolean
 		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
 
@@ -124,8 +101,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val notificationLight: Boolean
 		get() = prefs.getBoolean(KEY_NOTIFICATIONS_LIGHT, true)
 
-	val readerAnimation: ReaderAnimation
-		get() = prefs.getEnumValue(KEY_READER_ANIMATION, ReaderAnimation.DEFAULT)
+	val readerAnimation: Boolean
+		get() = prefs.getBoolean(KEY_READER_ANIMATION, false)
 
 	val readerBackground: ReaderBackground
 		get() = prefs.getEnumValue(KEY_READER_BACKGROUND, ReaderBackground.DEFAULT)
@@ -158,15 +135,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_ZOOM_MODE, ZoomMode.FIT_CENTER)
 
 	val trackSources: Set<String>
-		get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: setOf(TRACK_FAVOURITES)
+		get() = prefs.getStringSet(KEY_TRACK_SOURCES, null) ?: arraySetOf(TRACK_FAVOURITES, TRACK_HISTORY)
 
 	var appPassword: String?
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
-		set(value) = prefs.edit {
-			if (value != null) putString(KEY_APP_PASSWORD, value) else remove(
-				KEY_APP_PASSWORD,
-			)
-		}
+		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }
 
 	val isLoggingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_LOGGING_ENABLED, false)
@@ -192,8 +165,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			if (isBackgroundNetworkRestricted()) {
 				return false
 			}
-			val policy =
-				NetworkPolicy.from(prefs.getString(KEY_PREFETCH_CONTENT, null), NetworkPolicy.NEVER)
+			val policy = NetworkPolicy.from(prefs.getString(KEY_PREFETCH_CONTENT, null), NetworkPolicy.NEVER)
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
@@ -305,31 +277,20 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_HISTORY_ORDER, HistoryOrder.UPDATED)
 		set(value) = prefs.edit { putEnumValue(KEY_HISTORY_ORDER, value) }
 
-	val isRelatedMangaEnabled: Boolean
-		get() = prefs.getBoolean(KEY_RELATED_MANGA, true)
-
 	val isWebtoonZoomEnable: Boolean
 		get() = prefs.getBoolean(KEY_WEBTOON_ZOOM, true)
 
 	@get:FloatRange(from = 0.0, to = 1.0)
 	var readerAutoscrollSpeed: Float
 		get() = prefs.getFloat(KEY_READER_AUTOSCROLL_SPEED, 0f)
-		set(@FloatRange(from = 0.0, to = 1.0) value) = prefs.edit {
-			putFloat(
-				KEY_READER_AUTOSCROLL_SPEED,
-				value,
-			)
-		}
+		set(@FloatRange(from = 0.0, to = 1.0) value) = prefs.edit { putFloat(KEY_READER_AUTOSCROLL_SPEED, value) }
 
 	val isPagesPreloadEnabled: Boolean
 		get() {
 			if (isBackgroundNetworkRestricted()) {
 				return false
 			}
-			val policy = NetworkPolicy.from(
-				prefs.getString(KEY_PAGES_PRELOAD, null),
-				NetworkPolicy.NON_METERED,
-			)
+			val policy = NetworkPolicy.from(prefs.getString(KEY_PAGES_PRELOAD, null), NetworkPolicy.NON_METERED)
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
@@ -412,7 +373,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_SWITCHERS = "reader_switchers"
-		const val KEY_READER_ZOOM_BUTTONS = "reader_zoom_buttons"
 		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACKER_WIFI_ONLY = "tracker_wifi"
 		const val KEY_TRACK_SOURCES = "track_sources"
@@ -424,7 +384,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
 		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
-		const val KEY_READER_ANIMATION = "reader_animation2"
+		const val KEY_READER_ANIMATION = "reader_animation"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_APP_PASSWORD = "app_password"
@@ -484,9 +444,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PROXY_PASSWORD = "proxy_password"
 		const val KEY_IMAGES_PROXY = "images_proxy"
 		const val KEY_LOCAL_MANGA_DIRS = "local_manga_dirs"
-		const val KEY_DISABLE_NSFW = "no_nsfw"
-		const val KEY_RELATED_MANGA = "related_manga"
-		const val KEY_NAV_MAIN = "nav_main"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -1,38 +1,15 @@
 package org.koitharu.kotatsu.core.prefs
 
-import android.appwidget.AppWidgetProvider
 import android.content.Context
-import android.os.Build
 import androidx.core.content.edit
 
 private const val CATEGORY_ID = "cat_id"
-private const val BACKGROUND = "bg"
 
-class AppWidgetConfig(
-	context: Context,
-	cls: Class<out AppWidgetProvider>,
-	val widgetId: Int,
-) {
+class AppWidgetConfig(context: Context, val widgetId: Int) {
 
-	private val prefs = context.getSharedPreferences("appwidget_${cls.simpleName}_$widgetId", Context.MODE_PRIVATE)
+	private val prefs = context.getSharedPreferences("appwidget_$widgetId", Context.MODE_PRIVATE)
 
 	var categoryId: Long
 		get() = prefs.getLong(CATEGORY_ID, 0L)
 		set(value) = prefs.edit { putLong(CATEGORY_ID, value) }
-
-	var hasBackground: Boolean
-		get() = prefs.getBoolean(BACKGROUND, Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
-		set(value) = prefs.edit { putBoolean(BACKGROUND, value) }
-
-	fun clear() {
-		prefs.edit { clear() }
-	}
-
-	fun copyFrom(other: AppWidgetConfig) {
-		prefs.edit {
-			clear()
-			putLong(CATEGORY_ID, other.categoryId)
-			putBoolean(BACKGROUND, other.hasBackground)
-		}
-	}
 }

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

@@ -4,7 +4,6 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import com.google.android.material.color.DynamicColors
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.parsers.util.find
 
 enum class ColorScheme(
 	@StyleRes val styleResId: Int,
@@ -32,7 +31,7 @@ enum class ColorScheme(
 			}
 
 		fun getAvailableList(): List<ColorScheme> {
-			val list = ColorScheme.entries.toMutableList()
+			val list = enumValues<ColorScheme>().toMutableList()
 			if (!DynamicColors.isDynamicColorAvailable()) {
 				list.remove(MONET)
 			}
@@ -40,7 +39,7 @@ enum class ColorScheme(
 		}
 
 		fun safeValueOf(name: String): ColorScheme? {
-			return ColorScheme.entries.find(name)
+			return enumValues<ColorScheme>().find { it.name == name }
 		}
 	}
 }

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

@@ -1,33 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.IdRes
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-enum class NavItem(
-	@IdRes val id: Int,
-	@StringRes val title: Int,
-	@DrawableRes val icon: Int,
-) : ListModel {
-
-	HISTORY(R.id.nav_history, R.string.history, R.drawable.ic_history_selector),
-	FAVORITES(R.id.nav_favorites, R.string.favourites, R.drawable.ic_favourites_selector),
-	LOCAL(R.id.nav_local, R.string.on_device, R.drawable.ic_storage_selector),
-	EXPLORE(R.id.nav_explore, R.string.explore, R.drawable.ic_explore_selector),
-	SUGGESTIONS(R.id.nav_suggestions, R.string.suggestions, R.drawable.ic_suggestion_selector),
-	FEED(R.id.nav_feed, R.string.feed, R.drawable.ic_feed_selector),
-	BOOKMARKS(R.id.nav_bookmarks, R.string.bookmarks, R.drawable.ic_bookmark_selector),
-	;
-
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is NavItem && ordinal == other.ordinal
-	}
-
-	fun isAvailable(settings: AppSettings): Boolean = when (this) {
-		SUGGESTIONS -> settings.isSuggestionsEnabled
-		FEED -> settings.isTrackerEnabled
-		else -> true
-	}
-}

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

@@ -20,7 +20,7 @@ enum class NetworkPolicy(
 
 		fun from(key: String?, default: NetworkPolicy): NetworkPolicy {
 			val intKey = key?.toIntOrNull() ?: return default
-			return NetworkPolicy.entries.find { it.key == intKey } ?: default
+			return enumValues<NetworkPolicy>().find { it.key == intKey } ?: default
 		}
 	}
 }

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

@@ -1,7 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-enum class ReaderAnimation {
-
-	// Do not rename this
-	NONE, DEFAULT, ADVANCED;
-}

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

@@ -3,11 +3,11 @@ package org.koitharu.kotatsu.core.prefs
 enum class ReaderMode(val id: Int) {
 
 	STANDARD(1),
-	REVERSED(3),
-	WEBTOON(2);
+	WEBTOON(2),
+	REVERSED(3);
 
 	companion object {
 
-		fun valueOf(id: Int) = entries.firstOrNull { it.id == id }
+		fun valueOf(id: Int) = values().firstOrNull { it.id == id }
 	}
-}
+}

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

@@ -97,6 +97,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
+		@Suppress("DEPRECATION")
 		onBackPressed()
 		true
 	} else super.onOptionsItemSelected(item)

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

@@ -1,51 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.widget.RemoteViews
-import androidx.annotation.CallSuper
-import org.koitharu.kotatsu.core.prefs.AppWidgetConfig
-
-abstract class BaseAppWidgetProvider : AppWidgetProvider() {
-
-	@CallSuper
-	override fun onUpdate(
-		context: Context,
-		appWidgetManager: AppWidgetManager,
-		appWidgetIds: IntArray
-	) {
-		appWidgetIds.forEach { id ->
-			val config = AppWidgetConfig(context, javaClass, id)
-			val views = onUpdateWidget(context, config)
-			appWidgetManager.updateAppWidget(id, views)
-		}
-	}
-
-	override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-		super.onDeleted(context, appWidgetIds)
-		for (id in appWidgetIds) {
-			AppWidgetConfig(context, javaClass, id).clear()
-		}
-	}
-
-	override fun onRestored(context: Context, oldWidgetIds: IntArray, newWidgetIds: IntArray) {
-		super.onRestored(context, oldWidgetIds, newWidgetIds)
-		if (oldWidgetIds.size != newWidgetIds.size) {
-			return
-		}
-		for (i in oldWidgetIds.indices) {
-			val oldId = oldWidgetIds[i]
-			val newId = newWidgetIds[i]
-			val oldConfig = AppWidgetConfig(context, javaClass, oldId)
-			val newConfig = AppWidgetConfig(context, javaClass, newId)
-			newConfig.copyFrom(oldConfig)
-			oldConfig.clear()
-		}
-	}
-
-	protected abstract fun onUpdateWidget(
-		context: Context,
-		config: AppWidgetConfig,
-	): RemoteViews
-}

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

@@ -5,19 +5,20 @@ import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.viewbinding.ViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.util.SystemUiController
 
 abstract class BaseFullscreenActivity<B : ViewBinding> :
 	BaseActivity<B>() {
 
-	protected lateinit var systemUiController: SystemUiController
+	private lateinit var insetsControllerCompat: WindowInsetsControllerCompat
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		with(window) {
-			systemUiController = SystemUiController(this)
+			insetsControllerCompat = WindowInsetsControllerCompat(this, decorView)
 			statusBarColor = Color.TRANSPARENT
 			navigationBarColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
 				ContextCompat.getColor(this@BaseFullscreenActivity, R.color.dim)
@@ -29,7 +30,15 @@ abstract class BaseFullscreenActivity<B : ViewBinding> :
 					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 			}
 		}
-		// insetsControllerCompat.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-		systemUiController.setSystemUiVisible(true)
+		insetsControllerCompat.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+		showSystemUI()
+	}
+
+	protected fun hideSystemUI() {
+		insetsControllerCompat.hide(WindowInsetsCompat.Type.systemBars())
+	}
+
+	protected fun showSystemUI() {
+		insetsControllerCompat.show(WindowInsetsCompat.Type.systemBars())
 	}
 }

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

@@ -13,10 +13,13 @@ import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import kotlin.coroutines.suspendCoroutine
 
-open class BaseListAdapter<T : ListModel> : AsyncListDifferDelegationAdapter<T>(
+open class BaseListAdapter<T : ListModel>(
+	vararg delegates: AdapterDelegate<List<T>>,
+) : AsyncListDifferDelegationAdapter<T>(
 	AsyncDifferConfig.Builder(ListModelDiffCallback<T>())
 		.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
 		.build(),
+	*delegates,
 ), FlowCollector<List<T>?> {
 
 	override suspend fun emit(value: List<T>?) = suspendCoroutine { cont ->

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

@@ -13,7 +13,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
-import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.settings.SettingsActivity
 import javax.inject.Inject
 
@@ -34,8 +33,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-		val themedContext = (view.parentView ?: view).context
-		view.setBackgroundColor(themedContext.getThemeColor(android.R.attr.colorBackground))
+		view.setBackgroundColor(view.context.getThemeColor(android.R.attr.colorBackground))
 		listView.clipToPadding = false
 		insetsDelegate.onViewCreated(view)
 		insetsDelegate.addInsetsListener(this)

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

@@ -7,14 +7,10 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
@@ -36,8 +32,9 @@ abstract class BaseViewModel : ViewModel() {
 	val onError: EventFlow<Throwable>
 		get() = errorEvent
 
-	val isLoading: StateFlow<Boolean> = loadingCounter.map { it > 0 }
-		.stateIn(viewModelScope, SharingStarted.Lazily, loadingCounter.value > 0)
+	val isLoading: StateFlow<Boolean>
+		get() = loadingCounter.map { it > 0 }
+			.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), loadingCounter.value > 0)
 
 	protected fun launchJob(
 		context: CoroutineContext = EmptyCoroutineContext,
@@ -58,24 +55,14 @@ abstract class BaseViewModel : ViewModel() {
 		}
 	}
 
-	protected fun <T> Flow<T>.withLoading() = onStart {
-		loadingCounter.increment()
-	}.onCompletion {
-		loadingCounter.decrement()
-	}
-
-	protected fun <T> Flow<T>.withErrorHandling() = catch { error ->
-		errorEvent.call(error)
-	}
-
-	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
-
-	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }
-
 	private fun createErrorHandler() = CoroutineExceptionHandler { _, throwable ->
 		throwable.printStackTraceDebug()
 		if (throwable !is CancellationException) {
 			errorEvent.call(throwable)
 		}
 	}
+
+	protected fun MutableStateFlow<Int>.increment() = update { it + 1 }
+
+	protected fun MutableStateFlow<Int>.decrement() = update { it - 1 }
 }

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

@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.core.ui.dialog
+
+import android.content.Context
+import android.graphics.Color
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetDialog
+
+class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
+
+	/**
+	 * https://github.com/material-components/material-components-android/issues/2582
+	 */
+	@Suppress("DEPRECATION")
+	override fun onAttachedToWindow() {
+		val window = window
+		val initialSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
+		super.onAttachedToWindow()
+		if (window != null) {
+			// If the navigation bar is translucent at all, the BottomSheet should be edge to edge
+			val drawEdgeToEdge = edgeToEdgeEnabled && Color.alpha(window.navigationBarColor) < 0xFF
+			if (drawEdgeToEdge) {
+				// Copied from super.onAttachedToWindow:
+				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+				// Fix super-class's window flag bug by respecting the initial system UI visibility:
+				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
+			}
+		}
+	}
+}

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

@@ -106,7 +106,12 @@ class TrimTransformation(
 	}
 
 	override fun equals(other: Any?): Boolean {
-		return this === other || (other is TrimTransformation && other.tolerance == tolerance)
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as TrimTransformation
+
+		return tolerance == other.tolerance
 	}
 
 	override fun hashCode(): Int {

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

@@ -0,0 +1,87 @@
+package org.koitharu.kotatsu.core.ui.list.decor
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.View
+import androidx.core.content.res.getColorOrThrow
+import androidx.core.view.children
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.R as materialR
+
+@SuppressLint("PrivateResource")
+abstract class AbstractDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
+
+	private val bounds = Rect()
+	private val thickness: Int
+	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+
+	init {
+		paint.style = Paint.Style.FILL
+		val ta = context.obtainStyledAttributes(
+			null,
+			materialR.styleable.MaterialDivider,
+			materialR.attr.materialDividerStyle,
+			materialR.style.Widget_Material3_MaterialDivider,
+		)
+		paint.color = ta.getColorOrThrow(materialR.styleable.MaterialDivider_dividerColor)
+		thickness = ta.getDimensionPixelSize(
+			materialR.styleable.MaterialDivider_dividerThickness,
+			context.resources.getDimensionPixelSize(materialR.dimen.material_divider_thickness),
+		)
+		ta.recycle()
+	}
+
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State,
+	) {
+		outRect.set(0, thickness, 0, 0)
+	}
+
+	// TODO implement for horizontal lists on demand
+	override fun onDraw(canvas: Canvas, parent: RecyclerView, s: RecyclerView.State) {
+		if (parent.layoutManager == null || thickness == 0) {
+			return
+		}
+		canvas.save()
+		val left: Float
+		val right: Float
+		if (parent.clipToPadding) {
+			left = parent.paddingLeft.toFloat()
+			right = (parent.width - parent.paddingRight).toFloat()
+			canvas.clipRect(
+				left,
+				parent.paddingTop.toFloat(),
+				right,
+				(parent.height - parent.paddingBottom).toFloat(),
+			)
+		} else {
+			left = 0f
+			right = parent.width.toFloat()
+		}
+
+		var previous: RecyclerView.ViewHolder? = null
+		for (child in parent.children) {
+			val holder = parent.getChildViewHolder(child)
+			if (previous != null && shouldDrawDivider(previous, holder)) {
+				parent.getDecoratedBoundsWithMargins(child, bounds)
+				val top: Float = bounds.top + child.translationY
+				val bottom: Float = top + thickness
+				canvas.drawRect(left, top, right, bottom, paint)
+			}
+			previous = holder
+		}
+		canvas.restore()
+	}
+
+	protected abstract fun shouldDrawDivider(
+		above: RecyclerView.ViewHolder,
+		below: RecyclerView.ViewHolder,
+	): Boolean
+}

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

@@ -19,13 +19,13 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.GravityCompat
-import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
+import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
 import kotlin.math.roundToInt
 import com.google.android.material.R as materialR
@@ -519,10 +519,10 @@ class FastScroller @JvmOverloads constructor(
 
 	private fun TypedArray.getBubbleSize(@StyleableRes index: Int, defaultValue: BubbleSize): BubbleSize {
 		val ordinal = getInt(index, -1)
-		return BubbleSize.entries.getOrNull(ordinal) ?: defaultValue
+		return BubbleSize.values().getOrNull(ordinal) ?: defaultValue
 	}
 
-	private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
+	private fun findValidParent(view: View): ViewGroup? = view.parents.firstNotNullOfOrNull { p ->
 		if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
 			p as ViewGroup
 		} else {

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

@@ -20,19 +20,38 @@ sealed class DateTimeAgo {
 		override fun equals(other: Any?): Boolean = other === JustNow
 	}
 
-	data class MinutesAgo(val minutes: Int) : DateTimeAgo() {
+	class MinutesAgo(val minutes: Int) : DateTimeAgo() {
+
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.minutes_ago, minutes, minutes)
 		}
 
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as MinutesAgo
+			return minutes == other.minutes
+		}
+
+		override fun hashCode(): Int = minutes
+
 		override fun toString() = "minutes_ago_$minutes"
 	}
 
-	data class HoursAgo(val hours: Int) : DateTimeAgo() {
+	class HoursAgo(val hours: Int) : DateTimeAgo() {
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.hours_ago, hours, hours)
 		}
 
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as HoursAgo
+			return hours == other.hours
+		}
+
+		override fun hashCode(): Int = hours
+
 		override fun toString() = "hours_ago_$hours"
 	}
 
@@ -56,15 +75,26 @@ sealed class DateTimeAgo {
 		override fun equals(other: Any?): Boolean = other === Yesterday
 	}
 
-	data class DaysAgo(val days: Int) : DateTimeAgo() {
+	class DaysAgo(val days: Int) : DateTimeAgo() {
+
 		override fun format(resources: Resources): String {
 			return resources.getQuantityString(R.plurals.days_ago, days, days)
 		}
 
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+			other as DaysAgo
+			return days == other.days
+		}
+
+		override fun hashCode(): Int = days
+
 		override fun toString() = "days_ago_$days"
 	}
 
-	data class MonthsAgo(val months: Int) : DateTimeAgo() {
+	class MonthsAgo(val months: Int) : DateTimeAgo() {
+
 		override fun format(resources: Resources): String {
 			return if (months == 0) {
 				resources.getString(R.string.this_month)
@@ -72,6 +102,19 @@ sealed class DateTimeAgo {
 				resources.getQuantityString(R.plurals.months_ago, months, months)
 			}
 		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as MonthsAgo
+
+			return months == other.months
+		}
+
+		override fun hashCode(): Int {
+			return months
+		}
 	}
 
 	class Absolute(private val date: Date) : DateTimeAgo() {

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

@@ -104,7 +104,6 @@ sealed class AdaptiveSheetBehavior {
 	companion object {
 
 		const val STATE_EXPANDED = SideSheetBehavior.STATE_EXPANDED
-		const val STATE_COLLAPSED = BottomSheetBehavior.STATE_COLLAPSED
 		const val STATE_SETTLING = SideSheetBehavior.STATE_SETTLING
 		const val STATE_DRAGGING = SideSheetBehavior.STATE_DRAGGING
 		const val STATE_HIDDEN = SideSheetBehavior.STATE_HIDDEN
@@ -115,11 +114,10 @@ sealed class AdaptiveSheetBehavior {
 			else -> null
 		}
 
-		fun from(lp: CoordinatorLayout.LayoutParams): AdaptiveSheetBehavior? =
-			when (val behavior = lp.behavior) {
-				is BottomSheetBehavior<*> -> Bottom(behavior)
-				is SideSheetBehavior<*> -> Side(behavior)
-				else -> null
-			}
+		fun from(lp: CoordinatorLayout.LayoutParams): AdaptiveSheetBehavior? = when (val behavior = lp.behavior) {
+			is BottomSheetBehavior<*> -> Bottom(behavior)
+			is SideSheetBehavior<*> -> Side(behavior)
+			else -> null
+		}
 	}
 }

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

@@ -2,19 +2,17 @@ package org.koitharu.kotatsu.core.ui.sheet
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.InputDevice
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.withStyledAttributes
-import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.LayoutSheetHeaderAdaptiveBinding
 
 class AdaptiveSheetHeaderBar @JvmOverloads constructor(
@@ -23,8 +21,7 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 	@AttrRes defStyleAttr: Int = 0,
 ) : LinearLayout(context, attrs, defStyleAttr), AdaptiveSheetCallback {
 
-	private val binding =
-		LayoutSheetHeaderAdaptiveBinding.inflate(LayoutInflater.from(context), this)
+	private val binding = LayoutSheetHeaderAdaptiveBinding.inflate(LayoutInflater.from(context), this)
 	private var sheetBehavior: AdaptiveSheetBehavior? = null
 
 	var title: CharSequence?
@@ -63,28 +60,6 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 		super.onDetachedFromWindow()
 	}
 
-	override fun onGenericMotionEvent(event: MotionEvent): Boolean {
-		val behavior = sheetBehavior ?: return super.onGenericMotionEvent(event)
-		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
-			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {
-				if (event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0f) {
-					behavior.state = if (
-						behavior is AdaptiveSheetBehavior.Bottom
-						&& behavior.state == AdaptiveSheetBehavior.STATE_EXPANDED
-					) {
-						AdaptiveSheetBehavior.STATE_COLLAPSED
-					} else {
-						AdaptiveSheetBehavior.STATE_HIDDEN
-					}
-				} else {
-					behavior.state = AdaptiveSheetBehavior.STATE_EXPANDED
-				}
-				return true
-			}
-		}
-		return super.onGenericMotionEvent(event)
-	}
-
 	override fun onStateChanged(sheet: View, newState: Int) {
 
 	}
@@ -106,9 +81,14 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 	}
 
 	private fun findParentSheetBehavior(): AdaptiveSheetBehavior? {
-		return ancestors.firstNotNullOfOrNull {
-			((it as? View)?.layoutParams as? CoordinatorLayout.LayoutParams)
-				?.let { params -> AdaptiveSheetBehavior.from(params) }
+		for (p in parents) {
+			val layoutParams = (p as? View)?.layoutParams
+			if (layoutParams is CoordinatorLayout.LayoutParams) {
+				AdaptiveSheetBehavior.from(layoutParams)?.let {
+					return it
+				}
+			}
 		}
+		return null
 	}
 }

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

@@ -25,9 +25,4 @@ class ActivityRecreationHandle @Inject constructor() : DefaultActivityLifecycleC
 		val snapshot = activities.keys.toList()
 		snapshot.forEach { ActivityCompat.recreate(it) }
 	}
-
-	fun recreate(cls: Class<out Activity>) {
-		val activity = activities.keys.find { x -> x.javaClass == cls } ?: return
-		ActivityCompat.recreate(activity)
-	}
 }

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

@@ -1,60 +0,0 @@
-package org.koitharu.kotatsu.core.ui.util
-
-import android.os.Build
-import android.view.View
-import android.view.Window
-import android.view.WindowInsets
-import android.view.WindowInsetsController
-import androidx.annotation.RequiresApi
-
-sealed class SystemUiController(
-	protected val window: Window,
-) {
-
-	abstract fun setSystemUiVisible(value: Boolean)
-
-	@RequiresApi(Build.VERSION_CODES.S)
-	private class Api30Impl(window: Window) : SystemUiController(window) {
-
-		private val insetsController = checkNotNull(window.decorView.windowInsetsController)
-
-		override fun setSystemUiVisible(value: Boolean) {
-			if (value) {
-				insetsController.show(WindowInsets.Type.systemBars())
-				insetsController.systemBarsBehavior = WindowInsetsController.BEHAVIOR_DEFAULT
-			} else {
-				insetsController.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-				insetsController.hide(WindowInsets.Type.systemBars())
-			}
-		}
-	}
-
-	@Suppress("DEPRECATION")
-	private class LegacyImpl(window: Window) : SystemUiController(window) {
-
-		override fun setSystemUiVisible(value: Boolean) {
-			window.decorView.systemUiVisibility = if (value) {
-				View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-						View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-						View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-			} else {
-				View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-						View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-						View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-						View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-						View.SYSTEM_UI_FLAG_FULLSCREEN or
-						View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-			}
-		}
-	}
-
-	companion object {
-
-		operator fun invoke(window: Window): SystemUiController =
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-				Api30Impl(window)
-			} else {
-				LegacyImpl(window)
-			}
-	}
-}

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

@@ -139,14 +139,39 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	data class ChipModel(
+	class ChipModel(
 		@ColorRes val tint: Int,
 		val title: CharSequence,
 		@DrawableRes val icon: Int,
 		val isCheckable: Boolean,
 		val isChecked: Boolean,
 		val data: Any? = null,
-	)
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as ChipModel
+
+			if (tint != other.tint) return false
+			if (title != other.title) return false
+			if (icon != other.icon) return false
+			if (isCheckable != other.isCheckable) return false
+			if (isChecked != other.isChecked) return false
+			return data == other.data
+		}
+
+		override fun hashCode(): Int {
+			var result = tint.hashCode()
+			result = 31 * result + title.hashCode()
+			result = 31 * result + icon.hashCode()
+			result = 31 * result + isCheckable.hashCode()
+			result = 31 * result + isChecked.hashCode()
+			result = 31 * result + (data?.hashCode() ?: 0)
+			return result
+		}
+	}
 
 	fun interface OnChipClickListener {
 

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

@@ -5,7 +5,6 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
 import androidx.viewpager.widget.ViewPager
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 
 @SuppressLint("ClickableViewAccessibility")
 class EnhancedViewPager @JvmOverloads constructor(
@@ -26,11 +25,6 @@ class EnhancedViewPager @JvmOverloads constructor(
 	}
 
 	override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-		return try {
-			isUserInputEnabled && super.onInterceptTouchEvent(event)
-		} catch (e: IllegalArgumentException) {
-			e.printStackTraceDebug()
-			false
-		}
+		return isUserInputEnabled && super.onInterceptTouchEvent(event)
 	}
 }

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

@@ -118,10 +118,27 @@ class SegmentedBarView @JvmOverloads constructor(
 		segmentsSizes.add(w)
 	}
 
-	data class Segment(
+	class Segment(
 		@FloatRange(from = 0.0, to = 1.0) val percent: Float,
 		@ColorInt val color: Int,
-	)
+	) {
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Segment
+
+			if (percent != other.percent) return false
+			return color == other.color
+		}
+
+		override fun hashCode(): Int {
+			var result = percent.hashCode()
+			result = 31 * result + color
+			return result
+		}
+	}
 
 	private class OutlineProvider : ViewOutlineProvider() {
 		override fun getOutline(view: View, outline: Outline) {

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

@@ -76,7 +76,7 @@ class TipView @JvmOverloads constructor(
 			val shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0).build()
 			background = MaterialShapeDrawable(shapeAppearanceModel).also {
 				it.fillColor = getColorStateList(R.styleable.TipView_cardBackgroundColor)
-					?: context.getThemeColorStateList(R.attr.m3ColorExploreButton)
+					?: context.getThemeColorStateList(materialR.attr.colorBackgroundFloating)
 				it.strokeWidth = getDimension(R.styleable.TipView_strokeWidth, 0f)
 				it.strokeColor = getColorStateList(R.styleable.TipView_strokeColor)
 				it.elevation = getDimension(R.styleable.TipView_elevation, 0f)

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

@@ -1,38 +0,0 @@
-package org.koitharu.kotatsu.core.ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.LinearLayout
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.databinding.ViewZoomBinding
-
-class ZoomControl @JvmOverloads constructor(
-	context: Context,
-	attrs: AttributeSet? = null,
-) : LinearLayout(context, attrs), View.OnClickListener {
-
-	private val binding = ViewZoomBinding.inflate(LayoutInflater.from(context), this)
-
-	var listener: ZoomControlListener? = null
-
-	init {
-		binding.buttonZoomIn.setOnClickListener(this)
-		binding.buttonZoomOut.setOnClickListener(this)
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_zoom_in -> listener?.onZoomIn()
-			R.id.button_zoom_out -> listener?.onZoomOut()
-		}
-	}
-
-	interface ZoomControlListener {
-
-		fun onZoomIn()
-
-		fun onZoomOut()
-	}
-}

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

@@ -1,43 +0,0 @@
-package org.koitharu.kotatsu.core.util
-
-import androidx.collection.ArrayMap
-import kotlinx.coroutines.sync.Mutex
-
-class CompositeMutex2<T : Any> : Set<T> {
-
-	private val delegates = ArrayMap<T, Mutex>()
-
-	override val size: Int
-		get() = delegates.size
-
-	override fun contains(element: T): Boolean {
-		return delegates.containsKey(element)
-	}
-
-	override fun containsAll(elements: Collection<T>): Boolean {
-		return elements.all { x -> delegates.containsKey(x) }
-	}
-
-	override fun isEmpty(): Boolean {
-		return delegates.isEmpty
-	}
-
-	override fun iterator(): Iterator<T> {
-		return delegates.keys.iterator()
-	}
-
-	suspend fun lock(element: T) {
-		val mutex = synchronized(delegates) {
-			delegates.getOrPut(element) {
-				Mutex()
-			}
-		}
-		mutex.lock()
-	}
-
-	fun unlock(element: T) {
-		synchronized(delegates) {
-			delegates.remove(element)?.unlock()
-		}
-	}
-}

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

@@ -8,7 +8,6 @@ import androidx.core.content.FileProvider
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.logs.FileLogger
-import org.koitharu.kotatsu.core.model.appUrl
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.io.File
 
@@ -23,8 +22,6 @@ class ShareHelper(private val context: Context) {
 			append(manga.title)
 			append("\n \n")
 			append(manga.publicUrl)
-			append("\n \n")
-			append(manga.appUrl)
 		}
 		ShareCompat.IntentBuilder(context)
 			.setText(text)

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

@@ -1,12 +1,9 @@
 package org.koitharu.kotatsu.core.util.ext
 
-import android.Manifest
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ActivityManager
 import android.app.ActivityManager.MemoryInfo
 import android.app.ActivityOptions
-import android.app.LocaleConfig
 import android.content.Context
 import android.content.Context.ACTIVITY_SERVICE
 import android.content.Context.POWER_SERVICE
@@ -14,8 +11,8 @@ import android.content.ContextWrapper
 import android.content.OperationApplicationException
 import android.content.SharedPreferences
 import android.content.SyncResult
-import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
+import android.content.res.Resources
 import android.database.SQLException
 import android.graphics.Color
 import android.net.Uri
@@ -30,8 +27,6 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.IntegerRes
 import androidx.core.app.ActivityOptionsCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
@@ -83,7 +78,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe() = callbackFlow<String?> {
+fun SharedPreferences.observe() = callbackFlow<String> {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
 		trySendBlocking(key)
 	}
@@ -102,7 +97,7 @@ fun <T> SharedPreferences.observe(key: String, valueProducer: suspend () -> T):
 	}
 }.distinctUntilChanged()
 
-fun Lifecycle.postDelayed(delay: Long, runnable: Runnable) {
+fun Lifecycle.postDelayed(runnable: Runnable, delay: Long) {
 	coroutineScope.launch {
 		delay(delay)
 		runnable.run()
@@ -177,17 +172,10 @@ fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimation
 	null
 }
 
-@SuppressLint("DiscouragedApi")
-fun Context.getLocalesConfig(): LocaleListCompat {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-		LocaleConfig(this).supportedLocales?.let {
-			return LocaleListCompat.wrap(it)
-		}
-	}
+fun Resources.getLocalesConfig(): LocaleListCompat {
 	val tagsList = StringJoiner(",")
 	try {
-		val resId = resources.getIdentifier("_generated_res_locale_config", "xml", packageName)
-		val xpp: XmlPullParser = resources.getXml(resId)
+		val xpp: XmlPullParser = getXml(R.xml.locales)
 		while (xpp.eventType != XmlPullParser.END_DOCUMENT) {
 			if (xpp.eventType == XmlPullParser.START_TAG) {
 				if (xpp.name == "locale") {
@@ -224,9 +212,3 @@ inline fun Activity.catchingWebViewUnavailability(block: () -> Unit): Boolean {
 		}
 	}
 }
-
-fun Context.checkNotificationPermission(): Boolean = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-	ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
-} else {
-	NotificationManagerCompat.from(this).areNotificationsEnabled()
-}

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

@@ -12,6 +12,7 @@ import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 import org.koitharu.kotatsu.core.ui.image.RegionBitmapDecoder
 import org.koitharu.kotatsu.core.util.progress.ImageRequestIndicatorListener
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,6 +29,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 		.data(data)
 		.lifecycle(lifecycleOwner)
 		.crossfade(context)
+		.listener(CaptchaNotifier(context.applicationContext))
 		.target(this)
 }
 
@@ -63,11 +65,11 @@ fun ImageResult.toBitmapOrNull() = when (this) {
 }
 
 fun ImageRequest.Builder.indicator(indicator: BaseProgressIndicator<*>): ImageRequest.Builder {
-	return addListener(ImageRequestIndicatorListener(listOf(indicator)))
+	return listener(ImageRequestIndicatorListener(listOf(indicator)))
 }
 
 fun ImageRequest.Builder.indicator(indicators: List<BaseProgressIndicator<*>>): ImageRequest.Builder {
-	return addListener(ImageRequestIndicatorListener(indicators))
+	return listener(ImageRequestIndicatorListener(indicators))
 }
 
 fun ImageRequest.Builder.decodeRegion(
@@ -84,30 +86,3 @@ fun ImageRequest.Builder.crossfade(context: Context): ImageRequest.Builder {
 fun ImageRequest.Builder.source(source: MangaSource?): ImageRequest.Builder {
 	return tag(MangaSource::class.java, source)
 }
-
-fun ImageRequest.Builder.addListener(listener: ImageRequest.Listener): ImageRequest.Builder {
-	val existing = build().listener
-	return listener(
-		when (existing) {
-			null -> listener
-			is CompositeImageRequestListener -> existing + listener
-			else -> CompositeImageRequestListener(arrayOf(existing, listener))
-		},
-	)
-}
-
-private class CompositeImageRequestListener(
-	private val delegates: Array<ImageRequest.Listener>,
-) : ImageRequest.Listener {
-
-	override fun onCancel(request: ImageRequest) = delegates.forEach { it.onCancel(request) }
-
-	override fun onError(request: ImageRequest, result: ErrorResult) = delegates.forEach { it.onError(request, result) }
-
-	override fun onStart(request: ImageRequest) = delegates.forEach { it.onStart(request) }
-
-	override fun onSuccess(request: ImageRequest, result: SuccessResult) =
-		delegates.forEach { it.onSuccess(request, result) }
-
-	operator fun plus(other: ImageRequest.Listener) = CompositeImageRequestListener(delegates + other)
-}

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

@@ -5,6 +5,15 @@ import androidx.collection.ArraySet
 import java.util.Collections
 import java.util.EnumSet
 
+@Deprecated("TODO: remove")
+fun <T> MutableList<T>.move(sourceIndex: Int, targetIndex: Int) {
+	if (sourceIndex <= targetIndex) {
+		Collections.rotate(subList(sourceIndex, targetIndex + 1), -1)
+	} else {
+		Collections.rotate(subList(targetIndex, sourceIndex + 1), 1)
+	}
+}
+
 inline fun <T> MutableSet(size: Int, init: (index: Int) -> T): MutableSet<T> {
 	val set = ArraySet<T>(size)
 	repeat(size) { index -> set.add(init(index)) }
@@ -32,6 +41,10 @@ fun <K, V> Map<K, V>.findKeyByValue(value: V): K? {
 	return null
 }
 
+inline fun <T> Collection<T>.filterToSet(predicate: (T) -> Boolean): Set<T> {
+	return filterTo(ArraySet(size), predicate)
+}
+
 fun <T> Sequence<T>.toListSorted(comparator: Comparator<T>): List<T> {
 	return toMutableList().apply { sortWith(comparator) }
 }

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

@@ -10,7 +10,6 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.lifecycle.RetainedLifecycle
 import kotlinx.coroutines.CancellableContinuation
-import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
@@ -71,11 +70,3 @@ private fun Lifecycle.removeObserverFromAnyThread(observer: LifecycleObserver) {
 		removeObserver(observer)
 	}
 }
-
-fun <T> Deferred<T>.getCompletionResultOrNull(): Result<T>? = if (isCompleted) {
-	getCompletionExceptionOrNull()?.let { error ->
-		Result.failure(error)
-	} ?: Result.success(getCompleted())
-} else {
-	null
-}

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

@@ -13,13 +13,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.fs.FileSequence
 import java.io.File
 import java.io.FileFilter
-import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
-import kotlin.io.path.readAttributes
 
 fun File.subdir(name: String) = File(this, name).also {
 	if (!it.exists()) it.mkdirs()
@@ -76,10 +73,11 @@ suspend fun File.computeSize(): Long = runInterruptible(Dispatchers.IO) {
 
 @WorkerThread
 private fun computeSizeInternal(file: File): Long {
-	return if (file.isDirectory) {
-		file.children().sumOf { computeSizeInternal(it) }
+	if (file.isDirectory) {
+		val files = file.listFiles() ?: return 0L
+		return files.sumOf { computeSizeInternal(it) }
 	} else {
-		file.length()
+		return file.length()
 	}
 }
 
@@ -88,8 +86,9 @@ fun File.listFilesRecursive(filter: FileFilter? = null): Sequence<File> = sequen
 }
 
 private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filter: FileFilter?) {
-	val ss = root.children()
-	for (f in ss) {
+	val ss = root.list() ?: return
+	for (s in ss) {
+		val f = File(root, s)
 		if (f.isDirectory) {
 			listFilesRecursiveImpl(f, filter)
 		} else if (filter == null || filter.accept(f)) {
@@ -97,14 +96,3 @@ private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filte
 		}
 	}
 }
-
-fun File.children() = FileSequence(this)
-
-fun Sequence<File>.filterWith(filter: FileFilter): Sequence<File> = filter { f -> filter.accept(f) }
-
-val File.creationTime
-	get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-		toPath().readAttributes<BasicFileAttributes>().creationTime().toMillis()
-	} else {
-		lastModified()
-	}

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

@@ -5,8 +5,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onCompletion
@@ -74,7 +72,7 @@ fun <T1, T2, T3, T4, T5, T6, R> combine(
 	flow4: Flow<T4>,
 	flow5: Flow<T5>,
 	flow6: Flow<T6>,
-	transform: suspend (T1, T2, T3, T4, T5, T6) -> R,
+	transform: suspend (T1, T2, T3, T4, T5, T6) -> R
 ): Flow<R> = combine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> ->
 	transform(
 		args[0] as T1,
@@ -85,7 +83,3 @@ fun <T1, T2, T3, T4, T5, T6, R> combine(
 		args[5] as T6,
 	)
 }
-
-suspend fun <T : Any> Flow<T?>.firstNotNull(): T = checkNotNull(first { x -> x != null })
-
-suspend fun <T : Any> Flow<T?>.firstNotNullOrNull(): T? = firstOrNull { x -> x != null }

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

@@ -4,7 +4,7 @@ import androidx.annotation.FloatRange
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
 import java.util.UUID
 
-inline fun <C : CharSequence?> C?.ifNullOrEmpty(defaultValue: () -> C): C {
+inline fun <C : CharSequence> C?.ifNullOrEmpty(defaultValue: () -> C): C {
 	return if (this.isNullOrEmpty()) defaultValue() else this
 }
 

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

@@ -9,6 +9,8 @@ import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
 import androidx.annotation.Px
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.content.res.TypedArrayUtils
 import androidx.core.content.res.use
 import androidx.core.graphics.ColorUtils
 

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

@@ -3,9 +3,7 @@ package org.koitharu.kotatsu.core.util.ext
 import android.content.ActivityNotFoundException
 import android.content.res.Resources
 import android.util.AndroidRuntimeException
-import androidx.annotation.DrawableRes
 import androidx.collection.arraySetOf
-import coil.network.HttpException
 import okio.FileNotFoundException
 import okio.IOException
 import org.acra.ktx.sendWithAcra
@@ -16,7 +14,6 @@ import org.koitharu.kotatsu.core.exceptions.CaughtException
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.exceptions.SyncApiException
-import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
@@ -27,7 +24,6 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
 private const val MSG_NO_SPACE_LEFT = "No space left on device"
-private const val IMAGE_FORMAT_NO_SUPPORTED = "Image format not supported"
 
 fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
@@ -36,7 +32,6 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is UnsupportedOperationException,
 	-> resources.getString(R.string.operation_not_supported)
 
-	is TooManyRequestExceptions -> resources.getString(R.string.too_many_requests_message)
 	is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)
 	is FileNotFoundException -> resources.getString(R.string.file_not_found)
 	is AccessDeniedException -> resources.getString(R.string.no_access_to_file)
@@ -53,8 +48,10 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	is NotFoundException -> resources.getString(R.string.not_found_404)
 
-	is HttpException -> getHttpDisplayMessage(response.code, resources)
-	is HttpStatusException -> getHttpDisplayMessage(statusCode, resources)
+	is HttpStatusException -> when (statusCode) {
+		in 500..599 -> resources.getString(R.string.server_error, statusCode)
+		else -> localizedMessage
+	}
 
 	is IOException -> getDisplayMessage(message, resources) ?: localizedMessage
 	else -> localizedMessage
@@ -62,27 +59,9 @@ fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	resources.getString(R.string.error_occurred)
 }
 
-@DrawableRes
-fun Throwable.getDisplayIcon() = when (this) {
-	is AuthRequiredException -> R.drawable.ic_auth_key_large
-	is CloudFlareProtectedException -> R.drawable.ic_bot_large
-	is UnknownHostException,
-	is SocketTimeoutException,
-	-> R.drawable.ic_plug_large
-
-	else -> R.drawable.ic_error_large
-}
-
-private fun getHttpDisplayMessage(statusCode: Int, resources: Resources): String? = when (statusCode) {
-	404 -> resources.getString(R.string.not_found_404)
-	in 500..599 -> resources.getString(R.string.server_error, statusCode)
-	else -> null
-}
-
 private fun getDisplayMessage(msg: String?, resources: Resources): String? = when {
 	msg.isNullOrEmpty() -> null
 	msg.contains(MSG_NO_SPACE_LEFT) -> resources.getString(R.string.error_no_space_left)
-	msg.contains(IMAGE_FORMAT_NO_SUPPORTED) -> resources.getString(R.string.error_corrupted_file)
 	else -> null
 }
 

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

@@ -2,18 +2,15 @@ package org.koitharu.kotatsu.core.util.ext
 
 import android.app.Activity
 import android.graphics.Rect
-import android.os.Build
 import android.view.View
 import android.view.View.MeasureSpec
 import android.view.ViewGroup
+import android.view.ViewParent
 import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
 import androidx.core.view.children
-import androidx.core.view.descendants
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
 import com.google.android.material.tabs.TabLayout
 import kotlin.math.roundToInt
@@ -90,8 +87,23 @@ fun Slider.setValueRounded(newValue: Float) {
 	value = roundedValue.coerceIn(valueFrom, valueTo)
 }
 
+fun <T : View> ViewGroup.findViewsByType(clazz: Class<T>): Sequence<T> {
+	if (childCount == 0) {
+		return emptySequence()
+	}
+	return sequence {
+		for (view in children) {
+			if (clazz.isInstance(view)) {
+				yield(clazz.cast(view)!!)
+			} else if (view is ViewGroup && view.childCount != 0) {
+				yieldAll(view.findViewsByType(clazz))
+			}
+		}
+	}
+}
+
 fun RecyclerView.invalidateNestedItemDecorations() {
-	descendants.filterIsInstance<RecyclerView>().forEach {
+	findViewsByType(RecyclerView::class.java).forEach {
 		it.invalidateItemDecorations()
 	}
 }
@@ -99,6 +111,15 @@ fun RecyclerView.invalidateNestedItemDecorations() {
 val View.parentView: ViewGroup?
 	get() = parent as? ViewGroup
 
+val View.parents: Sequence<ViewParent>
+	get() = sequence {
+		var p: ViewParent? = parent
+		while (p != null) {
+			yield(p)
+			p = p.parent
+		}
+	}
+
 fun View.measureDimension(desiredSize: Int, measureSpec: Int): Int {
 	var result: Int
 	val specMode = MeasureSpec.getMode(measureSpec)
@@ -133,17 +154,3 @@ fun TabLayout.setTabsEnabled(enabled: Boolean) {
 		getTabAt(i)?.view?.isEnabled = enabled
 	}
 }
-
-fun BaseProgressIndicator<*>.showOrHide(value: Boolean) {
-	if (value) {
-		if (!isVisible) show()
-	} else {
-		if (isVisible) hide()
-	}
-}
-
-fun View.setOnContextClickListenerCompat(listener: View.OnLongClickListener) {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-		setOnContextClickListener(listener::onLongClick)
-	}
-}

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

@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.core.util.iterator
-
-import okhttp3.internal.closeQuietly
-import okio.Closeable
-
-class CloseableIterator<T>(
-	private val upstream: Iterator<T>,
-	private val closeable: Closeable,
-) : Iterator<T>, Closeable {
-
-	private var isClosed = false
-
-	override fun hasNext(): Boolean {
-		val result = upstream.hasNext()
-		if (!result) {
-			close()
-		}
-		return result
-	}
-
-	override fun next(): T {
-		try {
-			return upstream.next()
-		} catch (e: NoSuchElementException) {
-			close()
-			throw e
-		}
-	}
-
-	override fun close() {
-		if (!isClosed) {
-			closeable.closeQuietly()
-			isClosed = true
-		}
-	}
-}

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

@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.util.iterator
-
-import org.koitharu.kotatsu.R
-
-class MappingIterator<T, R>(
-	private val upstream: Iterator<T>,
-	private val mapper: (T) -> R,
-) : Iterator<R> {
-
-	override fun hasNext(): Boolean = upstream.hasNext()
-
-	override fun next(): R = mapper(upstream.next())
-}

app/src/main/kotlin/org/koitharu/kotatsu/core/zip/ZipOutput.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.zip
 import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import okio.Closeable
-import org.koitharu.kotatsu.core.util.ext.children
 import java.io.File
 import java.io.FileInputStream
 import java.util.zip.Deflater
@@ -91,7 +90,7 @@ class ZipOutput(
 			}
 			putNextEntry(entry)
 			closeEntry()
-			fileToZip.children().forEach { childFile ->
+			fileToZip.listFiles()?.forEach { childFile ->
 				appendFile(childFile, "$name/${childFile.name}")
 			}
 		} else {