Fix build

Release signing config
Release build workflow
2025-01-22 20:35:51 +02:00 · 2025-01-22 20:27:30 +02:00 · 2025-01-22 20:22:03 +02:00 · 2025-01-22 20:22:02 +02:00
653 changed files with 7947 additions and 15102 deletions
--- a/.github/assets/vtuber.png
+++ b/.github/assets/vtuber.png
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@@ -0,0 +1,114 @@
+name: Build automatic release
+
+on:
+    schedule:
+        -   cron: '0 0 * * *'
+    workflow_dispatch:
+
+jobs:
+    check:
+        runs-on: ubuntu-24.04
+        outputs:
+            should_build: ${{ steps.check-updates.outputs.has_changes }}
+        steps:
+            -   name: Check for updates 🌏
+                id: check-updates
+                run: |
+                    last_run=$(curl -s "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r '.created_at')
+                    kotatsu_updated=$(curl -s "https://api.github.com/repos/KotatsuApp/Kotatsu/commits?since=$last_run" | jq '. | length')
+                    parsers_updated=$(curl -s "https://api.github.com/repos/KotatsuApp/kotatsu-parsers/commits?since=$last_run" | jq '. | length')
+                    if [ "$kotatsu_updated" -gt "0" ] || [ "$parsers_updated" -gt "0" ]; then
+                      echo "has_changes=true" >> $GITHUB_OUTPUT
+                    else
+                      echo "has_changes=false" >> $GITHUB_OUTPUT
+                    fi
+
+    build:
+        needs: check
+        if: needs.check.outputs.should_build == 'true'
+        runs-on: ubuntu-24.04
+        outputs:
+            new_tag: ${{ steps.tagger.outputs.new_tag }}
+        steps:
+            -   uses: actions/checkout@v3
+                with:
+                    ref: autobuild
+
+            -   uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: '17'
+                    cache: 'gradle'
+
+            -   name: Setup Android SDK 💻
+                uses: android-actions/setup-android@v3
+
+            -   name: Grant permissions 💻
+                run: chmod a+x gradlew
+
+            -   name: Generate build number 📆
+                id: tagger
+                run: |
+                    echo "new_tag=$(./gradlew -q versionInfo -DbuildNumberIncrement=true)" >> $GITHUB_OUTPUT
+                    echo "formatted_date=$(date +'%Y/%m/%d')" >> $GITHUB_OUTPUT
+
+            -   name: Decode Keystore
+                id: decode_keystore
+                uses: timheuer/base64-to-file@v1
+                with:
+                    fileName: 'keystore/kotatsu.jks'
+                    encodedString: ${{ secrets.ANDROID_SIGNING_KEY }}
+
+            -   name: Building new APK 💻
+                run: >-
+                    ./gradlew assembleRelease
+                    -DparsersVersionOverride=$(curl -s https://api.github.com/repos/kotatsuapp/kotatsu-parsers/commits/master -H "Accept: application/vnd.github.sha" | cut -c -10)
+
+            -   name: Prepare to Upload 🌏
+                run: |
+                    mv ${{steps.sign_app.outputs.signedFile}} app/build/outputs/apk/release/release.apk
+                    echo "SIGNED_APK=app/build/outputs/apk/release/release.apk" >> $GITHUB_ENV
+
+            -   name: Get latest changes 📑
+                id: changelog
+                run: |
+                    CHANGELOG=$(cat CHANGELOG.txt)
+                    echo "content<<EOF" >> $GITHUB_OUTPUT
+                    echo "$CHANGELOG" >> $GITHUB_OUTPUT
+                    echo "EOF" >> $GITHUB_OUTPUT
+
+            -   name: Create new GH Release + Uploading 🌏
+                uses: softprops/action-gh-release@v2
+                with:
+                    tag_name: v${{ steps.tagger.outputs.new_tag }}
+                    name: "Build ${{ steps.tagger.outputs.new_tag }}"
+                    body: |
+                        Automated build generated on ${{ steps.tagger.outputs.formatted_date }}
+                        
+                        ${{ steps.changelog.outputs.content }}
+                    files: ${{ env.SIGNED_APK }}
+                    prerelease: false
+
+    update:
+        needs: build
+        if: needs.check.outputs.should_build == 'true'
+        runs-on: ubuntu-24.04
+        permissions:
+            contents: write
+        steps:
+            -   uses: actions/checkout@v3
+                with:
+                    ref: autobuild
+                    fetch-depth: 0
+
+            -   name: Commit 🌏
+                run: |
+                    git config --local user.email "autorelease@users.noreply.github.com"
+                    git config --local user.name "autorelease"
+                    if [[ -n $(git status -s) ]]; then
+                      git add README.md
+                      git commit -m "Automatic release v${{ needs.build.outputs.new_tag }}"
+                      git push origin autobuild
+                    else
+                      echo "No changes to push!"
+                    fi
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,4 @@
 .cxx
 /.idea/deviceManager.xml
 /.kotlin/
-/.idea/AndroidProjectSystem.xml
+/.idea/AndroidProjectSystem.xml
--- a/.idea/AndroidProjectSystem.xml
+++ b/.idea/AndroidProjectSystem.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,13 +6,14 @@
      <GradleProjectSettings>
        <option name="testRunner" value="CHOOSE_PER_TEST" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-21" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/README.md
+++ b/README.md
@@ -1,107 +1,57 @@
-<div align="center">
+# Kotatsu

-<a href="https://kotatsu.app">
-    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
-</a>
+Kotatsu is a free and open-source manga reader for Android with built-in online content sources.

-# [Kotatsu](https://kotatsu.app)
-
-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.**
-
-![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)
+[![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) ![F-Droid Version](https://img.shields.io/f-droid/v/org.koitharu.kotatsu) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE)

 ### Download

-<div align="left">
-
-* **Recommended:** Download and install APK from [GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest). Application has a built-in self-updating feature.
-* Get it on [F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu). The F-Droid build may be a bit outdated and some fixes might be missing.
-* Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (very unstable, use at your own risk).
-
-</div>
+- **Recommended:** Download and install APK from **[GitHub Releases](https://github.com/KotatsuApp/Kotatsu/releases/latest)**. Application has a built-in self-updating feature.
+- Get it on **[F-Droid](https://f-droid.org/packages/org.koitharu.kotatsu)**. The F-Droid build may be a bit outdated and some fixes might be missing.
+- Also [nightly builds](https://github.com/KotatsuApp/Kotatsu-nightly/releases) are available (very unstable, use at your own risk). 

 ### Main Features

-<div align="left">
-
-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1100+ manga sources)
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
 * Search manga by name, genres, and more filters
+* Reading history and bookmarks
 * Favorites organized by user-defined categories
-* Reading history, bookmarks, and incognito mode support
-* Download manga and read it offline. Third-party CBZ archives are also supported
-* Clean and convenient Material You UI, optimized for phones, tablets, and desktop
-* Standard and Webtoon-optimized customizable reader, gesture support on reading interface
-* Notifications about new chapters with updates feed, manga recommendations (with filters)
+* Downloading manga and reading it offline. Third-party CBZ archives also supported
+* Tablet-optimized Material You UI
+* Standard and Webtoon-optimized customizable reader
+* Notifications about new chapters with updates feed
 * Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
-* Password / fingerprint-protected access to the app
-* Automatically sync app data with other devices on the same account
-* Support for older devices running Android 5+
+* Password/fingerprint-protected access to the app

-</div>
+### Screenshots

-### In-App Screenshots
+| ![Screenshot_20200226-210337](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/2.png)                           | ![Screenshot_20200226-210232](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/3.png) |
+|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
+| ![Screenshot_20200226-210405](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/4.png) | ![Screenshot_20200226-210151](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/5.png) | ![Screenshot_20200226-210223](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/phoneScreenshots/6.png) |

-<div align="center">
-    <img src="./metadata/en-US/images/phoneScreenshots/1.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/2.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/3.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/4.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/5.png" alt="Mobile view" width="250"/>
-    <img src="./metadata/en-US/images/phoneScreenshots/6.png" alt="Mobile view" width="250"/>
-</div>
-
-<br>
-
-<div align="center">
-    <img src="./metadata/en-US/images/tenInchScreenshots/1.png" alt="Tablet view" width="400"/>
-    <img src="./metadata/en-US/images/tenInchScreenshots/2.png" alt="Tablet view" width="400"/>
-</div>
+| ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/1.png) | ![](https://github.com/KotatsuApp/Kotatsu/raw/devel/metadata/en-US/images/tenInchScreenshots/2.png) |
+|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|

 ### Localization

-<a href="https://hosted.weblate.org/engage/kotatsu/">
-<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.png" alt="Translation status" />
-</a>
+[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)

-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
-**📌 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/)**
+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

-<br>
-
-<a href="https://github.com/KotatsuApp/Kotatsu">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu GitHub Repository">
-  </picture>
-</a>
-<a href="https://github.com/KotatsuApp/Kotatsu-parsers">
-  <picture>
-    <source srcset="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&bg_color=0d1117&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" media="(prefers-color-scheme: dark)">
-    <img src="https://github-readme-stats.vercel.app/api/pin/?username=KotatsuApp&repo=Kotatsu-parsers&text_color=1976d2&title_color=1976d2&icon_color=0877d2&border_radius=10&description_lines_count=2&show_owner=true" alt="Kotatsu-parsers GitHub Repository">
-  </picture>
-</a><br></br>
-
-</br>
-
-**📌 Pull requests are welcome, if you want: See [CONTRIBUTING.md](https://github.com/KotatsuApp/Kotatsu/blob/devel/CONTRIBUTING.md) for the guidelines**
+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)

-<div align="left">
-
-You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build & install instructions.
-
-</div>
+You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications
+to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &
+install instructions.

 ### DMCA disclaimer

-<div align="left">
-
-The developers of this application do not have any affiliation with the content available in the app. It collects content from sources that are freely available through any web browser.
-
-</div>
+The developers of this application do not have any affiliation with the content available in the app.
+It collects content from sources that are freely available through any web browser
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,29 +7,52 @@ plugins {
 	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
-	id 'androidx.room'
 }

+def Properties versionProps = getVersionProps()
+
 android {
 	compileSdk = 35
 	buildToolsVersion = '35.0.0'
 	namespace = 'org.koitharu.kotatsu'

 	defaultConfig {
+		def code = versionProps['code'].toInteger()
+		def base = versionProps['base'].trim()
+		def build = versionProps['build'].toInteger()
+		def variant = versionProps['variant'].trim()
+
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 35
-		versionCode = 1010
-		versionName = '8.1.4'
+		versionCode = code * 1000 + build
+		versionName = base + (build == 0 ? '' : '.' + build) + (variant == '' ? '' : '-') + variant
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
 			arg('room.generateKotlin', 'true')
+			arg('room.schemaLocation', "$projectDir/schemas")
 		}
 		androidResources {
 			generateLocaleConfig true
 		}
 	}
+	signingConfigs {
+		release {
+			def tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+			def allFilesFromDir = new File(tmpFilePath).listFiles()
+
+			if (allFilesFromDir != null) {
+				def keystoreFile = allFilesFromDir.first()
+				keystoreFile.renameTo("keystore/kotatsu.jks")
+			}
+
+			storeFile = file("keystore/kotatsu.jks")
+			storePassword System.getenv("SIGNING_STORE_PASSWORD")
+			keyAlias System.getenv("SIGNING_KEY_ALIAS")
+			keyPassword System.getenv("SIGNING_KEY_PASSWORD")
+		}
+	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
@@ -38,6 +61,7 @@ android {
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+			signingConfig signingConfigs.release
 		}
 		nightly {
 			initWith release
@@ -74,14 +98,8 @@ android {
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
 			'-opt-in=coil3.annotation.ExperimentalCoilApi',
-			'-opt-in=coil3.annotation.InternalCoilApi',
-			'-Xjspecify-annotations=strict',
-			'-Xtype-enhancement-improvements-strict-mode',
 		]
 	}
-	room {
-		schemaDirectory "$projectDir/schemas"
-	}
 	lint {
 		abortOnError true
 		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
@@ -200,3 +218,22 @@ dependencies {
 	androidTestImplementation libs.hilt.android.testing
 	kaptAndroidTest libs.hilt.android.compiler
 }
+
+tasks.register('versionInfo') {
+	def base = versionProps['base'].trim()
+	def build = versionProps['build'].toInteger()
+	def variant = versionProps['variant'].trim()
+	println base + (build == 0 ? '' : '.' + build) + (variant == '' ? '' : '-') + variant
+}
+
+def getVersionProps() {
+	def versionPropsFile = file('version.properties')
+	def Properties versionProps = new Properties()
+	versionProps.load(new FileInputStream(versionPropsFile))
+	if (System.getProperty('buildNumberIncrement') == 'true') {
+		def code = versionProps['build'].toInteger() + 1
+		versionProps['build'] = code.toString()
+		versionProps.store(versionPropsFile.newWriter(), null)
+	}
+	return versionProps
+}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt
@@ -1,37 +1,21 @@
 package org.koitharu.kotatsu

 import android.content.Context
-import android.content.SharedPreferences
 import android.os.Build
 import android.os.StrictMode
-import androidx.core.content.edit
 import androidx.fragment.app.strictmode.FragmentStrictMode
-import leakcanary.LeakCanary
 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
+import org.koitharu.kotatsu.reader.ui.ReaderViewModel

 class KotatsuApp : BaseApp() {

-	var isLeakCanaryEnabled: Boolean
-		get() = getDebugPreferences(this).getBoolean(KEY_LEAK_CANARY, true)
-		set(value) {
-			getDebugPreferences(this).edit { putBoolean(KEY_LEAK_CANARY, value) }
-			configureLeakCanary()
-		}
-
 	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		enableStrictMode()
-		configureLeakCanary()
-	}
-
-	private fun configureLeakCanary() {
-		LeakCanary.config = LeakCanary.config.copy(
-			dumpHeap = isLeakCanaryEnabled,
-		)
 	}

 	private fun enableStrictMode() {
@@ -66,11 +50,12 @@ class KotatsuApp : BaseApp() {
 				setClassInstanceLimit(PagesCache::class.java, 1)
 				setClassInstanceLimit(MangaLoaderContext::class.java, 1)
 				setClassInstanceLimit(PageLoader::class.java, 1)
+				setClassInstanceLimit(ReaderViewModel::class.java, 1)
 				penaltyLog()
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
 					penaltyListener(notifier.executor, notifier)
 				}
-			}.build(),
+			}.build()
 		)
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
 			detectWrongFragmentContainer()
@@ -85,13 +70,4 @@ class KotatsuApp : BaseApp() {
 			}
 		}.build()
 	}
-
-	private companion object {
-
-		const val PREFS_DEBUG = "_debug"
-		const val KEY_LEAK_CANARY = "leak_canary"
-
-		fun getDebugPreferences(context: Context): SharedPreferences =
-			context.getSharedPreferences(PREFS_DEBUG, MODE_PRIVATE)
-	}
 }
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/StrictModeNotifier.kt
@@ -55,7 +55,7 @@ class StrictModeNotifier(
 		.setContentIntent(
 			PendingIntentCompat.getActivity(
 				context,
-				violation.hashCode(),
+				0,
 				ShareHelper(context).getShareTextIntent(violation.stackTraceToString()),
 				0,
 				false,
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/core/ui/BaseService.kt
@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.core.ui
-
-import android.content.Context
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.LifecycleService
-import leakcanary.AppWatcher
-
-abstract class BaseService : LifecycleService() {
-
-	override fun attachBaseContext(newBase: Context) {
-		super.attachBaseContext(ContextCompat.getContextForLanguage(newBase))
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		AppWatcher.objectWatcher.watch(
-			watchedObject = this,
-			description = "${javaClass.simpleName} service received Service#onDestroy() callback",
-		)
-	}
-}
--- a/app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt
+++ b/app/src/debug/kotlin/org/koitharu/kotatsu/settings/SettingsMenuProvider.kt
@@ -5,9 +5,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
-import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import leakcanary.LeakCanary
-import org.koitharu.kotatsu.KotatsuApp
 import org.koitharu.kotatsu.R
 import org.koitharu.workinspector.WorkInspector

@@ -15,19 +13,10 @@ class SettingsMenuProvider(
 	private val context: Context,
 ) : MenuProvider {

-	private val application: KotatsuApp
-		get() = context.applicationContext as KotatsuApp
-
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_settings, menu)
 	}

-	override fun onPrepareMenu(menu: Menu) {
-		super.onPrepareMenu(menu)
-		menu.findItem(R.id.action_leakcanary).isChecked = application.isLeakCanaryEnabled
-		menu.findItem(R.id.action_ssiv_debug).isChecked = SubsamplingScaleImageView.isDebug
-	}
-
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
 		R.id.action_leaks -> {
 			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
@@ -39,20 +28,6 @@ class SettingsMenuProvider(
 			true
 		}

-		R.id.action_leakcanary -> {
-			val checked = !menuItem.isChecked
-			menuItem.isChecked = checked
-			application.isLeakCanaryEnabled = checked
-			true
-		}
-
-		R.id.action_ssiv_debug -> {
-			val checked = !menuItem.isChecked
-			menuItem.isChecked = checked
-			SubsamplingScaleImageView.isDebug = checked
-			true
-		}
-
 		else -> false
 	}
 }
--- a/app/src/debug/res/menu/opt_settings.xml
+++ b/app/src/debug/res/menu/opt_settings.xml
@@ -1,29 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools">
+	xmlns:app="http://schemas.android.com/apk/res-auto">

 	<item
-		android:id="@+id/action_ssiv_debug"
-		android:checkable="true"
-		android:title="SSIV debug"
-		app:showAsAction="never"
-		tools:ignore="HardcodedText" />
-	<item
-		android:id="@+id/action_leakcanary"
-		android:checkable="true"
-		android:title="LeakCanary"
-		app:showAsAction="never"
-		tools:ignore="HardcodedText" />
-
-	<item
-		android:id="@+id/action_leaks"
+		android:id="@id/action_leaks"
 		android:title="@string/leak_canary_display_activity_label"
 		app:showAsAction="never" />

 	<item
-		android:id="@+id/action_works"
+		android:id="@id/action_works"
 		android:title="@string/wi_lib_name"
 		app:showAsAction="never" />

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,6 @@
 		android:enableOnBackInvokedCallback="@bool/is_predictive_back_enabled"
 		android:fullBackupContent="@xml/backup_content"
 		android:fullBackupOnly="true"
-		android:hasFragileUserData="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:largeHeap="true"
@@ -281,10 +280,6 @@
 		<service
 			android:name="org.koitharu.kotatsu.local.ui.LocalIndexUpdateService"
 			android:label="@string/local_manga_processing" />
-		<service
-			android:name="org.koitharu.kotatsu.settings.backup.RestoreService"
-			android:foregroundServiceType="dataSync"
-			android:label="@string/restore_backup" />
 		<service
 			android:name="org.koitharu.kotatsu.local.ui.ImportService"
 			android:foregroundServiceType="dataSync"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AlternativesUseCase.kt
@@ -3,76 +3,88 @@ package org.koitharu.kotatsu.alternatives.domain
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.almostEquals
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.search.domain.SearchKind
-import org.koitharu.kotatsu.search.domain.SearchV2Helper
-import java.util.Locale
 import javax.inject.Inject

 private const val MAX_PARALLELISM = 4
+private const val MATCH_THRESHOLD_DEFAULT = 0.2f

 class AlternativesUseCase @Inject constructor(
 	private val sourcesRepository: MangaSourcesRepository,
-	private val searchHelperFactory: SearchV2Helper.Factory,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 ) {

-	suspend operator fun invoke(manga: Manga, throughDisabledSources: Boolean): Flow<Manga> {
-		val sources = getSources(manga.source, throughDisabledSources)
+	suspend operator fun invoke(manga: Manga): Flow<Manga> = invoke(manga, MATCH_THRESHOLD_DEFAULT)
+
+	suspend operator fun invoke(manga: Manga, matchThreshold: Float): Flow<Manga> {
+		val sources = getSources(manga.source)
 		if (sources.isEmpty()) {
 			return emptyFlow()
 		}
 		val semaphore = Semaphore(MAX_PARALLELISM)
 		return channelFlow {
 			for (source in sources) {
+				val repository = mangaRepositoryFactory.create(source)
+				if (!repository.filterCapabilities.isSearchSupported) {
+					continue
+				}
 				launch {
-					val searchHelper = searchHelperFactory.create(source)
 					val list = runCatchingCancellable {
 						semaphore.withPermit {
-							searchHelper(manga.title, SearchKind.TITLE)?.manga
+							repository.getList(offset = 0, SortOrder.RELEVANCE, MangaListFilter(query = manga.title))
 						}
-					}.getOrNull()
-					list?.forEach { m ->
-						if (m.id != manga.id) {
-							launch {
-								val details = runCatchingCancellable {
-									mangaRepositoryFactory.create(m.source).getDetails(m)
-								}.getOrDefault(m)
-								send(details)
-							}
+					}.getOrDefault(emptyList())
+					for (item in list) {
+						if (item.matches(manga, matchThreshold)) {
+							send(item)
 						}
 					}
 				}
 			}
+		}.map {
+			runCatchingCancellable {
+				mangaRepositoryFactory.create(it.source).getDetails(it)
+			}.getOrDefault(it)
 		}
 	}

-	private suspend fun getSources(ref: MangaSource, disabled: Boolean): List<MangaSource> = if (disabled) {
-		sourcesRepository.getDisabledSources()
-	} else {
-		sourcesRepository.getEnabledSources()
-	}.sortedByDescending { it.priority(ref) }
+	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
+		val result = ArrayList<MangaSource>(MangaParserSource.entries.size - 2)
+		result.addAll(sourcesRepository.getEnabledSources())
+		result.sortByDescending { it.priority(ref) }
+		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
+		return result
+	}
+
+	private fun Manga.matches(ref: Manga, threshold: Float): Boolean {
+		return matchesTitles(title, ref.title, threshold) ||
+			matchesTitles(title, ref.altTitle, threshold) ||
+			matchesTitles(altTitle, ref.title, threshold) ||
+			matchesTitles(altTitle, ref.altTitle, threshold)
+
+	}
+
+	private fun matchesTitles(a: String?, b: String?, threshold: Float): Boolean {
+		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, threshold)
+	}

 	private fun MangaSource.priority(ref: MangaSource): Int {
 		var res = 0
 		if (this is MangaParserSource && ref is MangaParserSource) {
-			if (locale == ref.locale) {
-				res += 4
-			} else if (locale.toLocale() == Locale.getDefault()) {
-				res += 2
-			}
-			if (contentType == ref.contentType) {
-				res++
-			}
+			if (locale == ref.locale) res += 2
+			if (contentType == ref.contentType) res++
 		}
 		return res
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/domain/AutoFixUseCase.kt
@@ -15,7 +15,6 @@ import org.koitharu.kotatsu.core.model.chaptersCount
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.util.ext.concat
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.util.concurrent.TimeUnit
@@ -30,14 +29,12 @@ class AutoFixUseCase @Inject constructor(
 ) {

 	suspend operator fun invoke(mangaId: Long): Pair<Manga, Manga?> {
-		val seed = checkNotNull(
-			mangaDataRepository.findMangaById(mangaId, withChapters = true),
-		) { "Manga $mangaId not found" }.getDetailsSafe()
+		val seed = checkNotNull(mangaDataRepository.findMangaById(mangaId)) { "Manga $mangaId not found" }
+			.getDetailsSafe()
 		if (seed.isHealthy()) {
 			return seed to null // no fix required
 		}
-		val replacement = alternativesUseCase(seed, throughDisabledSources = false)
-			.concat(alternativesUseCase(seed, throughDisabledSources = true))
+		val replacement = alternativesUseCase(seed, matchThreshold = 0.02f)
 			.filter { it.isHealthy() }
 			.runningFold<Manga, Manga?>(null) { best, candidate ->
 				if (best == null || best < candidate) {
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativeAD.kt
@@ -4,7 +4,6 @@ import android.text.style.ForegroundColorSpan
 import androidx.core.content.ContextCompat
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
-import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import coil3.ImageLoader
 import coil3.request.ImageRequest
@@ -27,7 +26,6 @@ import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getQuantityStringSafe
 import org.koitharu.kotatsu.core.util.ext.mangaExtra
 import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
@@ -53,22 +51,10 @@ fun alternativeAD(
 	binding.chipSource.setOnClickListener(clickListener)

 	bind { payloads ->
-		binding.textViewTitle.text = item.mangaModel.title
-		with(binding.iconsView) {
-			clearIcons()
-			if (item.mangaModel.isSaved) addIcon(R.drawable.ic_storage)
-			if (item.mangaModel.isFavorite) addIcon(R.drawable.ic_heart_outline)
-			isVisible = iconsCount > 0
-		}
+		binding.textViewTitle.text = item.manga.title
 		binding.textViewSubtitle.text = buildSpannedString {
 			if (item.chaptersCount > 0) {
-				append(
-					context.resources.getQuantityStringSafe(
-						R.plurals.chapters,
-						item.chaptersCount,
-						item.chaptersCount,
-					),
-				)
+				append(context.resources.getQuantityString(R.plurals.chapters, item.chaptersCount, item.chaptersCount))
 			} else {
 				append(context.getString(R.string.no_chapters))
 			}
@@ -84,10 +70,7 @@ fun alternativeAD(
 				}
 			}
 		}
-		binding.progressView.setProgress(
-			item.mangaModel.progress,
-			ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads,
-		)
+		binding.progressView.setProgress(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
 		binding.chipSource.also { chip ->
 			chip.text = item.manga.source.getTitle(chip.context)
 			ImageRequest.Builder(context)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesActivity.kt
@@ -1,40 +1,41 @@
 package org.koitharu.kotatsu.alternatives.ui

+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import coil3.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.consumeAllSystemBarsInsets
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.systemBarsInsets
 import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
-import org.koitharu.kotatsu.list.ui.adapter.buttonFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.search.ui.MangaListActivity
 import javax.inject.Inject

@AndroidEntryPoint
 class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
-	ListStateHolderListener,
 	OnListItemClickListener<MangaAlternativeModel> {

 	@Inject
@@ -54,7 +55,6 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 			.addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, this, null))
 			.addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
 			.addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-			.addDelegate(ListItemType.FOOTER_BUTTON, buttonFooterAD(this))
 		with(viewBinding.recyclerView) {
 			setHasFixedSize(true)
 			addItemDecoration(TypedListSpacingDecoration(context, addHorizontalPadding = false))
@@ -62,46 +62,39 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 		}

 		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
-		viewModel.list.observe(this, listAdapter)
+		viewModel.content.observe(this, listAdapter)
 		viewModel.onMigrated.observeEvent(this) {
 			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
-			router.openDetails(it)
+			startActivity(DetailsActivity.newIntent(this, it))
 			finishAfterTransition()
 		}
 	}

-	override fun onApplyWindowInsets(
-		v: View,
-		insets: WindowInsetsCompat
-	): WindowInsetsCompat {
-		val barsInsets = insets.systemBarsInsets
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
 		viewBinding.recyclerView.updatePadding(
-			left = barsInsets.left,
-			right = barsInsets.right,
-			bottom = barsInsets.bottom,
+			bottom = insets.bottom + viewBinding.recyclerView.paddingTop,
 		)
-		viewBinding.appbar.updatePadding(
-			left = barsInsets.left,
-			right = barsInsets.right,
-			top = barsInsets.top,
-		)
-		return insets.consumeAllSystemBarsInsets()
 	}

 	override fun onItemClick(item: MangaAlternativeModel, view: View) {
 		when (view.id) {
-			R.id.chip_source -> router.openSearch(item.manga.source, viewModel.manga.title)
+			R.id.chip_source -> startActivity(
+				MangaListActivity.newIntent(
+					this,
+					item.manga.source,
+					MangaListFilter(query = viewModel.manga.title),
+				),
+			)
+
 			R.id.button_migrate -> confirmMigration(item.manga)
-			else -> router.openDetails(item.manga)
+			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
 		}
 	}

-	override fun onRetryClick(error: Throwable) = viewModel.retry()
-
-	override fun onEmptyActionClick() = Unit
-
-	override fun onFooterButtonClick() = viewModel.continueSearch()
-
 	private fun confirmMigration(target: Manga) {
 		buildAlertDialog(this, isCentered = true) {
 			setIcon(R.drawable.ic_replace)
@@ -121,4 +114,10 @@ class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
 			}
 		}.show()
 	}
+
+	companion object {
+
+		fun newIntent(context: Context, manga: Manga) = Intent(context, AlternativesActivity::class.java)
+			.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AlternativesViewModel.kt
@@ -1,40 +1,33 @@
 package org.koitharu.kotatsu.alternatives.ui

 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEmpty
+import kotlinx.coroutines.flow.runningFold
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.domain.AlternativesUseCase
 import org.koitharu.kotatsu.alternatives.domain.MigrateUseCase
 import org.koitharu.kotatsu.core.model.chaptersCount
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.prefs.ListMode
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.append
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.list.domain.MangaListMapper
-import org.koitharu.kotatsu.list.ui.model.ButtonFooter
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.list.domain.ReadingProgress
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingFooter
 import org.koitharu.kotatsu.list.ui.model.LoadingState
-import org.koitharu.kotatsu.list.ui.model.MangaGridModel
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrDefault
-import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject

@HiltViewModel
@@ -43,67 +36,46 @@ class AlternativesViewModel @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val alternativesUseCase: AlternativesUseCase,
 	private val migrateUseCase: MigrateUseCase,
-	private val mangaListMapper: MangaListMapper,
+	private val historyRepository: HistoryRepository,
+	private val settings: AppSettings,
 ) : BaseViewModel() {

-	val manga = savedStateHandle.require<ParcelableManga>(AppRouter.KEY_MANGA).manga
-
-	private var includeDisabledSources = MutableStateFlow(false)
-	private val results = MutableStateFlow<List<MangaAlternativeModel>>(emptyList())
-
-	private var migrationJob: Job? = null
-	private var searchJob: Job? = null
-
-	private val mangaDetails = suspendLazy {
-		mangaRepositoryFactory.create(manga.source).getDetails(manga)
-	}
+	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga

 	val onMigrated = MutableEventFlow<Manga>()
-
-	val list: StateFlow<List<ListModel>> = combine(
-		results,
-		isLoading,
-		includeDisabledSources,
-	) { list, loading, includeDisabled ->
-		when {
-			list.isEmpty() -> listOf(
-				when {
-					loading -> LoadingState
-					else -> EmptyState(
-						icon = R.drawable.ic_empty_common,
-						textPrimary = R.string.nothing_found,
-						textSecondary = R.string.text_search_holder_secondary,
-						actionStringRes = 0,
-					)
-				},
-			)
-
-			loading -> list + LoadingFooter()
-			includeDisabled -> list
-			else -> list + ButtonFooter(R.string.search_disabled_sources)
-		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+	val content = MutableStateFlow<List<ListModel>>(listOf(LoadingState))
+	private var migrationJob: Job? = null

 	init {
-		doSearch(throughDisabledSources = false)
-	}
-
-	fun retry() {
-		searchJob?.cancel()
-		results.value = emptyList()
-		includeDisabledSources.value = false
-		doSearch(throughDisabledSources = false)
-	}
-
-	fun continueSearch() {
-		if (includeDisabledSources.value) {
-			return
-		}
-		val prevJob = searchJob
-		searchJob = launchLoadingJob(Dispatchers.Default) {
-			includeDisabledSources.value = true
-			prevJob?.join()
-			doSearch(throughDisabledSources = true)
+		launchJob(Dispatchers.Default) {
+			val ref = runCatchingCancellable {
+				mangaRepositoryFactory.create(manga.source).getDetails(manga)
+			}.getOrDefault(manga)
+			val refCount = ref.chaptersCount()
+			alternativesUseCase(ref)
+				.map {
+					MangaAlternativeModel(
+						manga = it,
+						progress = getProgress(it.id),
+						referenceChapters = refCount,
+					)
+				}.runningFold<MangaAlternativeModel, List<ListModel>>(listOf(LoadingState)) { acc, item ->
+					acc.filterIsInstance<MangaAlternativeModel>() + item + LoadingFooter()
+				}.onEmpty {
+					emit(
+						listOf(
+							EmptyState(
+								icon = R.drawable.ic_empty_common,
+								textPrimary = R.string.nothing_found,
+								textSecondary = R.string.text_search_holder_secondary,
+								actionStringRes = 0,
+							),
+						),
+					)
+				}.collect {
+					content.value = it
+				}
+			content.value = content.value.filterNot { it is LoadingFooter }
 		}
 	}

@@ -117,20 +89,7 @@ class AlternativesViewModel @Inject constructor(
 		}
 	}

-	private fun doSearch(throughDisabledSources: Boolean) {
-		val prevJob = searchJob
-		searchJob = launchLoadingJob(Dispatchers.Default) {
-			prevJob?.cancelAndJoin()
-			val ref = mangaDetails.getOrDefault(manga)
-			val refCount = ref.chaptersCount()
-			alternativesUseCase.invoke(ref, throughDisabledSources)
-				.collect {
-					val model = MangaAlternativeModel(
-						mangaModel = mangaListMapper.toListModel(it, ListMode.GRID) as MangaGridModel,
-						referenceChapters = refCount,
-					)
-					results.append(model)
-				}
-		}
+	private suspend fun getProgress(mangaId: Long): ReadingProgress? {
+		return historyRepository.getProgress(mangaId, settings.progressIndicatorMode)
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/AutoFixService.kt
@@ -10,6 +10,7 @@ import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.PendingIntentCompat
+import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import coil3.ImageLoader
 import coil3.request.ImageRequest
@@ -19,19 +20,17 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.domain.AutoFixUseCase
 import org.koitharu.kotatsu.core.ErrorReporterReceiver
 import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.ui.CoroutineIntentService
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
-import org.koitharu.kotatsu.core.util.ext.powerManager
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
-import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import javax.inject.Inject
-import androidx.appcompat.R as appcompatR
+import com.google.android.material.R as materialR

@AndroidEntryPoint
 class AutoFixService : CoroutineIntentService() {
@@ -53,14 +52,12 @@ class AutoFixService : CoroutineIntentService() {
 		val ids = requireNotNull(intent.getLongArrayExtra(DATA_IDS))
 		startForeground(this)
 		for (mangaId in ids) {
-			powerManager.withPartialWakeLock(TAG) {
-				val result = runCatchingCancellable {
-					autoFixUseCase.invoke(mangaId)
-				}
-				if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
-					val notification = buildNotification(result)
-					notificationManager.notify(TAG, startId, notification)
-				}
+			val result = runCatchingCancellable {
+				autoFixUseCase.invoke(mangaId)
+			}
+			if (applicationContext.checkNotificationPermission(CHANNEL_ID)) {
+				val notification = buildNotification(result)
+				notificationManager.notify(TAG, startId, notification)
 			}
 		}
 	}
@@ -95,7 +92,7 @@ class AutoFixService : CoroutineIntentService() {
 			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
 			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
 			.addAction(
-				appcompatR.drawable.abc_ic_clear_material,
+				materialR.drawable.material_ic_clear_black_24dp,
 				applicationContext.getString(android.R.string.cancel),
 				jobContext.getCancelIntent(),
 			)
@@ -125,7 +122,7 @@ class AutoFixService : CoroutineIntentService() {
 					).toBitmapOrNull(),
 				)
 				notification.setSubText(replacement.title)
-				val intent = AppRouter.detailsIntent(applicationContext, replacement)
+				val intent = DetailsActivity.newIntent(applicationContext, replacement)
 				notification.setContentIntent(
 					PendingIntentCompat.getActivity(
 						applicationContext,
--- a/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/MangaAlternativeModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/alternatives/ui/MangaAlternativeModel.kt
@@ -1,18 +1,16 @@
 package org.koitharu.kotatsu.alternatives.ui

 import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.list.domain.ReadingProgress
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.list.ui.model.MangaGridModel
 import org.koitharu.kotatsu.parsers.model.Manga

 data class MangaAlternativeModel(
-	val mangaModel: MangaGridModel,
+	val manga: Manga,
+	val progress: ReadingProgress?,
 	private val referenceChapters: Int,
 ) : ListModel {

-	val manga: Manga
-		get() = mangaModel.manga
-
 	val chaptersCount = manga.chaptersCount()

 	val chaptersDiff: Int
@@ -21,10 +19,4 @@ data class MangaAlternativeModel(
 	override fun areItemsTheSame(other: ListModel): Boolean {
 		return other is MangaAlternativeModel && other.manga.id == manga.id
 	}
-
-	override fun getChangePayload(previousState: ListModel): Any? = if (previousState is MangaAlternativeModel) {
-		mangaModel.getChangePayload(previousState.mangaModel)
-	} else {
-		null
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/data/BookmarksDao.kt
@@ -17,9 +17,9 @@ abstract class BookmarksDao {

 	@Transaction
 	@Query(
-		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent LIMIT :limit OFFSET :offset",
+		"SELECT * FROM manga JOIN bookmarks ON bookmarks.manga_id = manga.manga_id ORDER BY percent",
 	)
-	abstract suspend fun findAll(offset: Int, limit: Int): Map<MangaWithTags, List<BookmarkEntity>>
+	abstract suspend fun findAll(): Map<MangaWithTags, List<BookmarkEntity>>

 	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND chapter_id = :chapterId AND page = :page ORDER BY percent")
 	abstract fun observe(mangaId: Long, chapterId: Long, page: Int): Flow<BookmarkEntity?>
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksActivity.kt
@@ -1,5 +1,54 @@
 package org.koitharu.kotatsu.bookmarks.ui

-import org.koitharu.kotatsu.core.ui.FragmentContainerActivity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import androidx.fragment.app.commit
+import com.google.android.material.appbar.AppBarLayout
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.databinding.ActivityContainerBinding
+import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
+import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner

-class AllBookmarksActivity : FragmentContainerActivity(AllBookmarksFragment::class.java)
+@AndroidEntryPoint
+class AllBookmarksActivity :
+	BaseActivity<ActivityContainerBinding>(),
+	AppBarOwner,
+	SnackbarOwner {
+
+	override val appBar: AppBarLayout
+		get() = viewBinding.appbar
+
+	override val snackbarHost: CoordinatorLayout
+		get() = viewBinding.root
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityContainerBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val fm = supportFragmentManager
+		if (fm.findFragmentById(R.id.container) == null) {
+			fm.commit {
+				setReorderingAllowed(true)
+				replace(R.id.container, AllBookmarksFragment::class.java, null)
+			}
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+	}
+
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, AllBookmarksActivity::class.java)
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/AllBookmarksFragment.kt
@@ -9,7 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.view.ActionMode
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import coil3.ImageLoader
@@ -18,20 +20,17 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.nav.ReaderIntent
-import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
-import org.koitharu.kotatsu.core.util.ext.consumeAllSystemBarsInsets
 import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.systemBarsInsets
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.GridSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
@@ -40,6 +39,7 @@ 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.parsers.model.Manga
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject

@AndroidEntryPoint
@@ -107,18 +107,6 @@ class AllBookmarksFragment :
 		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}

-	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
-		val barsInsets = insets.systemBarsInsets
-		val basePadding = resources.getDimensionPixelOffset(R.dimen.list_spacing_normal)
-		viewBinding?.recyclerView?.setPadding(
-			barsInsets.left + basePadding,
-			barsInsets.top + basePadding,
-			barsInsets.right + basePadding,
-			barsInsets.bottom + basePadding,
-		)
-		return insets.consumeAllSystemBarsInsets()
-	}
-
 	override fun onDestroyView() {
 		super.onDestroyView()
 		bookmarksAdapter = null
@@ -127,26 +115,26 @@ class AllBookmarksFragment :

 	override fun onItemClick(item: Bookmark, view: View) {
 		if (selectionController?.onItemClick(item.pageId) != true) {
-			val intent = ReaderIntent.Builder(view.context)
+			val intent = ReaderActivity.IntentBuilder(view.context)
 				.bookmark(item)
 				.incognito(true)
 				.build()
-			router.openReader(intent)
+			startActivity(intent)
 			Toast.makeText(view.context, R.string.incognito_mode, Toast.LENGTH_SHORT).show()
 		}
 	}

 	override fun onListHeaderClick(item: ListHeader, view: View) {
 		val manga = item.payload as? Manga ?: return
-		router.openDetails(manga)
+		startActivity(DetailsActivity.newIntent(view.context, manga))
 	}

 	override fun onItemLongClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemLongClick(view, item.pageId) == true
+		return selectionController?.onItemLongClick(view, item.pageId) ?: false
 	}

 	override fun onItemContextClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemContextClick(view, item.pageId) == true
+		return selectionController?.onItemContextClick(view, item.pageId) ?: false
 	}

 	override fun onRetryClick(error: Throwable) = Unit
@@ -189,6 +177,16 @@ class AllBookmarksFragment :
 		}
 	}

+	override fun onWindowInsetsChanged(insets: Insets) {
+		val rv = requireViewBinding().recyclerView
+		rv.updatePadding(
+			bottom = insets.bottom + rv.paddingTop,
+		)
+		rv.fastScroller.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			bottomMargin = insets.bottom
+		}
+	}
+
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {

 		init {
@@ -210,4 +208,16 @@ class AllBookmarksFragment :
 			invalidateSpanIndexCache()
 		}
 	}
+
+	companion object {
+
+		@Deprecated(
+			"",
+			ReplaceWith(
+				"BookmarksFragment()",
+				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment",
+			),
+		)
+		fun newInstance() = AllBookmarksFragment()
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarkListAD.kt
@@ -0,0 +1,38 @@
+package org.koitharu.kotatsu.bookmarks.ui.adapter
+
+import androidx.lifecycle.LifecycleOwner
+import coil3.ImageLoader
+import coil3.request.allowRgb565
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.bookmarks.domain.Bookmark
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.bookmarkExtra
+import org.koitharu.kotatsu.core.util.ext.decodeRegion
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.databinding.ItemBookmarkBinding
+
+// TODO check usages
+fun bookmarkListAD(
+	coil: ImageLoader,
+	lifecycleOwner: LifecycleOwner,
+	clickListener: OnListItemClickListener<Bookmark>,
+) = adapterDelegateViewBinding<Bookmark, Bookmark, ItemBookmarkBinding>(
+	{ inflater, parent -> ItemBookmarkBinding.inflate(inflater, parent, false) },
+) {
+	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
+
+	bind {
+		binding.imageViewThumb.newImageRequest(lifecycleOwner, item.imageLoadData)?.run {
+			size(CoverSizeResolver(binding.imageViewThumb))
+			defaultPlaceholders(context)
+			allowRgb565(true)
+			bookmarkExtra(item)
+			decodeRegion(item.scroll)
+			enqueueWith(coil)
+		}
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/adapter/BookmarksAdapter.kt
@@ -10,7 +10,6 @@ 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.errorStateListAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
@@ -26,7 +25,6 @@ class BookmarksAdapter(
 	init {
 		addDelegate(ListItemType.PAGE_THUMB, bookmarkLargeAD(coil, lifecycleOwner, clickListener))
 		addDelegate(ListItemType.HEADER, listHeaderAD(headerClickListener))
-		addDelegate(ListItemType.STATE_ERROR, errorStateListAD(null))
 		addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
 		addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(coil, lifecycleOwner, null))
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BaseBrowserActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BaseBrowserActivity.kt
@@ -1,107 +0,0 @@
-package org.koitharu.kotatsu.browser
-
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.network.proxy.ProxyProvider
-import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.core.parser.ParserMangaRepository
-import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.configureForParser
-import org.koitharu.kotatsu.core.util.ext.consumeAll
-import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.nullIfEmpty
-import javax.inject.Inject
-
-@AndroidEntryPoint
-abstract class BaseBrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
-
-	@Inject
-	lateinit var proxyProvider: ProxyProvider
-
-	@Inject
-	lateinit var mangaRepositoryFactory: MangaRepository.Factory
-
-	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
-			return
-		}
-		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
-		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
-		onBackPressedDispatcher.addCallback(onBackPressedCallback)
-
-		val mangaSource = MangaSource(intent?.getStringExtra(AppRouter.KEY_SOURCE))
-		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
-		val userAgent = intent?.getStringExtra(AppRouter.KEY_USER_AGENT)?.nullIfEmpty()
-			?: repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
-		viewBinding.webView.configureForParser(userAgent)
-
-		onCreate2(savedInstanceState, mangaSource, repository)
-	}
-
-	protected abstract fun onCreate2(
-		savedInstanceState: Bundle?,
-		source: MangaSource,
-		repository: ParserMangaRepository?
-	)
-
-	override fun onApplyWindowInsets(
-		v: View,
-		insets: WindowInsetsCompat
-	): WindowInsetsCompat {
-		val type = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
-		val barsInsets = insets.getInsets(type)
-		viewBinding.webView.updatePadding(
-			left = barsInsets.left,
-			right = barsInsets.right,
-			bottom = barsInsets.bottom,
-		)
-		viewBinding.appbar.updatePadding(
-			left = barsInsets.left,
-			right = barsInsets.right,
-			top = barsInsets.top,
-		)
-		return insets.consumeAll(type)
-	}
-
-	override fun onPause() {
-		viewBinding.webView.onPause()
-		super.onPause()
-	}
-
-	override fun onResume() {
-		super.onResume()
-		viewBinding.webView.onResume()
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		if (hasViewBinding()) {
-			viewBinding.webView.stopLoading()
-			viewBinding.webView.destroy()
-		}
-	}
-
-	override fun onLoadingStateChanged(isLoading: Boolean) {
-		viewBinding.progressBar.isVisible = isLoading
-	}
-
-	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
-		this.title = title
-		supportActionBar?.subtitle = subtitle
-	}
-
-	override fun onHistoryChanged() {
-		onBackPressedCallback.onHistoryChanged()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -1,45 +1,68 @@
 package org.koitharu.kotatsu.browser

+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.snackbar.Snackbar
+import android.webkit.CookieManager
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.ParserMangaRepository
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.toUriOrNull
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
+import com.google.android.material.R as materialR

@AndroidEntryPoint
-class BrowserActivity : BaseBrowserActivity() {
+class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {

-	override fun onCreate2(savedInstanceState: Bundle?, source: MangaSource, repository: ParserMangaRepository?) {
-		setDisplayHomeAsUp(isEnabled = true, showUpAsClose = true)
+	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
+
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+			return
+		}
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+		}
+		val mangaSource = MangaSource(intent?.getStringExtra(EXTRA_SOURCE))
+		val repository = mangaRepositoryFactory.create(mangaSource) as? ParserMangaRepository
+		val userAgent = repository?.getRequestHeaders()?.get(CommonHeaders.USER_AGENT)
+		viewBinding.webView.configureForParser(userAgent)
+		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
-		lifecycleScope.launch {
-			try {
-				proxyProvider.applyWebViewConfig()
-			} catch (e: Exception) {
-				e.printStackTraceDebug()
-				Snackbar.make(viewBinding.webView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
-			}
-			if (savedInstanceState == null) {
-				val url = intent?.dataString
-				if (url.isNullOrEmpty()) {
-					finishAfterTransition()
-				} else {
-					onTitleChanged(
-						intent?.getStringExtra(AppRouter.KEY_TITLE) ?: getString(R.string.loading_),
-						url,
-					)
-					viewBinding.webView.loadUrl(url)
-				}
-			}
+		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
+		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView)
+		onBackPressedDispatcher.addCallback(onBackPressedCallback)
+		if (savedInstanceState != null) {
+			return
+		}
+		val url = intent?.dataString
+		if (url.isNullOrEmpty()) {
+			finishAfterTransition()
+		} else {
+			onTitleChanged(
+				intent?.getStringExtra(EXTRA_TITLE) ?: getString(R.string.loading_),
+				url,
+			)
+			viewBinding.webView.loadUrl(url)
 		}
 	}

@@ -57,12 +80,73 @@ class BrowserActivity : BaseBrowserActivity() {
 		}

 		R.id.action_browser -> {
-			if (!router.openExternalBrowser(viewBinding.webView.url.orEmpty(), item.title)) {
-				Snackbar.make(viewBinding.webView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
+			val url = viewBinding.webView.url?.toUriOrNull()
+			if (url != null) {
+				val intent = Intent(Intent.ACTION_VIEW)
+				intent.data = url
+				try {
+					startActivity(Intent.createChooser(intent, item.title))
+				} catch (_: ActivityNotFoundException) {
+				}
 			}
 			true
 		}

 		else -> super.onOptionsItemSelected(item)
 	}
+
+	override fun onPause() {
+		viewBinding.webView.onPause()
+		super.onPause()
+	}
+
+	override fun onResume() {
+		super.onResume()
+		viewBinding.webView.onResume()
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		if (hasViewBinding()) {
+			viewBinding.webView.stopLoading()
+			viewBinding.webView.destroy()
+		}
+	}
+
+	override fun onLoadingStateChanged(isLoading: Boolean) {
+		viewBinding.progressBar.isVisible = isLoading
+	}
+
+	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
+		this.title = title
+		supportActionBar?.subtitle = subtitle
+	}
+
+	override fun onHistoryChanged() {
+		onBackPressedCallback.onHistoryChanged()
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.appbar.updatePadding(
+			top = insets.top,
+		)
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+		)
+	}
+
+	companion object {
+
+		private const val EXTRA_TITLE = "title"
+		private const val EXTRA_SOURCE = "source"
+
+		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
+			return Intent(context, BrowserActivity::class.java)
+				.setData(Uri.parse(url))
+				.putExtra(EXTRA_TITLE, title)
+				.putExtra(EXTRA_SOURCE, source?.name)
+		}
+	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserClient.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/BrowserClient.kt
@@ -2,11 +2,9 @@ package org.koitharu.kotatsu.browser

 import android.graphics.Bitmap
 import android.webkit.WebView
-import androidx.webkit.WebViewClientCompat
+import android.webkit.WebViewClient

-open class BrowserClient(
-	private val callback: BrowserCallback
-) : WebViewClientCompat() {
+open class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {

 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
@@ -18,7 +16,7 @@ open class BrowserClient(
 		callback.onLoadingStateChanged(isLoading = true)
 	}

-	override fun onPageCommitVisible(view: WebView, url: String) {
+	override fun onPageCommitVisible(view: WebView, url: String?) {
 		super.onPageCommitVisible(view, url)
 		callback.onTitleChanged(view.title.orEmpty(), url)
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CaptchaNotifier.kt
@@ -17,8 +17,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.getTitle
 import org.koitharu.kotatsu.core.model.isNsfw
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.parsers.model.MangaSource

@@ -30,9 +28,6 @@ class CaptchaNotifier(
 		if (!context.checkNotificationPermission(CHANNEL_ID)) {
 			return
 		}
-		if (exception.source != null && SourceSettings(context, exception.source).isCaptchaNotificationsDisabled) {
-			return
-		}
 		val manager = NotificationManagerCompat.from(context)
 		val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
 			.setName(context.getString(R.string.captcha_required))
@@ -43,7 +38,7 @@ class CaptchaNotifier(
 			.build()
 		manager.createNotificationChannel(channel)

-		val intent = AppRouter.cloudFlareResolveIntent(context, exception)
+		val intent = CloudFlareActivity.newIntent(context, exception)
 			.setData(exception.url.toUri())
 		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
 			.setContentTitle(channel.name)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareActivity.kt
@@ -1,36 +1,43 @@
 package org.koitharu.kotatsu.browser.cloudflare

+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.webkit.CookieManager
 import androidx.activity.result.contract.ActivityResultContract
+import androidx.core.graphics.Insets
+import androidx.core.net.toUri
 import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
-import com.google.android.material.snackbar.Snackbar
 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.BaseBrowserActivity
+import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
-import org.koitharu.kotatsu.core.parser.ParserMangaRepository
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.network.CloudFlareHelper
-import org.koitharu.kotatsu.parsers.util.ifNullOrEmpty
 import javax.inject.Inject
+import com.google.android.material.R as materialR

@AndroidEntryPoint
-class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
+class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCallback {

 	private var pendingResult = RESULT_CANCELED

@@ -38,27 +45,43 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
 	lateinit var cookieJar: MutableCookieJar

 	private lateinit var cfClient: CloudFlareClient
+	private var onBackPressedCallback: WebViewBackPressedCallback? = null

-	override fun onCreate2(savedInstanceState: Bundle?, source: MangaSource, repository: ParserMangaRepository?) {
-		setDisplayHomeAsUp(isEnabled = true, showUpAsClose = true)
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
+			return
+		}
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+		}
 		val url = intent?.dataString
 		if (url.isNullOrEmpty()) {
 			finishAfterTransition()
 			return
 		}
 		cfClient = CloudFlareClient(cookieJar, this, url)
+		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
 		viewBinding.webView.webViewClient = cfClient
-		lifecycleScope.launch {
-			try {
-				proxyProvider.applyWebViewConfig()
-			} catch (e: Exception) {
-				Snackbar.make(viewBinding.webView, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
-			}
-			if (savedInstanceState == null) {
-				onTitleChanged(getString(R.string.loading_), url)
-				viewBinding.webView.loadUrl(url)
-			}
+		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
+			onBackPressedDispatcher.addCallback(it)
 		}
+		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
+		if (savedInstanceState == null) {
+			onTitleChanged(getString(R.string.loading_), url)
+			viewBinding.webView.loadUrl(url)
+		}
+	}
+
+	override fun onDestroy() {
+		runCatching {
+			viewBinding.webView
+		}.onSuccess {
+			it.stopLoading()
+			it.destroy()
+		}
+		super.onDestroy()
 	}

 	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -66,6 +89,17 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
 		return super.onCreateOptionsMenu(menu)
 	}

+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.appbar.updatePadding(
+			top = insets.top,
+		)
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+		)
+	}
+
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> {
 			viewBinding.webView.stopLoading()
@@ -81,13 +115,21 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {
 		else -> super.onOptionsItemSelected(item)
 	}

+	override fun onResume() {
+		super.onResume()
+		viewBinding.webView.onResume()
+	}
+
+	override fun onPause() {
+		viewBinding.webView.onPause()
+		super.onPause()
+	}
+
 	override fun finish() {
 		setResult(pendingResult)
 		super.finish()
 	}

-	override fun onLoadingStateChanged(isLoading: Boolean) = Unit
-
 	override fun onPageLoaded() {
 		viewBinding.progressBar.isInvisible = true
 	}
@@ -98,16 +140,25 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {

 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
-		val source = intent?.getStringExtra(AppRouter.KEY_SOURCE)
+		val source = intent?.getStringExtra(ARG_SOURCE)
 		if (source != null) {
 			CaptchaNotifier(this).dismiss(MangaSource(source))
 		}
 		finishAfterTransition()
 	}

+	override fun onLoadingStateChanged(isLoading: Boolean) {
+		viewBinding.progressBar.isVisible = isLoading
+	}
+
+	override fun onHistoryChanged() {
+		onBackPressedCallback?.onHistoryChanged()
+	}
+
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
 		setTitle(title)
-		supportActionBar?.subtitle = subtitle?.toString()?.toHttpUrlOrNull()?.host.ifNullOrEmpty { subtitle }
+		supportActionBar?.subtitle =
+			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}

 	private fun restartCheck() {
@@ -131,16 +182,38 @@ class CloudFlareActivity : BaseBrowserActivity(), CloudFlareCallback {

 	class Contract : ActivityResultContract<CloudFlareProtectedException, Boolean>() {
 		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
-			return AppRouter.cloudFlareResolveIntent(context, input)
+			return newIntent(context, input)
 		}

 		override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
-			return resultCode == RESULT_OK
+			return resultCode == Activity.RESULT_OK
 		}
 	}

 	companion object {

 		const val TAG = "CloudFlareActivity"
+		private const val ARG_UA = "ua"
+		private const val ARG_SOURCE = "_source"
+
+		fun newIntent(context: Context, exception: CloudFlareProtectedException) = newIntent(
+			context = context,
+			url = exception.url,
+			source = exception.source,
+			headers = exception.headers,
+		)
+
+		private fun newIntent(
+			context: Context,
+			url: String,
+			source: MangaSource?,
+			headers: Headers?,
+		) = Intent(context, CloudFlareActivity::class.java).apply {
+			data = url.toUri()
+			putExtra(ARG_SOURCE, source?.name)
+			headers?.get(CommonHeaders.USER_AGENT)?.let {
+				putExtra(ARG_UA, it)
+			}
+		}
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareCallback.kt
@@ -4,6 +4,8 @@ import org.koitharu.kotatsu.browser.BrowserCallback

 interface CloudFlareCallback : BrowserCallback {

+	override fun onLoadingStateChanged(isLoading: Boolean) = Unit
+
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) = Unit

 	fun onPageLoaded()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/browser/cloudflare/CloudFlareClient.kt
@@ -22,7 +22,7 @@ class CloudFlareClient(
 		checkClearance()
 	}

-	override fun onPageCommitVisible(view: WebView, url: String) {
+	override fun onPageCommitVisible(view: WebView, url: String?) {
 		super.onPageCommitVisible(view, url)
 		callback.onPageLoaded()
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/AppModule.kt
@@ -6,7 +6,6 @@ import android.os.Build
 import android.provider.SearchRecentSuggestions
 import android.text.Html
 import androidx.collection.arraySetOf
-import androidx.core.content.ContextCompat
 import androidx.room.InvalidationTracker
 import androidx.work.WorkManager
 import coil3.ImageLoader
@@ -77,12 +76,6 @@ interface AppModule {

 	companion object {

-		@Provides
-		@LocalizedAppContext
-		fun provideLocalizedContext(
-			@ApplicationContext context: Context,
-		): Context = ContextCompat.getContextForLanguage(context)
-
 		@Provides
 		@Singleton
 		fun provideNetworkState(
@@ -99,7 +92,7 @@ interface AppModule {
 		@Provides
 		@Singleton
 		fun provideCoil(
-			@LocalizedAppContext context: Context,
+			@ApplicationContext context: Context,
 			@MangaHttpClient okHttpClientProvider: Provider<OkHttpClient>,
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/BaseApp.kt
@@ -13,6 +13,7 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
@@ -25,14 +26,12 @@ 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.os.RomCompat
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.data.index.LocalMangaIndex
 import org.koitharu.kotatsu.local.domain.model.LocalManga
-import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import java.security.Security
 import javax.inject.Inject
@@ -83,14 +82,17 @@ open class BaseApp : Application(), Configuration.Provider {
 			return
 		}
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
+		AppCompatDelegate.setApplicationLocales(settings.appLocales)
 		// TLS 1.3 support for Android < 10
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
 			Security.insertProviderAt(Conscrypt.newProvider(), 1)
 		}
 		setupActivityLifecycleCallbacks()
 		processLifecycleScope.launch {
-			ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.getOrNull().toString())
-			ACRA.errorReporter.putCustomData("isMiui", RomCompat.isMiui.getOrNull().toString())
+			val isOriginalApp = withContext(Dispatchers.Default) {
+				appValidator.isOriginalApp
+			}
+			ACRA.errorReporter.putCustomData("isOriginalApp", isOriginalApp.toString())
 		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
@@ -102,9 +104,6 @@ open class BaseApp : Application(), Configuration.Provider {

 	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
-		if (ACRA.isACRASenderServiceProcess()) {
-			return
-		}
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
 			reportFormat = StringFormat.JSON
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReporterReceiver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ErrorReporterReceiver.kt
@@ -8,7 +8,6 @@ import android.net.Uri
 import android.os.BadParcelableException
 import androidx.core.app.PendingIntentCompat
 import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.report
@@ -16,19 +15,20 @@ import org.koitharu.kotatsu.core.util.ext.report
 class ErrorReporterReceiver : BroadcastReceiver() {

 	override fun onReceive(context: Context?, intent: Intent?) {
-		val e = intent?.getSerializableExtraCompat<Throwable>(AppRouter.KEY_ERROR) ?: return
+		val e = intent?.getSerializableExtraCompat<Throwable>(EXTRA_ERROR) ?: return
 		e.report()
 	}

 	companion object {

+		private const val EXTRA_ERROR = "err"
 		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"

 		fun getPendingIntent(context: Context, e: Throwable): PendingIntent? = try {
 			val intent = Intent(context, ErrorReporterReceiver::class.java)
 			intent.setAction(ACTION_REPORT)
 			intent.setData(Uri.parse("err://${e.hashCode()}"))
-			intent.putExtra(AppRouter.KEY_ERROR, e)
+			intent.putExtra(EXTRA_ERROR, e)
 			PendingIntentCompat.getBroadcast(context, 0, intent, 0, false)
 		} catch (e: BadParcelableException) {
 			e.printStackTraceDebug()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/LocalizedAppContext.kt
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Target(
-	AnnotationTarget.FUNCTION,
-	AnnotationTarget.PROPERTY_GETTER,
-	AnnotationTarget.PROPERTY_SETTER,
-	AnnotationTarget.VALUE_PARAMETER,
-	AnnotationTarget.FIELD,
-)
-annotation class LocalizedAppContext
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupEntry.kt
@@ -16,7 +16,6 @@ class BackupEntry(
 		CATEGORIES("categories"),
 		FAVOURITES("favourites"),
 		SETTINGS("settings"),
-		SETTINGS_READER_GRID("reader_grid"),
 		BOOKMARKS("bookmarks"),
 		SOURCES("sources"),
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -1,18 +1,15 @@
 package org.koitharu.kotatsu.core.backup

 import androidx.room.withTransaction
-import kotlinx.coroutines.flow.FlowCollector
 import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.progress.Progress
 import org.koitharu.kotatsu.parsers.util.json.asTypedList
 import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.reader.data.TapGridSettings
 import java.util.Date
 import javax.inject.Inject

@@ -21,14 +18,13 @@ private const val PAGE_SIZE = 10
 class BackupRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val settings: AppSettings,
-	private val tapGridSettings: TapGridSettings,
 ) {

 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.Name.HISTORY, JSONArray())
 		while (true) {
-			val history = db.getHistoryDao().findAll(offset = offset, limit = PAGE_SIZE)
+			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
 				break
 			}
@@ -59,7 +55,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.getFavouritesDao().findAllRaw(offset = offset, limit = PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -78,26 +74,19 @@ class BackupRepository @Inject constructor(
 	}

 	suspend fun dumpBookmarks(): BackupEntry {
-		var offset = 0
 		val entry = BackupEntry(BackupEntry.Name.BOOKMARKS, JSONArray())
-		while (true) {
-			val bookmarks = db.getBookmarksDao().findAll(offset = offset, limit = PAGE_SIZE)
-			if (bookmarks.isEmpty()) {
-				break
-			}
-			offset += bookmarks.size
-			for ((m, b) in bookmarks) {
-				val json = JSONObject()
-				val manga = JsonSerializer(m.manga).toJson()
-				json.put("manga", manga)
-				val tags = JSONArray()
-				m.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
-				json.put("tags", tags)
-				val bookmarks = JSONArray()
-				b.forEach { bookmarks.put(JsonSerializer(it).toJson()) }
-				json.put("bookmarks", bookmarks)
-				entry.data.put(json)
-			}
+		val all = db.getBookmarksDao().findAll()
+		for ((m, b) in all) {
+			val json = JSONObject()
+			val manga = JsonSerializer(m.manga).toJson()
+			json.put("manga", manga)
+			val tags = JSONArray()
+			m.tags.forEach { tags.put(JsonSerializer(it).toJson()) }
+			json.put("tags", tags)
+			val bookmarks = JSONArray()
+			b.forEach { bookmarks.put(JsonSerializer(it).toJson()) }
+			json.put("bookmarks", bookmarks)
+			entry.data.put(json)
 		}
 		return entry
 	}
@@ -114,14 +103,6 @@ class BackupRepository @Inject constructor(
 		return entry
 	}

-	fun dumpReaderGridSettings(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.Name.SETTINGS_READER_GRID, JSONArray())
-		val settingsDump = tapGridSettings.getAllValues()
-		val json = JsonSerializer(settingsDump).toJson()
-		entry.data.put(json)
-		return entry
-	}
-
 	suspend fun dumpSources(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.Name.SOURCES, JSONArray())
 		val all = db.getSourcesDao().findAll()
@@ -147,11 +128,9 @@ class BackupRepository @Inject constructor(
 		return if (timestamp == 0L) null else Date(timestamp)
 	}

-	suspend fun restoreHistory(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
+	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		val list = entry.data.asTypedList<JSONObject>()
-		outProgress?.emit(Progress(progress = 0, total = list.size))
-		for ((index, item) in list.withIndex()) {
+		for (item in entry.data.asTypedList<JSONObject>()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -165,7 +144,6 @@ class BackupRepository @Inject constructor(
 					db.getHistoryDao().upsert(history)
 				}
 			}
-			outProgress?.emit(Progress(progress = index, total = list.size))
 		}
 		return result
 	}
@@ -181,11 +159,9 @@ class BackupRepository @Inject constructor(
 		return result
 	}

-	suspend fun restoreFavourites(entry: BackupEntry, outProgress: FlowCollector<Progress>?): CompositeResult {
+	suspend fun restoreFavourites(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
-		val list = entry.data.asTypedList<JSONObject>()
-		outProgress?.emit(Progress(progress = 0, total = list.size))
-		for ((index, item) in list.withIndex()) {
+		for (item in entry.data.asTypedList<JSONObject>()) {
 			val mangaJson = item.getJSONObject("manga")
 			val manga = JsonDeserializer(mangaJson).toMangaEntity()
 			val tags = mangaJson.getJSONArray("tags").mapJSON {
@@ -199,7 +175,6 @@ class BackupRepository @Inject constructor(
 					db.getFavouritesDao().upsert(favourite)
 				}
 			}
-			outProgress?.emit(Progress(progress = index, total = list.size))
 		}
 		return result
 	}
@@ -246,14 +221,4 @@ class BackupRepository @Inject constructor(
 		}
 		return result
 	}
-
-	fun restoreReaderGridSettings(entry: BackupEntry): CompositeResult {
-		val result = CompositeResult()
-		for (item in entry.data.asTypedList<JSONObject>()) {
-			result += runCatchingCancellable {
-				tapGridSettings.upsertAll(JsonDeserializer(item).toMap())
-			}
-		}
-		return result
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/CompositeResult.kt
@@ -27,10 +27,6 @@ class CompositeResult {
 		}
 	}

-	operator fun plusAssign(error: Throwable) {
-		errors.add(error)
-	}
-
 	operator fun plusAssign(other: CompositeResult) {
 		this.successCount += other.successCount
 		this.errors += other.errors
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonDeserializer.kt
@@ -28,16 +28,15 @@ class JsonDeserializer(private val json: JSONObject) {
 	fun toMangaEntity() = MangaEntity(
 		id = json.getLong("id"),
 		title = json.getString("title"),
-		altTitles = json.getStringOrNull("alt_title"),
+		altTitle = json.getStringOrNull("alt_title"),
 		url = json.getString("url"),
 		publicUrl = json.getStringOrNull("public_url").orEmpty(),
 		rating = json.getDouble("rating").toFloat(),
 		isNsfw = json.getBooleanOrDefault("nsfw", false),
-		contentRating = json.getStringOrNull("content_rating"),
 		coverUrl = json.getString("cover_url"),
 		largeCoverUrl = json.getStringOrNull("large_cover_url"),
 		state = json.getStringOrNull("state"),
-		authors = json.getStringOrNull("author"),
+		author = json.getStringOrNull("author"),
 		source = json.getString("source"),
 	)

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/JsonSerializer.kt
@@ -58,16 +58,15 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 		JSONObject().apply {
 			put("id", e.id)
 			put("title", e.title)
-			put("alt_title", e.altTitles)
+			put("alt_title", e.altTitle)
 			put("url", e.url)
 			put("public_url", e.publicUrl)
 			put("rating", e.rating)
 			put("nsfw", e.isNsfw)
-			put("content_rating", e.contentRating)
 			put("cover_url", e.coverUrl)
 			put("large_cover_url", e.largeCoverUrl)
 			put("state", e.state)
-			put("author", e.authors)
+			put("author", e.author)
 			put("source", e.source)
 		},
 	)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/TelegramBackupUploader.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/TelegramBackupUploader.kt
@@ -1,93 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import android.content.Context
-import androidx.annotation.CheckResult
-import dagger.hilt.android.qualifiers.ApplicationContext
-import okhttp3.HttpUrl
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.asRequestBody
-import okhttp3.Response
-import okhttp3.internal.closeQuietly
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.network.BaseHttpClient
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
-import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
-import org.koitharu.kotatsu.parsers.util.parseJson
-import java.io.File
-import javax.inject.Inject
-
-class TelegramBackupUploader @Inject constructor(
-	private val settings: AppSettings,
-	@BaseHttpClient private val client: OkHttpClient,
-	@ApplicationContext private val context: Context,
-) {
-
-	private val botToken = context.getString(R.string.tg_backup_bot_token)
-
-	suspend fun uploadBackup(file: File) {
-		val requestBody = file.asRequestBody("application/zip".toMediaTypeOrNull())
-		val multipartBody = MultipartBody.Builder()
-			.setType(MultipartBody.FORM)
-			.addFormDataPart("chat_id", requireChatId())
-			.addFormDataPart("document", file.name, requestBody)
-			.build()
-		val request = Request.Builder()
-			.url(urlOf("sendDocument").build())
-			.post(multipartBody)
-			.build()
-		client.newCall(request).await().consume()
-	}
-
-	suspend fun sendTestMessage() {
-		val request = Request.Builder()
-			.url(urlOf("getMe").build())
-			.build()
-		client.newCall(request).await().consume()
-		sendMessage(context.getString(R.string.backup_tg_echo))
-	}
-
-	@CheckResult
-	fun openBotInApp(router: AppRouter): Boolean {
-		val botUsername = context.getString(R.string.tg_backup_bot_name)
-		return router.openExternalBrowser("tg://resolve?domain=$botUsername") ||
-			router.openExternalBrowser("https://t.me/$botUsername")
-	}
-
-	private suspend fun sendMessage(message: String) {
-		val url = urlOf("sendMessage")
-			.addQueryParameter("chat_id", requireChatId())
-			.addQueryParameter("text", message)
-			.build()
-		val request = Request.Builder()
-			.url(url)
-			.build()
-		client.newCall(request).await().consume()
-	}
-
-	private fun requireChatId() = checkNotNull(settings.backupTelegramChatId) {
-		"Telegram chat ID not set in settings"
-	}
-
-	private fun Response.consume() {
-		if (isSuccessful) {
-			closeQuietly()
-			return
-		}
-		val jo = parseJson()
-		if (!jo.getBooleanOrDefault("ok", true)) {
-			throw RuntimeException(jo.getStringOrNull("description"))
-		}
-	}
-
-	private fun urlOf(method: String) = HttpUrl.Builder()
-		.scheme("https")
-		.host("api.telegram.org")
-		.addPathSegment("bot$botToken")
-		.addPathSegment(method)
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/ExpiringLruCache.kt
@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.core.cache

-import org.koitharu.kotatsu.core.util.SynchronizedSieveCache
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import androidx.collection.LruCache
 import java.util.concurrent.TimeUnit
 import org.koitharu.kotatsu.core.cache.MemoryContentCache.Key as CacheKey

@@ -9,9 +8,11 @@ class ExpiringLruCache<T>(
 	val maxSize: Int,
 	private val lifetime: Long,
 	private val timeUnit: TimeUnit,
-) {
+) : Iterable<CacheKey> {

-	private val cache = SynchronizedSieveCache<CacheKey, ExpiringValue<T>>(maxSize)
+	private val cache = LruCache<CacheKey, ExpiringValue<T>>(maxSize)
+
+	override fun iterator(): Iterator<CacheKey> = cache.snapshot().keys.iterator()

 	operator fun get(key: CacheKey): T? {
 		val value = cache[key] ?: return null
@@ -22,8 +23,7 @@ class ExpiringLruCache<T>(
 	}

 	operator fun set(key: CacheKey, value: T) {
-		val value = ExpiringValue(value, lifetime, timeUnit)
-		cache.put(key, value)
+		cache.put(key, ExpiringValue(value, lifetime, timeUnit))
 	}

 	fun clear() {
@@ -37,8 +37,4 @@ class ExpiringLruCache<T>(
 	fun remove(key: CacheKey) {
 		cache.remove(key)
 	}
-
-	fun removeAll(source: MangaSource) {
-		cache.removeIf { key, _ -> key.source == source }
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/cache/MemoryContentCache.kt
@@ -81,7 +81,11 @@ class MemoryContentCache @Inject constructor(application: Application) : Compone
 	}

 	private fun clearCache(cache: ExpiringLruCache<*>, source: MangaSource) {
-		cache.removeAll(source)
+		cache.forEach { key ->
+			if (key.source == source) {
+				cache.remove(key)
+			}
+		}
 	}

 	data class Key(
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -12,13 +12,11 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.bookmarks.data.BookmarksDao
-import org.koitharu.kotatsu.core.db.dao.ChaptersDao
 import org.koitharu.kotatsu.core.db.dao.MangaDao
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.dao.PreferencesDao
 import org.koitharu.kotatsu.core.db.dao.TagsDao
 import org.koitharu.kotatsu.core.db.dao.TrackLogsDao
-import org.koitharu.kotatsu.core.db.entity.ChapterEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.MangaPrefsEntity
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
@@ -38,9 +36,6 @@ import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration20To21
 import org.koitharu.kotatsu.core.db.migrations.Migration21To22
 import org.koitharu.kotatsu.core.db.migrations.Migration22To23
-import org.koitharu.kotatsu.core.db.migrations.Migration23To24
-import org.koitharu.kotatsu.core.db.migrations.Migration24To23
-import org.koitharu.kotatsu.core.db.migrations.Migration24To25
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -68,14 +63,14 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao

-const val DATABASE_VERSION = 25
+const val DATABASE_VERSION = 23

@Database(
 	entities = [
-		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class, ChapterEntity::class,
-		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class, TrackEntity::class,
-		TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class, ScrobblingEntity::class,
-		MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
+		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
+		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
+		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class, LocalMangaIndexEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
@@ -108,8 +103,6 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract fun getStatsDao(): StatsDao

 	abstract fun getLocalMangaIndexDao(): LocalMangaIndexDao
-
-	abstract fun getChaptersDao(): ChaptersDao
 }

 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -135,9 +128,6 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration20To21(),
 	Migration21To22(),
 	Migration22To23(),
-	Migration23To24(),
-	Migration24To23(),
-	Migration24To25(),
 )

 fun MangaDatabase(context: Context): MangaDatabase = Room
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/Tables.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/Tables.kt
@@ -7,4 +7,3 @@ const val TABLE_FAVOURITE_CATEGORIES = "favourite_categories"
 const val TABLE_HISTORY = "history"
 const val TABLE_MANGA_TAGS = "manga_tags"
 const val TABLE_SOURCES = "sources"
-const val TABLE_CHAPTERS = "chapters"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/ChaptersDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/ChaptersDao.kt
@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.core.db.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import org.koitharu.kotatsu.core.db.entity.ChapterEntity
-
-@Dao
-abstract class ChaptersDao {
-
-	@Query("SELECT * FROM chapters WHERE manga_id = :mangaId ORDER BY `index` ASC")
-	abstract suspend fun findAll(mangaId: Long): List<ChapterEntity>
-
-	@Query("DELETE FROM chapters WHERE manga_id = :mangaId")
-	abstract suspend fun deleteAll(mangaId: Long)
-
-	@Query("DELETE FROM chapters WHERE manga_id NOT IN (SELECT manga_id FROM history WHERE deleted_at = 0) AND manga_id NOT IN (SELECT manga_id FROM favourites WHERE deleted_at = 0)")
-	abstract suspend fun gc()
-
-	@Transaction
-	open suspend fun replaceAll(mangaId: Long, entities: Collection<ChapterEntity>) {
-		deleteAll(mangaId)
-		insert(entities)
-	}
-
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	protected abstract suspend fun insert(entities: Collection<ChapterEntity>)
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaDao.kt
@@ -20,9 +20,6 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE manga_id = :id")
 	abstract suspend fun find(id: Long): MangaWithTags?

-	@Query("SELECT EXISTS(SELECT * FROM manga WHERE manga_id = :id)")
-	abstract suspend operator fun contains(id: Long): Boolean
-
 	@Transaction
 	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
 	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
@@ -58,19 +55,6 @@ abstract class MangaDao {
 	@Delete
 	abstract suspend fun delete(subjects: Collection<MangaEntity>)

-	@Query(
-		"""
-		DELETE FROM manga WHERE NOT EXISTS(SELECT * FROM history WHERE history.manga_id == manga.manga_id) 
-			AND NOT EXISTS(SELECT * FROM favourites WHERE favourites.manga_id == manga.manga_id)
-			AND NOT EXISTS(SELECT * FROM bookmarks WHERE bookmarks.manga_id == manga.manga_id)
-			AND NOT EXISTS(SELECT * FROM suggestions WHERE suggestions.manga_id == manga.manga_id)
-			AND NOT EXISTS(SELECT * FROM scrobblings WHERE scrobblings.manga_id == manga.manga_id)
-			AND NOT EXISTS(SELECT * FROM local_index WHERE local_index.manga_id == manga.manga_id)
-			AND manga.manga_id NOT IN (:idsToKeep)
-		""",
-	)
-	abstract suspend fun cleanup(idsToKeep: Set<Long>)
-
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
 		upsert(manga)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/dao/MangaSourcesDao.kt
@@ -10,6 +10,7 @@ import androidx.room.Upsert
 import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
@@ -60,11 +61,21 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources WHERE pinned = 1")
 	abstract suspend fun findAllPinned(): List<MangaSourceEntity>

-	fun observeAll(enabledOnly: Boolean, order: SourcesSortOrder): Flow<List<MangaSourceEntity>> =
-		observeImpl(getQuery(enabledOnly, order))
+	fun observeEnabled(order: SourcesSortOrder): Flow<List<MangaSourceEntity>> {
+		val orderBy = getOrderBy(order)

-	suspend fun findAll(enabledOnly: Boolean, order: SourcesSortOrder): List<MangaSourceEntity> =
-		findAllImpl(getQuery(enabledOnly, order))
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
+		return observeImpl(query)
+	}
+
+	suspend fun findAllEnabled(order: SourcesSortOrder): List<MangaSourceEntity> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
+		return findAllImpl(query)
+	}

 	@Transaction
 	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
@@ -90,17 +101,6 @@ abstract class MangaSourcesDao {
 	@RawQuery
 	protected abstract suspend fun findAllImpl(query: SupportSQLiteQuery): List<MangaSourceEntity>

-	private fun getQuery(enabledOnly: Boolean, order: SourcesSortOrder) = SimpleSQLiteQuery(
-		buildString {
-			append("SELECT * FROM sources ")
-			if (enabledOnly) {
-				append("WHERE enabled = 1 ")
-			}
-			append("ORDER BY pinned DESC, ")
-			append(getOrderBy(order))
-		},
-	)
-
 	private fun getOrderBy(order: SourcesSortOrder) = when (order) {
 		SourcesSortOrder.ALPHABETIC -> "source ASC"
 		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/ChapterEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/ChapterEntity.kt
@@ -1,32 +0,0 @@
-package org.koitharu.kotatsu.core.db.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import org.koitharu.kotatsu.core.db.TABLE_CHAPTERS
-
-@Entity(
-	tableName = TABLE_CHAPTERS,
-	primaryKeys = ["manga_id", "chapter_id"],
-	foreignKeys = [
-		ForeignKey(
-			entity = MangaEntity::class,
-			parentColumns = ["manga_id"],
-			childColumns = ["manga_id"],
-			onDelete = ForeignKey.CASCADE,
-		),
-	],
-)
-data class ChapterEntity(
-	@ColumnInfo(name = "chapter_id") val chapterId: Long,
-	@ColumnInfo(name = "manga_id") val mangaId: Long,
-	@ColumnInfo(name = "name") val title: String,
-	@ColumnInfo(name = "number") val number: Float,
-	@ColumnInfo(name = "volume") val volume: Int,
-	@ColumnInfo(name = "url") val url: String,
-	@ColumnInfo(name = "scanlator") val scanlator: String?,
-	@ColumnInfo(name = "upload_date") val uploadDate: Long,
-	@ColumnInfo(name = "branch") val branch: String?,
-	@ColumnInfo(name = "source") val source: String,
-	@ColumnInfo(name = "index") val index: Int,
-)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/EntityMapping.kt
@@ -1,20 +1,14 @@
 package org.koitharu.kotatsu.core.db.entity

 import org.koitharu.kotatsu.core.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.mapToSet
-import org.koitharu.kotatsu.parsers.util.nullIfEmpty
-import org.koitharu.kotatsu.parsers.util.toArraySet
 import org.koitharu.kotatsu.parsers.util.toTitleCase

-private const val VALUES_DIVIDER = '\n'
-
 // Entity to model

 fun TagEntity.toMangaTag() = MangaTag(
@@ -27,42 +21,26 @@ fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)

 fun Collection<TagEntity>.toMangaTagsList() = map(TagEntity::toMangaTag)

-fun MangaEntity.toManga(tags: Set<MangaTag>, chapters: List<ChapterEntity>?) = Manga(
+fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	id = this.id,
 	title = this.title,
-	altTitles = this.altTitles?.split(VALUES_DIVIDER)?.toArraySet().orEmpty(),
+	altTitle = this.altTitle,
 	state = this.state?.let { MangaState(it) },
 	rating = this.rating,
-	contentRating = ContentRating(this.contentRating)
-		?: if (isNsfw) ContentRating.ADULT else null,
+	isNsfw = this.isNsfw,
 	url = this.url,
 	publicUrl = this.publicUrl,
 	coverUrl = this.coverUrl,
 	largeCoverUrl = this.largeCoverUrl,
-	authors = this.authors?.split(VALUES_DIVIDER)?.toArraySet().orEmpty(),
+	author = this.author,
 	source = MangaSource(this.source),
 	tags = tags,
-	chapters = chapters?.toMangaChapters(),
 )

-fun MangaWithTags.toManga(chapters: List<ChapterEntity>? = null) = manga.toManga(tags.toMangaTags(), chapters)
+fun MangaWithTags.toManga() = manga.toManga(tags.toMangaTags())

 fun Collection<MangaWithTags>.toMangaList() = map { it.toManga() }

-fun ChapterEntity.toMangaChapter() = MangaChapter(
-	id = chapterId,
-	title = title.nullIfEmpty(),
-	number = number,
-	volume = volume,
-	url = url,
-	scanlator = scanlator,
-	uploadDate = uploadDate,
-	branch = branch,
-	source = MangaSource(source),
-)
-
-fun Collection<ChapterEntity>.toMangaChapters() = map { it.toMangaChapter() }
-
 // Model to entity

 fun Manga.toEntity() = MangaEntity(
@@ -72,13 +50,12 @@ fun Manga.toEntity() = MangaEntity(
 	source = source.name,
 	largeCoverUrl = largeCoverUrl,
 	coverUrl = coverUrl.orEmpty(),
-	altTitles = altTitles.joinToString(VALUES_DIVIDER.toString()),
+	altTitle = altTitle,
 	rating = rating,
 	isNsfw = isNsfw,
-	contentRating = contentRating?.name,
 	state = state?.name,
 	title = title,
-	authors = authors.joinToString(VALUES_DIVIDER.toString()),
+	author = author,
 )

 fun MangaTag.toEntity() = TagEntity(
@@ -90,22 +67,6 @@ fun MangaTag.toEntity() = TagEntity(

 fun Collection<MangaTag>.toEntities() = map(MangaTag::toEntity)

-fun Iterable<IndexedValue<MangaChapter>>.toEntities(mangaId: Long) = map { (index, chapter) ->
-	ChapterEntity(
-		chapterId = chapter.id,
-		mangaId = mangaId,
-		title = chapter.title.orEmpty(),
-		number = chapter.number,
-		volume = chapter.volume,
-		url = chapter.url,
-		scanlator = chapter.scanlator,
-		uploadDate = chapter.uploadDate,
-		branch = chapter.branch,
-		source = chapter.source.name,
-		index = index,
-	)
-}
-
 // Other

 fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
@@ -115,7 +76,3 @@ fun SortOrder(name: String, fallback: SortOrder): SortOrder = runCatching {
 fun MangaState(name: String): MangaState? = runCatching {
 	MangaState.valueOf(name)
 }.getOrNull()
-
-fun ContentRating(name: String?): ContentRating? = runCatching {
-	ContentRating.valueOf(name ?: return@runCatching null)
-}.getOrNull()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/entity/MangaEntity.kt
@@ -10,15 +10,14 @@ data class MangaEntity(
 	@PrimaryKey(autoGenerate = false)
 	@ColumnInfo(name = "manga_id") val id: Long,
 	@ColumnInfo(name = "title") val title: String,
-	@ColumnInfo(name = "alt_title") val altTitles: String?,
+	@ColumnInfo(name = "alt_title") val altTitle: String?,
 	@ColumnInfo(name = "url") val url: String,
 	@ColumnInfo(name = "public_url") val publicUrl: String,
 	@ColumnInfo(name = "rating") val rating: Float, // normalized value [0..1] or -1
-	@ColumnInfo(name = "nsfw") val isNsfw: Boolean,
-	@ColumnInfo(name = "content_rating") val contentRating: String?,
+	@ColumnInfo(name = "nsfw") val isNsfw: Boolean, // TODO change to contentRating
 	@ColumnInfo(name = "cover_url") val coverUrl: String,
 	@ColumnInfo(name = "large_cover_url") val largeCoverUrl: String?,
 	@ColumnInfo(name = "state") val state: String?,
-	@ColumnInfo(name = "author") val authors: String?,
+	@ColumnInfo(name = "author") val author: String?,
 	@ColumnInfo(name = "source") val source: String,
 )
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration23To24.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration23To24.kt
@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration23To24 : Migration(23, 24) {
-
-	override fun migrate(db: SupportSQLiteDatabase) {
-		db.execSQL("CREATE TABLE IF NOT EXISTS `chapters` (`chapter_id` INTEGER NOT NULL, `manga_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `number` REAL NOT NULL, `volume` INTEGER NOT NULL, `url` TEXT NOT NULL, `scanlator` TEXT, `upload_date` INTEGER NOT NULL, `branch` TEXT, `source` TEXT NOT NULL, `index` INTEGER NOT NULL, PRIMARY KEY(`manga_id`, `chapter_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration24To23.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration24To23.kt
@@ -1,11 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration24To23 : Migration(24, 23) {
-
-	override fun migrate(db: SupportSQLiteDatabase) {
-		db.execSQL("DROP TABLE IF EXISTS `chapters`")
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration24To25.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/db/migrations/Migration24To25.kt
@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.core.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration24To25 : Migration(24, 25) {
-
-	override fun migrate(db: SupportSQLiteDatabase) {
-		db.execSQL("ALTER TABLE manga ADD COLUMN content_rating TEXT DEFAULT NULL")
-		db.execSQL("UPDATE manga SET content_rating = 'ADULT' WHERE nsfw = 1")
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/NonFileUriException.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/NonFileUriException.kt
@@ -1,7 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import android.net.Uri
-
-class NonFileUriException(
-	val uri: Uri,
-) : IllegalArgumentException("Cannot resolve file name of \"$uri\"")
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/DialogErrorObserver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/DialogErrorObserver.kt
@@ -6,6 +6,7 @@ import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.isSerializable
 import org.koitharu.kotatsu.parsers.exception.ParseException
@@ -31,10 +32,10 @@ class DialogErrorObserver(
 		if (canResolve(value)) {
 			dialogBuilder.setPositiveButton(ExceptionResolver.getResolveStringId(value), listener)
 		} else if (value is ParseException) {
-			val router = router()
-			if (router != null && value.isSerializable()) {
+			val fm = fragmentManager
+			if (fm != null && value.isSerializable()) {
 				dialogBuilder.setPositiveButton(R.string.details) { _, _ ->
-					router.showErrorDialog(value)
+					ErrorDetailsDialog.show(fm, value, value.url)
 				}
 			}
 		}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ErrorObserver.kt
@@ -4,7 +4,6 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.LifecycleOwner
@@ -12,7 +11,6 @@ import androidx.lifecycle.coroutineScope
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.util.ext.findActivity
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope

@@ -35,8 +33,6 @@ abstract class ErrorObserver(
 		return resolver != null && ExceptionResolver.canResolve(error)
 	}

-	protected fun router() = fragment?.router ?: (activity as? FragmentActivity)?.router
-
 	private fun isAlive(): Boolean {
 		return when {
 			fragment != null -> fragment.view != null
@@ -48,7 +44,7 @@ abstract class ErrorObserver(
 	protected fun resolve(error: Throwable) {
 		if (isAlive()) {
 			lifecycleScope.launch {
-				val isResolved = resolver?.resolve(error) == true
+				val isResolved = resolver?.resolve(error) ?: false
 				if (isActive) {
 					onResolved?.accept(isResolved)
 				}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
@@ -5,22 +5,20 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultCaller
 import androidx.annotation.StringRes
 import androidx.collection.MutableScatterMap
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
+import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.nav.router
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
-import org.koitharu.kotatsu.core.util.ext.isHttpUrl
 import org.koitharu.kotatsu.core.util.ext.restartApplication
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
@@ -28,6 +26,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.domain.ScrobblerAuthRequiredException
 import org.koitharu.kotatsu.scrobbling.common.ui.ScrobblerAuthHelper
+import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
 import java.security.cert.CertPathValidatorException
 import javax.inject.Provider
@@ -50,8 +49,8 @@ class ExceptionResolver @AssistedInject constructor(
 		handleActivityResult(CloudFlareActivity.TAG, it)
 	}

-	fun showErrorDetails(e: Throwable, url: String? = null) {
-		host.router()?.showErrorDialog(e, url)
+	fun showDetails(e: Throwable, url: String?) {
+		ErrorDetailsDialog.show(host.getChildFragmentManager(), e, url)
 	}

 	suspend fun resolve(e: Throwable): Boolean = when (e) {
@@ -64,7 +63,9 @@ class ExceptionResolver @AssistedInject constructor(
 		}

 		is ProxyConfigException -> {
-			host.router()?.openProxySettings()
+			host.withContext {
+				startActivity(SettingsActivity.newProxySettingsIntent(this))
+			}
 			false
 		}

@@ -84,7 +85,9 @@ class ExceptionResolver @AssistedInject constructor(
 				true
 			} else {
 				host.withContext {
-					authHelper.startAuth(this, e.scrobbler).onFailure(::showErrorDetails)
+					authHelper.startAuth(this, e.scrobbler).onFailure {
+						showDetails(it, null)
+					}
 				}
 				false
 			}
@@ -103,12 +106,12 @@ class ExceptionResolver @AssistedInject constructor(
 		sourceAuthContract.launch(source)
 	}

-	private fun openInBrowser(url: String) {
-		host.router()?.openBrowser(url, null, null)
+	private fun openInBrowser(url: String) = host.withContext {
+		startActivity(BrowserActivity.newIntent(this, url, null, null))
 	}

-	private fun openAlternatives(manga: Manga) {
-		host.router()?.openAlternatives(manga)
+	private fun openAlternatives(manga: Manga) = host.withContext {
+		startActivity(AlternativesActivity.newIntent(this, manga))
 	}

 	private fun handleActivityResult(tag: String, result: Boolean) {
@@ -137,12 +140,6 @@ class ExceptionResolver @AssistedInject constructor(
 		getContext()?.apply(block)
 	}

-	private fun Host.router(): AppRouter? = when (this) {
-		is FragmentActivity -> router
-		is Fragment -> router
-		else -> null
-	}
-
 	interface Host : ActivityResultCaller {

 		fun getChildFragmentManager(): FragmentManager
@@ -164,7 +161,7 @@ class ExceptionResolver @AssistedInject constructor(
 			is ScrobblerAuthRequiredException,
 			is AuthRequiredException -> R.string.sign_in

-			is NotFoundException -> if (e.url.isHttpUrl()) R.string.open_in_browser else 0
+			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
 			is UnsupportedSourceException -> if (e.manga != null) R.string.alternatives else 0
 			is SSLException,
 			is CertPathValidatorException -> R.string.fix
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/SnackbarErrorObserver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/SnackbarErrorObserver.kt
@@ -5,6 +5,7 @@ import androidx.core.util.Consumer
 import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.isSerializable
 import org.koitharu.kotatsu.main.ui.owners.BottomNavOwner
@@ -32,10 +33,10 @@ class SnackbarErrorObserver(
 				resolve(value)
 			}
 		} else if (value is ParseException) {
-			val router = router()
-			if (router != null && value.isSerializable()) {
+			val fm = fragmentManager
+			if (fm != null && value.isSerializable()) {
 				snackbar.setAction(R.string.details) {
-					router.showErrorDialog(value)
+					ErrorDetailsDialog.show(fm, value, value.url)
 				}
 			}
 		}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt
@@ -21,7 +21,6 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.parseJsonArray
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.parsers.util.suspendlazy.getOrNull
 import javax.inject.Inject
 import javax.inject.Singleton

@@ -43,9 +42,6 @@ class AppUpdateRepository @Inject constructor(
 		append("/releases?page=1&per_page=10")
 	}

-	val isUpdateAvailable: Boolean
-		get() = availableUpdate.value != null
-
 	fun observeAvailableUpdate() = availableUpdate.asStateFlow()

 	suspend fun getAvailableVersions(): List<AppVersion> {
@@ -89,8 +85,8 @@ class AppUpdateRepository @Inject constructor(
 	}

 	@Suppress("KotlinConstantConditions")
-	suspend fun isUpdateSupported(): Boolean {
-		return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp.getOrNull() == true
+	fun isUpdateSupported(): Boolean {
+		return BuildConfig.BUILD_TYPE != BUILD_TYPE_RELEASE || appValidator.isOriginalApp
 	}

 	suspend fun getCurrentVersionChangelog(): String? {
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/image/AvifImageDecoder.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/image/AvifImageDecoder.kt
@@ -1,23 +1,18 @@
 package org.koitharu.kotatsu.core.image

 import android.graphics.Bitmap
-import androidx.core.graphics.createBitmap
-import androidx.core.graphics.scale
 import coil3.ImageLoader
 import coil3.asImage
 import coil3.decode.DecodeResult
-import coil3.decode.DecodeUtils
 import coil3.decode.Decoder
 import coil3.decode.ImageSource
 import coil3.fetch.SourceFetchResult
 import coil3.request.Options
-import coil3.request.maxBitmapSize
-import coil3.util.component1
-import coil3.util.component2
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecodeException
 import kotlinx.coroutines.runInterruptible
 import org.aomedia.avif.android.AvifDecoder
-import org.koitharu.kotatsu.core.util.ext.readByteBuffer
+import org.aomedia.avif.android.AvifDecoder.Info
+import org.koitharu.kotatsu.core.util.ext.toByteBuffer

 class AvifImageDecoder(
 	private val source: ImageSource,
@@ -25,52 +20,27 @@ class AvifImageDecoder(
 ) : Decoder {

 	override suspend fun decode(): DecodeResult = runInterruptible {
-		val bytes = source.source().readByteBuffer()
-		val decoder = AvifDecoder.create(bytes) ?: throw ImageDecodeException(
-			uri = source.fileOrNull()?.toString(),
-			format = "avif",
-			message = "Requested to decode byte buffer which cannot be handled by AvifDecoder",
-		)
-		try {
-			val config = if (decoder.depth == 8 || decoder.alphaPresent) {
-				Bitmap.Config.ARGB_8888
-			} else {
-				Bitmap.Config.RGB_565
-			}
-			val bitmap = createBitmap(decoder.width, decoder.height, config)
-			val result = decoder.nextFrame(bitmap)
-			if (result != 0) {
-				bitmap.recycle()
-				throw ImageDecodeException(
-					uri = source.fileOrNull()?.toString(),
-					format = "avif",
-					message = AvifDecoder.resultToString(result),
-				)
-			}
-			// downscaling
-			val (dstWidth, dstHeight) = DecodeUtils.computeDstSize(
-				srcWidth = bitmap.width,
-				srcHeight = bitmap.height,
-				targetSize = options.size,
-				scale = options.scale,
-				maxSize = options.maxBitmapSize,
-			)
-			if (dstWidth < bitmap.width || dstHeight < bitmap.height) {
-				val scaled = bitmap.scale(dstWidth, dstHeight)
-				bitmap.recycle()
-				DecodeResult(
-					image = scaled.asImage(),
-					isSampled = true,
-				)
-			} else {
-				DecodeResult(
-					image = bitmap.asImage(),
-					isSampled = false,
-				)
-			}
-		} finally {
-			decoder.release()
+		val bytes = source.source().use {
+			it.inputStream().toByteBuffer()
 		}
+		val info = Info()
+		if (!AvifDecoder.getInfo(bytes, bytes.remaining(), info)) {
+			throw ImageDecodeException(
+				null,
+				"avif",
+				"Requested to decode byte buffer which cannot be handled by AvifDecoder",
+			)
+		}
+		val config = if (info.depth == 8 || info.alphaPresent) Bitmap.Config.ARGB_8888 else Bitmap.Config.RGB_565
+		val bitmap = Bitmap.createBitmap(info.width, info.height, config)
+		if (!AvifDecoder.decode(bytes, bytes.remaining(), bitmap)) {
+			bitmap.recycle()
+			throw ImageDecodeException(null, "avif")
+		}
+		DecodeResult(
+			image = bitmap.asImage(),
+			isSampled = false,
+		)
 	}

 	class Factory : Decoder.Factory {
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/image/BitmapDecoderCompat.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/image/BitmapDecoderCompat.kt
@@ -2,36 +2,29 @@ package org.koitharu.kotatsu.core.image

 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.BitmapRegionDecoder
 import android.graphics.ImageDecoder
 import android.os.Build
+import android.webkit.MimeTypeMap
 import androidx.annotation.RequiresApi
-import androidx.core.graphics.createBitmap
 import com.davemorrissey.labs.subscaleview.decoder.ImageDecodeException
-import okio.IOException
-import okio.buffer
-import okio.source
+import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import org.aomedia.avif.android.AvifDecoder
 import org.aomedia.avif.android.AvifDecoder.Info
 import org.jetbrains.annotations.Blocking
-import org.koitharu.kotatsu.core.util.MimeTypes
-import org.koitharu.kotatsu.core.util.ext.MimeType
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.readByteBuffer
 import org.koitharu.kotatsu.core.util.ext.toByteBuffer
-import org.koitharu.kotatsu.core.util.ext.toMimeTypeOrNull
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.io.File
 import java.io.InputStream
 import java.nio.ByteBuffer
+import java.nio.file.Files

 object BitmapDecoderCompat {

 	private const val FORMAT_AVIF = "avif"

 	@Blocking
-	fun decode(file: File): Bitmap = when (val format = probeMimeType(file)?.subtype) {
-		FORMAT_AVIF -> file.source().buffer().use { decodeAvif(it.readByteBuffer()) }
+	fun decode(file: File): Bitmap = when (val format = getMimeType(file)?.subtype) {
+		FORMAT_AVIF -> file.inputStream().use { decodeAvif(it.toByteBuffer()) }
 		else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 			ImageDecoder.decodeBitmap(ImageDecoder.createSource(file))
 		} else {
@@ -40,7 +33,7 @@ object BitmapDecoderCompat {
 	}

 	@Blocking
-	fun decode(stream: InputStream, type: MimeType?, isMutable: Boolean = false): Bitmap {
+	fun decode(stream: InputStream, type: MediaType?, isMutable: Boolean = false): Bitmap {
 		val format = type?.subtype
 		if (format == FORMAT_AVIF) {
 			return decodeAvif(stream.toByteBuffer())
@@ -58,33 +51,12 @@ object BitmapDecoderCompat {
 		}
 	}

-	@Blocking
-	fun createRegionDecoder(inoutStream: InputStream): BitmapRegionDecoder? = try {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-			BitmapRegionDecoder.newInstance(inoutStream)
-		} else {
-			@Suppress("DEPRECATION")
-			BitmapRegionDecoder.newInstance(inoutStream, false)
-		}
-	} catch (e: IOException) {
-		e.printStackTraceDebug()
-		null
+	private fun getMimeType(file: File): MediaType? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+		Files.probeContentType(file.toPath())?.toMediaTypeOrNull()
+	} else {
+		MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.extension)?.toMediaTypeOrNull()
 	}

-	@Blocking
-	fun probeMimeType(file: File): MimeType? {
-		return MimeTypes.probeMimeType(file) ?: detectBitmapType(file)
-	}
-
-	@Blocking
-	private fun detectBitmapType(file: File): MimeType? = runCatchingCancellable {
-		val options = BitmapFactory.Options().apply {
-			inJustDecodeBounds = true
-		}
-		BitmapFactory.decodeFile(file.path, options)?.recycle()
-		options.outMimeType?.toMimeTypeOrNull()
-	}.getOrNull()
-
 	private fun checkBitmapNotNull(bitmap: Bitmap?, format: String?): Bitmap =
 		bitmap ?: throw ImageDecodeException(null, format)

@@ -98,7 +70,7 @@ object BitmapDecoderCompat {
 			)
 		}
 		val config = if (info.depth == 8 || info.alphaPresent) Bitmap.Config.ARGB_8888 else Bitmap.Config.RGB_565
-		val bitmap = createBitmap(info.width, info.height, config)
+		val bitmap = Bitmap.createBitmap(info.width, info.height, config)
 		if (!AvifDecoder.decode(bytes, bytes.remaining(), bitmap)) {
 			bitmap.recycle()
 			throw ImageDecodeException(null, FORMAT_AVIF)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/image/CbzFetcher.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/image/CbzFetcher.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.image

 import android.net.Uri
+import android.webkit.MimeTypeMap
 import coil3.ImageLoader
 import coil3.decode.DataSource
 import coil3.decode.ImageSource
@@ -11,7 +12,6 @@ import coil3.toAndroidUri
 import kotlinx.coroutines.runInterruptible
 import okio.Path.Companion.toPath
 import okio.openZip
-import org.koitharu.kotatsu.core.util.MimeTypes
 import org.koitharu.kotatsu.core.util.ext.isZipUri
 import coil3.Uri as CoilUri

@@ -23,10 +23,9 @@ class CbzFetcher(
 	override suspend fun fetch() = runInterruptible {
 		val filePath = uri.schemeSpecificPart.toPath()
 		val entryName = requireNotNull(uri.fragment)
-		val fs = options.fileSystem.openZip(filePath)
 		SourceFetchResult(
-			source = ImageSource(entryName.toPath(), fs),
-			mimeType = MimeTypes.getMimeTypeFromExtension(entryName)?.toString(),
+			source = ImageSource(entryName.toPath(), options.fileSystem.openZip(filePath)),
+			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(entryName.substringAfterLast('.', "")),
 			dataSource = DataSource.DISK,
 		)
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/image/CoilMemoryCacheKey.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/image/CoilMemoryCacheKey.kt
@@ -1,48 +0,0 @@
-package org.koitharu.kotatsu.core.image
-
-import android.os.Parcel
-import android.os.Parcelable
-import android.view.View
-import androidx.collection.ArrayMap
-import coil3.memory.MemoryCache
-import coil3.request.SuccessResult
-import coil3.util.CoilUtils
-import kotlinx.parcelize.Parceler
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class CoilMemoryCacheKey(
-	val data: MemoryCache.Key
-) : Parcelable {
-
-	companion object : Parceler<CoilMemoryCacheKey> {
-		override fun CoilMemoryCacheKey.write(parcel: Parcel, flags: Int) = with(data) {
-			parcel.writeString(key)
-			parcel.writeInt(extras.size)
-			for (entry in extras.entries) {
-				parcel.writeString(entry.key)
-				parcel.writeString(entry.value)
-			}
-		}
-
-		override fun create(parcel: Parcel): CoilMemoryCacheKey = CoilMemoryCacheKey(
-			MemoryCache.Key(
-				key = parcel.readString().orEmpty(),
-				extras = run {
-					val size = parcel.readInt()
-					val map = ArrayMap<String, String>(size)
-					repeat(size) {
-						map.put(parcel.readString(), parcel.readString())
-					}
-					map
-				},
-			),
-		)
-
-		fun from(view: View): CoilMemoryCacheKey? {
-			return (CoilUtils.result(view) as? SuccessResult)?.memoryCacheKey?.let {
-				CoilMemoryCacheKey(it)
-			}
-		}
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/image/RegionBitmapDecoder.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/image/RegionBitmapDecoder.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.image

 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.BitmapRegionDecoder
 import android.graphics.Rect
 import android.os.Build
 import coil3.Extras
@@ -10,6 +11,7 @@ import coil3.asImage
 import coil3.decode.DecodeResult
 import coil3.decode.DecodeUtils
 import coil3.decode.Decoder
+import coil3.decode.ImageSource
 import coil3.fetch.SourceFetchResult
 import coil3.getExtra
 import coil3.request.Options
@@ -23,37 +25,24 @@ import coil3.size.Scale
 import coil3.size.Size
 import coil3.size.isOriginal
 import coil3.size.pxOrElse
-import org.koitharu.kotatsu.core.util.ext.copyWithNewSource
+import kotlinx.coroutines.runInterruptible
 import kotlin.math.roundToInt

 class RegionBitmapDecoder(
-	private val fetchResult: SourceFetchResult,
+	private val source: ImageSource,
 	private val options: Options,
-	private val imageLoader: ImageLoader,
 ) : Decoder {

-	override suspend fun decode(): DecodeResult? {
-		val regionDecoder = BitmapDecoderCompat.createRegionDecoder(fetchResult.source.source().inputStream())
-		if (regionDecoder == null) {
-			val revivedFetchResult = fetchResult.copyWithNewSource()
-			return try {
-				val fallbackDecoder = imageLoader.components.newDecoder(
-					result = revivedFetchResult,
-					options = options,
-					imageLoader = imageLoader,
-					startIndex = 0,
-				)?.first
-				if (fallbackDecoder == null || fallbackDecoder is RegionBitmapDecoder) {
-					null
-				} else {
-					fallbackDecoder.decode()
-				}
-			} finally {
-				revivedFetchResult.source.close()
-			}
+	override suspend fun decode(): DecodeResult = runInterruptible {
+		val regionDecoder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			BitmapRegionDecoder.newInstance(source.source().inputStream())
+		} else {
+			@Suppress("DEPRECATION")
+			BitmapRegionDecoder.newInstance(source.source().inputStream(), false)
 		}
+		checkNotNull(regionDecoder)
 		val bitmapOptions = BitmapFactory.Options()
-		return try {
+		try {
 			val rect = bitmapOptions.configureScale(regionDecoder.width, regionDecoder.height)
 			bitmapOptions.configureConfig()
 			val bitmap = regionDecoder.decodeRegion(rect, bitmapOptions)
@@ -160,7 +149,7 @@ class RegionBitmapDecoder(
 			result: SourceFetchResult,
 			options: Options,
 			imageLoader: ImageLoader
-		): Decoder = RegionBitmapDecoder(result, options, imageLoader)
+		): Decoder = RegionBitmapDecoder(result.source, options)

 		override fun equals(other: Any?) = other is Factory

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt
@@ -1,12 +1,10 @@
 package org.koitharu.kotatsu.core.model

-import android.content.res.Resources
 import android.net.Uri
 import android.text.SpannableStringBuilder
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.collection.MutableObjectIntMap
-import androidx.core.net.toUri
 import androidx.core.os.LocaleListCompat
 import androidx.core.text.buildSpannedString
 import androidx.core.text.strikeThrough
@@ -126,8 +124,7 @@ val Manga.isBroken: Boolean
 	get() = source == UnknownMangaSource

 val Manga.appUrl: Uri
-	get() = "https://kotatsu.app/manga".toUri()
-		.buildUpon()
+	get() = Uri.parse("https://kotatsu.app/manga").buildUpon()
 		.appendQueryParameter("source", source.name)
 		.appendQueryParameter("name", title)
 		.appendQueryParameter("url", url)
@@ -149,8 +146,6 @@ fun Manga.chaptersCount(): Int {
 	return max
 }

-fun Manga.isNsfw(): Boolean = contentRating == ContentRating.ADULT || source.isNsfw()
-
 fun MangaListFilter.getSummary() = buildSpannedString {
 	if (!query.isNullOrEmpty()) {
 		append(query)
@@ -173,24 +168,3 @@ private fun SpannableStringBuilder.appendTagsSummary(filter: MangaListFilter) {
 		}
 	}
 }
-
-fun MangaChapter.getLocalizedTitle(resources: Resources, index: Int = -1): String {
-	title?.let {
-		if (it.isNotBlank()) {
-			return it
-		}
-	}
-	val num = numberString()
-	val vol = volumeString()
-	return when {
-		num != null && vol != null -> resources.getString(R.string.chapter_volume_number, vol, num)
-		num != null -> resources.getString(R.string.chapter_number, num)
-		index > 0 -> resources.getString(
-			R.string.chapters_time_pattern,
-			resources.getString(R.string.unnamed_chapter),
-			index.toString(),
-		)
-
-		else -> resources.getString(R.string.unnamed_chapter)
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/MangaSource.kt
@@ -2,29 +2,22 @@ package org.koitharu.kotatsu.core.model

 import android.content.Context
 import android.graphics.Color
-import android.os.Build
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
-import android.text.style.ImageSpan
 import android.text.style.RelativeSizeSpan
 import android.text.style.SuperscriptSpan
-import android.widget.TextView
-import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.core.content.ContextCompat
 import androidx.core.text.inSpans
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
 import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.toLocale
-import org.koitharu.kotatsu.core.util.ext.toLocaleOrNull
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.splitTwoParts
-import java.util.Locale
-import androidx.appcompat.R as appcompatR
+import com.google.android.material.R as materialR

 data object LocalMangaSource : MangaSource {
 	override val name = "LOCAL"
@@ -81,8 +74,6 @@ tailrec fun MangaSource.unwrap(): MangaSource = if (this is MangaSourceInfo) {
 	this
 }

-fun MangaSource.getLocale(): Locale? = (unwrap() as? MangaParserSource)?.locale?.toLocaleOrNull()
-
 fun MangaSource.getSummary(context: Context): String? = when (val source = unwrap()) {
 	is MangaParserSource -> {
 		val type = context.getString(source.contentType.titleResId)
@@ -103,22 +94,9 @@ fun MangaSource.getTitle(context: Context): String = when (val source = unwrap()
 }

 fun SpannableStringBuilder.appendNsfwLabel(context: Context) = inSpans(
-	ForegroundColorSpan(context.getThemeColor(appcompatR.attr.colorError, Color.RED)),
+	ForegroundColorSpan(context.getThemeColor(materialR.attr.colorError, Color.RED)),
 	RelativeSizeSpan(0.74f),
 	SuperscriptSpan(),
 ) {
 	append(context.getString(R.string.nsfw))
 }
-
-fun SpannableStringBuilder.appendIcon(textView: TextView, @DrawableRes resId: Int): SpannableStringBuilder {
-	val icon = ContextCompat.getDrawable(textView.context, resId) ?: return this
-	icon.setTintList(textView.textColors)
-	val size = textView.lineHeight
-	icon.setBounds(0, 0, size, size)
-	val alignment = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		ImageSpan.ALIGN_CENTER
-	} else {
-		ImageSpan.ALIGN_BOTTOM
-	}
-	return inSpans(ImageSpan(icon, alignment)) { append(' ') }
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/QuickFilter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/QuickFilter.kt
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.model
-
-import org.koitharu.kotatsu.core.ui.widgets.ChipsView
-import org.koitharu.kotatsu.list.domain.ListFilterOption
-
-fun ListFilterOption.toChipModel(isChecked: Boolean) = ChipsView.ChipModel(
-	title = titleText,
-	titleResId = titleResId,
-	icon = iconResId,
-	iconData = getIconData(),
-	isChecked = isChecked,
-	data = this,
-)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableChapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableChapter.kt
@@ -17,7 +17,7 @@ data class ParcelableChapter(
 		override fun create(parcel: Parcel) = ParcelableChapter(
 			MangaChapter(
 				id = parcel.readLong(),
-				title = parcel.readString(),
+				name = parcel.readString().orEmpty(),
 				number = parcel.readFloat(),
 				volume = parcel.readInt(),
 				url = parcel.readString().orEmpty(),
@@ -30,7 +30,7 @@ data class ParcelableChapter(

 		override fun ParcelableChapter.write(parcel: Parcel, flags: Int) = with(chapter) {
 			parcel.writeLong(id)
-			parcel.writeString(title)
+			parcel.writeString(name)
 			parcel.writeFloat(number)
 			parcel.writeInt(volume)
 			parcel.writeString(url)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
@@ -7,8 +7,6 @@ import kotlinx.parcelize.Parcelize
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.util.ext.readParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.readSerializableCompat
-import org.koitharu.kotatsu.core.util.ext.readStringSet
-import org.koitharu.kotatsu.core.util.ext.writeStringSet
 import org.koitharu.kotatsu.parsers.model.Manga

@Parcelize
@@ -22,7 +20,7 @@ data class ParcelableManga(
 		override fun ParcelableManga.write(parcel: Parcel, flags: Int) = with(manga) {
 			parcel.writeLong(id)
 			parcel.writeString(title)
-			parcel.writeStringSet(altTitles)
+			parcel.writeString(altTitle)
 			parcel.writeString(url)
 			parcel.writeString(publicUrl)
 			parcel.writeFloat(rating)
@@ -32,7 +30,7 @@ data class ParcelableManga(
 			parcel.writeString(description.takeIf { withDescription })
 			parcel.writeParcelable(ParcelableMangaTags(tags), flags)
 			parcel.writeSerializable(state)
-			parcel.writeStringSet(authors)
+			parcel.writeString(author)
 			parcel.writeString(source.name)
 		}

@@ -40,7 +38,7 @@ data class ParcelableManga(
 			Manga(
 				id = parcel.readLong(),
 				title = requireNotNull(parcel.readString()),
-				altTitles = parcel.readStringSet(),
+				altTitle = parcel.readString(),
 				url = requireNotNull(parcel.readString()),
 				publicUrl = requireNotNull(parcel.readString()),
 				rating = parcel.readFloat(),
@@ -50,7 +48,7 @@ data class ParcelableManga(
 				description = parcel.readString(),
 				tags = requireNotNull(parcel.readParcelableCompat<ParcelableMangaTags>()).tags,
 				state = parcel.readSerializableCompat(),
-				authors = parcel.readStringSet(),
+				author = parcel.readString(),
 				chapters = null,
 				source = MangaSource(parcel.readString()),
 			),
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaListFilter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/model/parcelable/ParcelableMangaListFilter.kt
@@ -30,7 +30,6 @@ object MangaListFilterParceler : Parceler<MangaListFilter> {
 		parcel.writeInt(year)
 		parcel.writeInt(yearFrom)
 		parcel.writeInt(yearTo)
-		parcel.writeString(author)
 	}

 	override fun create(parcel: Parcel) = MangaListFilter(
@@ -46,7 +45,6 @@ object MangaListFilterParceler : Parceler<MangaListFilter> {
 		year = parcel.readInt(),
 		yearFrom = parcel.readInt(),
 		yearTo = parcel.readInt(),
-		author = parcel.readString(),
 	)
 }

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouter.kt
@@ -1,809 +0,0 @@
-package org.koitharu.kotatsu.core.nav
-
-import android.accounts.Account
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.provider.Settings
-import android.view.View
-import androidx.annotation.CheckResult
-import androidx.annotation.UiContext
-import androidx.core.app.ShareCompat
-import androidx.core.content.FileProvider
-import androidx.core.net.toUri
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.findFragment
-import androidx.lifecycle.LifecycleOwner
-import dagger.hilt.android.EntryPointAccessors
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
-import org.koitharu.kotatsu.bookmarks.ui.AllBookmarksActivity
-import org.koitharu.kotatsu.browser.BrowserActivity
-import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
-import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
-import org.koitharu.kotatsu.core.image.CoilMemoryCacheKey
-import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.MangaSourceInfo
-import org.koitharu.kotatsu.core.model.appUrl
-import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.model.isBroken
-import org.koitharu.kotatsu.core.model.isLocal
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaListFilter
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaPage
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.parser.external.ExternalMangaSource
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.ReaderMode
-import org.koitharu.kotatsu.core.prefs.TriStateOption
-import org.koitharu.kotatsu.core.ui.dialog.BigButtonsAlertDialog
-import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
-import org.koitharu.kotatsu.core.ui.dialog.buildAlertDialog
-import org.koitharu.kotatsu.core.util.ext.connectivityManager
-import org.koitharu.kotatsu.core.util.ext.findActivity
-import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
-import org.koitharu.kotatsu.core.util.ext.toFileOrNull
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import org.koitharu.kotatsu.core.util.ext.withArgs
-import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet
-import org.koitharu.kotatsu.details.ui.related.RelatedMangaActivity
-import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoSheet
-import org.koitharu.kotatsu.download.ui.dialog.DownloadDialogFragment
-import org.koitharu.kotatsu.download.ui.list.DownloadsActivity
-import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
-import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteDialog
-import org.koitharu.kotatsu.filter.ui.FilterCoordinator
-import org.koitharu.kotatsu.filter.ui.sheet.FilterSheetFragment
-import org.koitharu.kotatsu.filter.ui.tags.TagsCatalogSheet
-import org.koitharu.kotatsu.history.ui.HistoryActivity
-import org.koitharu.kotatsu.image.ui.ImageActivity
-import org.koitharu.kotatsu.list.ui.config.ListConfigBottomSheet
-import org.koitharu.kotatsu.list.ui.config.ListConfigSection
-import org.koitharu.kotatsu.local.ui.ImportDialogFragment
-import org.koitharu.kotatsu.local.ui.info.LocalInfoDialog
-import org.koitharu.kotatsu.main.ui.MainActivity
-import org.koitharu.kotatsu.main.ui.welcome.WelcomeSheet
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaListFilter
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.ellipsize
-import org.koitharu.kotatsu.parsers.util.isNullOrEmpty
-import org.koitharu.kotatsu.parsers.util.mapToArray
-import org.koitharu.kotatsu.reader.ui.colorfilter.ColorFilterConfigActivity
-import org.koitharu.kotatsu.reader.ui.config.ReaderConfigSheet
-import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerService
-import org.koitharu.kotatsu.scrobbling.common.ui.config.ScrobblerConfigActivity
-import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
-import org.koitharu.kotatsu.search.domain.SearchKind
-import org.koitharu.kotatsu.search.ui.MangaListActivity
-import org.koitharu.kotatsu.search.ui.multi.SearchActivity
-import org.koitharu.kotatsu.settings.SettingsActivity
-import org.koitharu.kotatsu.settings.about.AppUpdateActivity
-import org.koitharu.kotatsu.settings.backup.BackupDialogFragment
-import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
-import org.koitharu.kotatsu.settings.reader.ReaderTapGridConfigActivity
-import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
-import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
-import org.koitharu.kotatsu.settings.storage.MangaDirectorySelectDialog
-import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity
-import org.koitharu.kotatsu.settings.tracker.categories.TrackerCategoriesConfigSheet
-import org.koitharu.kotatsu.stats.ui.StatsActivity
-import org.koitharu.kotatsu.stats.ui.sheet.MangaStatsSheet
-import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
-import org.koitharu.kotatsu.tracker.ui.updates.UpdatesActivity
-import java.io.File
-import androidx.appcompat.R as appcompatR
-
-class AppRouter private constructor(
-	private val activity: FragmentActivity?,
-	private val fragment: Fragment?,
-) {
-
-	constructor(activity: FragmentActivity) : this(activity, null)
-
-	constructor(fragment: Fragment) : this(null, fragment)
-
-	private val settings: AppSettings by lazy {
-		EntryPointAccessors.fromApplication<AppRouterEntryPoint>(checkNotNull(contextOrNull())).settings
-	}
-
-	/** Activities **/
-
-	fun openList(source: MangaSource, filter: MangaListFilter?, sortOrder: SortOrder?) {
-		startActivity(listIntent(contextOrNull() ?: return, source, filter, sortOrder))
-	}
-
-	fun openList(tag: MangaTag) = openList(tag.source, MangaListFilter(tags = setOf(tag)), null)
-
-	fun openSearch(query: String, kind: SearchKind = SearchKind.SIMPLE) {
-		startActivity(
-			Intent(contextOrNull() ?: return, SearchActivity::class.java)
-				.putExtra(KEY_QUERY, query)
-				.putExtra(KEY_KIND, kind),
-		)
-	}
-
-	fun openSearch(source: MangaSource, query: String) = openList(source, MangaListFilter(query = query), null)
-
-	fun openDetails(manga: Manga) {
-		startActivity(detailsIntent(contextOrNull() ?: return, manga))
-	}
-
-	fun openDetails(mangaId: Long) {
-		startActivity(detailsIntent(contextOrNull() ?: return, mangaId))
-	}
-
-	fun openDetails(link: Uri) {
-		startActivity(
-			Intent(contextOrNull() ?: return, DetailsActivity::class.java)
-				.setData(link),
-		)
-	}
-
-	fun openReader(manga: Manga, anchor: View? = null) {
-		openReader(
-			ReaderIntent.Builder(contextOrNull() ?: return)
-				.manga(manga)
-				.build(),
-			anchor,
-		)
-	}
-
-	fun openReader(intent: ReaderIntent, anchor: View? = null) {
-		startActivity(intent.intent, anchor?.let { view -> scaleUpActivityOptionsOf(view) })
-	}
-
-	fun openAlternatives(manga: Manga) {
-		startActivity(
-			Intent(contextOrNull() ?: return, AlternativesActivity::class.java)
-				.putExtra(KEY_MANGA, ParcelableManga(manga)),
-		)
-	}
-
-	fun openRelated(manga: Manga) {
-		startActivity(
-			Intent(contextOrNull(), RelatedMangaActivity::class.java)
-				.putExtra(KEY_MANGA, ParcelableManga(manga)),
-		)
-	}
-
-	fun openImage(url: String, source: MangaSource?, anchor: View? = null, preview: CoilMemoryCacheKey? = null) {
-		startActivity(
-			Intent(contextOrNull(), ImageActivity::class.java)
-				.setData(url.toUri())
-				.putExtra(KEY_SOURCE, source?.name)
-				.putExtra(KEY_PREVIEW, preview),
-			anchor?.let { scaleUpActivityOptionsOf(it) },
-		)
-	}
-
-	fun openBookmarks() = startActivity(AllBookmarksActivity::class.java)
-
-	fun openAppUpdate() = startActivity(AppUpdateActivity::class.java)
-
-	fun openSuggestions() {
-		startActivity(suggestionsIntent(contextOrNull() ?: return))
-	}
-
-	fun openSourcesCatalog() = startActivity(SourcesCatalogActivity::class.java)
-
-	fun openDownloads() = startActivity(DownloadsActivity::class.java)
-
-	fun openDirectoriesSettings() = startActivity(MangaDirectoriesActivity::class.java)
-
-	fun openBrowser(url: String, source: MangaSource?, title: String?) {
-		startActivity(
-			Intent(contextOrNull() ?: return, BrowserActivity::class.java)
-				.setData(url.toUri())
-				.putExtra(KEY_TITLE, title)
-				.putExtra(KEY_SOURCE, source?.name),
-		)
-	}
-
-	fun openColorFilterConfig(manga: Manga, page: MangaPage) {
-		startActivity(
-			Intent(contextOrNull(), ColorFilterConfigActivity::class.java)
-				.putExtra(KEY_MANGA, ParcelableManga(manga))
-				.putExtra(KEY_PAGES, ParcelableMangaPage(page)),
-		)
-	}
-
-	fun openHistory() = startActivity(HistoryActivity::class.java)
-
-	fun openFavorites() = startActivity(FavouritesActivity::class.java)
-
-	fun openFavorites(category: FavouriteCategory) {
-		startActivity(
-			Intent(contextOrNull() ?: return, FavouritesActivity::class.java)
-				.putExtra(KEY_ID, category.id)
-				.putExtra(KEY_TITLE, category.title),
-		)
-	}
-
-	fun openFavoriteCategories() = startActivity(FavouriteCategoriesActivity::class.java)
-
-	fun openFavoriteCategoryEdit(categoryId: Long) {
-		startActivity(
-			Intent(contextOrNull() ?: return, FavouritesCategoryEditActivity::class.java)
-				.putExtra(KEY_ID, categoryId),
-		)
-	}
-
-	fun openFavoriteCategoryCreate() = openFavoriteCategoryEdit(FavouritesCategoryEditActivity.NO_ID)
-
-	fun openMangaUpdates() {
-		startActivity(mangaUpdatesIntent(contextOrNull() ?: return))
-	}
-
-	fun openSettings() = startActivity(SettingsActivity::class.java)
-
-	fun openReaderSettings() {
-		startActivity(readerSettingsIntent(contextOrNull() ?: return))
-	}
-
-	fun openProxySettings() {
-		startActivity(proxySettingsIntent(contextOrNull() ?: return))
-	}
-
-	fun openDownloadsSetting() {
-		startActivity(downloadsSettingsIntent(contextOrNull() ?: return))
-	}
-
-	fun openSourceSettings(source: MangaSource) {
-		startActivity(sourceSettingsIntent(contextOrNull() ?: return, source))
-	}
-
-	fun openSuggestionsSettings() {
-		startActivity(suggestionsSettingsIntent(contextOrNull() ?: return))
-	}
-
-	fun openSourcesSettings() {
-		startActivity(sourcesSettingsIntent(contextOrNull() ?: return))
-	}
-
-	fun openReaderTapGridSettings() = startActivity(ReaderTapGridConfigActivity::class.java)
-
-	fun openScrobblerSettings(scrobbler: ScrobblerService) {
-		startActivity(
-			Intent(contextOrNull() ?: return, ScrobblerConfigActivity::class.java)
-				.putExtra(KEY_ID, scrobbler.id),
-		)
-	}
-
-	fun openSourceAuth(source: MangaSource) {
-		startActivity(sourceAuthIntent(contextOrNull() ?: return, source))
-	}
-
-	fun openManageSources() {
-		startActivity(
-			manageSourcesIntent(contextOrNull() ?: return),
-		)
-	}
-
-	fun openStatistic() = startActivity(StatsActivity::class.java)
-
-	@CheckResult
-	fun openExternalBrowser(url: String, chooserTitle: CharSequence? = null): Boolean {
-		val intent = Intent(Intent.ACTION_VIEW)
-		intent.data = url.toUriOrNull() ?: return false
-		return startActivitySafe(
-			if (!chooserTitle.isNullOrEmpty()) {
-				Intent.createChooser(intent, chooserTitle)
-			} else {
-				intent
-			},
-		)
-	}
-
-	@CheckResult
-	fun openSystemSyncSettings(account: Account): Boolean {
-		val args = Bundle(1)
-		args.putParcelable(ACCOUNT_KEY, account)
-		val intent = Intent(ACTION_ACCOUNT_SYNC_SETTINGS)
-		intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args)
-		return startActivitySafe(intent)
-	}
-
-	/** Dialogs **/
-
-	fun showDownloadDialog(manga: Manga, snackbarHost: View?) = showDownloadDialog(setOf(manga), snackbarHost)
-
-	fun showDownloadDialog(manga: Collection<Manga>, snackbarHost: View?) {
-		if (manga.isEmpty()) {
-			return
-		}
-		val fm = getFragmentManager() ?: return
-		if (snackbarHost != null) {
-			getLifecycleOwner()?.let { lifecycleOwner ->
-				DownloadDialogFragment.registerCallback(fm, lifecycleOwner, snackbarHost)
-			}
-		} else {
-			DownloadDialogFragment.unregisterCallback(fm)
-		}
-		DownloadDialogFragment().withArgs(1) {
-			putParcelableArray(KEY_MANGA, manga.mapToArray { ParcelableManga(it, withDescription = false) })
-		}.showDistinct()
-	}
-
-	fun showLocalInfoDialog(manga: Manga) {
-		LocalInfoDialog().withArgs(1) {
-			putParcelable(KEY_MANGA, ParcelableManga(manga))
-		}.showDistinct()
-	}
-
-	fun showDirectorySelectDialog() {
-		MangaDirectorySelectDialog().showDistinct()
-	}
-
-	fun showFavoriteDialog(manga: Manga) = showFavoriteDialog(setOf(manga))
-
-	fun showFavoriteDialog(manga: Collection<Manga>) {
-		if (manga.isEmpty()) {
-			return
-		}
-		FavoriteDialog().withArgs(1) {
-			putParcelableArrayList(
-				KEY_MANGA_LIST,
-				manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it, withDescription = false) },
-			)
-		}.showDistinct()
-	}
-
-	fun showTagDialog(tag: MangaTag) {
-		buildAlertDialog(contextOrNull() ?: return) {
-			setIcon(R.drawable.ic_tag)
-			setTitle(tag.title)
-			setItems(
-				arrayOf(
-					context.getString(R.string.search_on_s, tag.source.getTitle(context)),
-					context.getString(R.string.search_everywhere),
-				),
-			) { _, which ->
-				when (which) {
-					0 -> openList(tag)
-					1 -> openSearch(tag.title, SearchKind.TAG)
-				}
-			}
-			setNegativeButton(R.string.close, null)
-			setCancelable(true)
-		}.show()
-	}
-
-	fun showAuthorDialog(author: String, source: MangaSource) {
-		buildAlertDialog(contextOrNull() ?: return) {
-			setIcon(R.drawable.ic_user)
-			setTitle(author)
-			setItems(
-				arrayOf(
-					context.getString(R.string.search_on_s, source.getTitle(context)),
-					context.getString(R.string.search_everywhere),
-				),
-			) { _, which ->
-				when (which) {
-					0 -> openList(source, MangaListFilter(author = author), null)
-					1 -> openSearch(author, SearchKind.AUTHOR)
-				}
-			}
-			setNegativeButton(R.string.close, null)
-			setCancelable(true)
-		}.show()
-	}
-
-	fun showShareDialog(manga: Manga) {
-		if (manga.isBroken) {
-			return
-		}
-		if (manga.isLocal) {
-			manga.url.toUri().toFileOrNull()?.let {
-				shareFile(it)
-			}
-			return
-		}
-		buildAlertDialog(contextOrNull() ?: return) {
-			setIcon(context.getThemeDrawable(appcompatR.attr.actionModeShareDrawable))
-			setTitle(R.string.share)
-			setItems(
-				arrayOf(
-					context.getString(R.string.link_to_manga_in_app),
-					context.getString(R.string.link_to_manga_on_s, manga.source.getTitle(context)),
-				),
-			) { _, which ->
-				val link = when (which) {
-					0 -> manga.appUrl.toString()
-					1 -> manga.publicUrl
-					else -> return@setItems
-				}
-				shareLink(link, manga.title)
-			}
-			setNegativeButton(android.R.string.cancel, null)
-			setCancelable(true)
-		}.show()
-	}
-
-	fun showErrorDialog(error: Throwable, url: String? = null) {
-		ErrorDetailsDialog().withArgs(2) {
-			putSerializable(KEY_ERROR, error)
-			putString(KEY_URL, url)
-		}.show()
-	}
-
-	fun showBackupRestoreDialog(fileUri: Uri) {
-		RestoreDialogFragment().withArgs(1) {
-			putString(KEY_FILE, fileUri.toString())
-		}.show()
-	}
-
-	fun showBackupCreateDialog() {
-		BackupDialogFragment().show()
-	}
-
-	fun showImportDialog() {
-		ImportDialogFragment().showDistinct()
-	}
-
-	fun showFilterSheet(): Boolean = if (isFilterSupported()) {
-		FilterSheetFragment().showDistinct()
-	} else {
-		false
-	}
-
-	fun showTagsCatalogSheet(excludeMode: Boolean) {
-		if (!isFilterSupported()) {
-			return
-		}
-		TagsCatalogSheet().withArgs(1) {
-			putBoolean(KEY_EXCLUDE, excludeMode)
-		}.showDistinct()
-	}
-
-	fun showListConfigSheet(section: ListConfigSection) {
-		ListConfigBottomSheet().withArgs(1) {
-			putParcelable(KEY_LIST_SECTION, section)
-		}.showDistinct()
-	}
-
-	fun showStatisticSheet(manga: Manga) {
-		MangaStatsSheet().withArgs(1) {
-			putParcelable(KEY_MANGA, ParcelableManga(manga))
-		}.showDistinct()
-	}
-
-	fun showReaderConfigSheet(mode: ReaderMode) {
-		ReaderConfigSheet().withArgs(1) {
-			putInt(KEY_READER_MODE, mode.id)
-		}.showDistinct()
-	}
-
-	fun showWelcomeSheet() {
-		WelcomeSheet().showDistinct()
-	}
-
-	fun showChapterPagesSheet() {
-		ChaptersPagesSheet().showDistinct()
-	}
-
-	fun showChapterPagesSheet(defaultTab: Int) {
-		ChaptersPagesSheet().withArgs(1) {
-			putInt(KEY_TAB, defaultTab)
-		}.showDistinct()
-	}
-
-	fun showScrobblingSelectorSheet(manga: Manga, scrobblerService: ScrobblerService?) {
-		ScrobblingSelectorSheet().withArgs(2) {
-			putParcelable(KEY_MANGA, ParcelableManga(manga))
-			if (scrobblerService != null) {
-				putInt(KEY_ID, scrobblerService.id)
-			}
-		}.show()
-	}
-
-	fun showScrobblingInfoSheet(index: Int) {
-		ScrobblingInfoSheet().withArgs(1) {
-			putInt(KEY_INDEX, index)
-		}.showDistinct()
-	}
-
-	fun showTrackerCategoriesConfigSheet() {
-		TrackerCategoriesConfigSheet().showDistinct()
-	}
-
-	fun askForDownloadOverMeteredNetwork(onConfirmed: (allow: Boolean) -> Unit) {
-		val context = contextOrNull() ?: return
-		when (settings.allowDownloadOnMeteredNetwork) {
-			TriStateOption.ENABLED -> onConfirmed(true)
-			TriStateOption.DISABLED -> onConfirmed(false)
-			TriStateOption.ASK -> {
-				if (!context.connectivityManager.isActiveNetworkMetered) {
-					onConfirmed(true)
-					return
-				}
-				val listener = DialogInterface.OnClickListener { _, which ->
-					when (which) {
-						DialogInterface.BUTTON_POSITIVE -> {
-							settings.allowDownloadOnMeteredNetwork = TriStateOption.ENABLED
-							onConfirmed(true)
-						}
-
-						DialogInterface.BUTTON_NEUTRAL -> {
-							onConfirmed(true)
-						}
-
-						DialogInterface.BUTTON_NEGATIVE -> {
-							settings.allowDownloadOnMeteredNetwork = TriStateOption.DISABLED
-							onConfirmed(false)
-						}
-					}
-				}
-				BigButtonsAlertDialog.Builder(context)
-					.setIcon(R.drawable.ic_network_cellular)
-					.setTitle(R.string.download_cellular_confirm)
-					.setPositiveButton(R.string.allow_always, listener)
-					.setNeutralButton(R.string.allow_once, listener)
-					.setNegativeButton(R.string.dont_allow, listener)
-					.create()
-					.show()
-			}
-		}
-	}
-
-	/** Public utils **/
-
-	fun isFilterSupported(): Boolean = when {
-		fragment != null -> fragment.activity is FilterCoordinator.Owner
-		activity != null -> activity is FilterCoordinator.Owner
-		else -> false
-	}
-
-	fun isChapterPagesSheetShown(): Boolean {
-		val sheet = getFragmentManager()?.findFragmentByTag(fragmentTag<ChaptersPagesSheet>()) as? ChaptersPagesSheet
-		return sheet?.dialog?.isShowing == true
-	}
-
-	fun closeWelcomeSheet(): Boolean {
-		val tag = fragmentTag<WelcomeSheet>()
-		val sheet = fragment?.findFragmentByTagRecursive(tag)
-			?: activity?.supportFragmentManager?.findFragmentByTag(tag)
-			?: return false
-		return if (sheet is WelcomeSheet) {
-			sheet.dismissAllowingStateLoss()
-			true
-		} else {
-			false
-		}
-	}
-
-	/** Private utils **/
-
-	private fun startActivity(intent: Intent, options: Bundle? = null) {
-		fragment?.also {
-			if (it.host != null) {
-				it.startActivity(intent, options)
-			}
-		} ?: activity?.startActivity(intent, options)
-	}
-
-	private fun startActivitySafe(intent: Intent): Boolean = try {
-		startActivity(intent)
-		true
-	} catch (_: ActivityNotFoundException) {
-		false
-	}
-
-	private fun startActivity(activityClass: Class<out Activity>) {
-		startActivity(Intent(contextOrNull() ?: return, activityClass))
-	}
-
-	private fun getFragmentManager(): FragmentManager? {
-		return fragment?.childFragmentManager ?: activity?.supportFragmentManager
-	}
-
-	private fun shareLink(link: String, title: String) {
-		val context = contextOrNull() ?: return
-		ShareCompat.IntentBuilder(context)
-			.setText(link)
-			.setType(TYPE_TEXT)
-			.setChooserTitle(context.getString(R.string.share_s, title.ellipsize(12)))
-			.startChooser()
-	}
-
-	private fun shareFile(file: File) { // TODO directory sharing support
-		val context = contextOrNull() ?: return
-		val intentBuilder = ShareCompat.IntentBuilder(context)
-			.setType(TYPE_CBZ)
-		val uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.files", file)
-		intentBuilder.addStream(uri)
-		intentBuilder.setChooserTitle(context.getString(R.string.share_s, file.name))
-		intentBuilder.startChooser()
-	}
-
-	@UiContext
-	private fun contextOrNull(): Context? = activity ?: fragment?.context
-
-	private fun getLifecycleOwner(): LifecycleOwner? = activity ?: fragment?.viewLifecycleOwner
-
-	private fun DialogFragment.showDistinct(): Boolean {
-		val fm = this@AppRouter.getFragmentManager() ?: return false
-		val tag = javaClass.fragmentTag()
-		val existing = fm.findFragmentByTag(tag) as? DialogFragment?
-		if (existing != null && existing.isVisible && existing.arguments == this.arguments) {
-			return false
-		}
-		show(fm, tag)
-		return true
-	}
-
-	private fun DialogFragment.show() {
-		show(
-			this@AppRouter.getFragmentManager() ?: return,
-			javaClass.fragmentTag(),
-		)
-	}
-
-	private fun Fragment.findFragmentByTagRecursive(fragmentTag: String): Fragment? {
-		childFragmentManager.findFragmentByTag(fragmentTag)?.let {
-			return it
-		}
-		val parent = parentFragment
-		return if (parent != null) {
-			parent.findFragmentByTagRecursive(fragmentTag)
-		} else {
-			parentFragmentManager.findFragmentByTag(fragmentTag)
-		}
-	}
-
-	companion object {
-
-		fun from(view: View): AppRouter? = runCatching {
-			AppRouter(view.findFragment<Fragment>())
-		}.getOrElse {
-			(view.context.findActivity() as? FragmentActivity)?.let(::AppRouter)
-		}
-
-		fun detailsIntent(context: Context, manga: Manga) = Intent(context, DetailsActivity::class.java)
-			.putExtra(KEY_MANGA, ParcelableManga(manga))
-
-		fun detailsIntent(context: Context, mangaId: Long) = Intent(context, DetailsActivity::class.java)
-			.putExtra(KEY_ID, mangaId)
-
-		fun listIntent(context: Context, source: MangaSource, filter: MangaListFilter?, sortOrder: SortOrder?): Intent =
-			Intent(context, MangaListActivity::class.java)
-				.setAction(ACTION_MANGA_EXPLORE)
-				.putExtra(KEY_SOURCE, source.name)
-				.apply {
-					if (!filter.isNullOrEmpty()) {
-						putExtra(KEY_FILTER, ParcelableMangaListFilter(filter))
-					}
-					if (sortOrder != null) {
-						putExtra(KEY_SORT_ORDER, sortOrder)
-					}
-				}
-
-		fun cloudFlareResolveIntent(context: Context, exception: CloudFlareProtectedException): Intent =
-			Intent(context, CloudFlareActivity::class.java).apply {
-				data = exception.url.toUri()
-				putExtra(KEY_SOURCE, exception.source?.name)
-				exception.headers[CommonHeaders.USER_AGENT]?.let {
-					putExtra(KEY_USER_AGENT, it)
-				}
-			}
-
-		fun suggestionsIntent(context: Context) = Intent(context, SuggestionsActivity::class.java)
-
-		fun homeIntent(context: Context) = Intent(context, MainActivity::class.java)
-
-		fun mangaUpdatesIntent(context: Context) = Intent(context, UpdatesActivity::class.java)
-
-		fun readerSettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_READER)
-
-		fun suggestionsSettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_SUGGESTIONS)
-
-		fun trackerSettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_TRACKER)
-
-		fun proxySettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_PROXY)
-
-		fun historySettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_HISTORY)
-
-		fun sourcesSettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_SOURCES)
-
-		fun manageSourcesIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_MANAGE_SOURCES)
-
-		fun downloadsSettingsIntent(context: Context) =
-			Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_MANAGE_DOWNLOADS)
-
-		fun sourceSettingsIntent(context: Context, source: MangaSource): Intent = when (source) {
-			is MangaSourceInfo -> sourceSettingsIntent(context, source.mangaSource)
-			is ExternalMangaSource -> Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-				.setData(Uri.fromParts("package", source.packageName, null))
-
-			else -> Intent(context, SettingsActivity::class.java)
-				.setAction(ACTION_SOURCE)
-				.putExtra(KEY_SOURCE, source.name)
-		}
-
-		fun sourceAuthIntent(context: Context, source: MangaSource): Intent {
-			return Intent(context, SourceAuthActivity::class.java)
-				.putExtra(KEY_SOURCE, source.name)
-		}
-
-		fun isShareSupported(manga: Manga): Boolean = when {
-			manga.isBroken -> false
-			manga.isLocal -> manga.url.toUri().toFileOrNull() != null
-			else -> true
-		}
-
-		const val KEY_DATA = "data"
-		const val KEY_ENTRIES = "entries"
-		const val KEY_ERROR = "error"
-		const val KEY_EXCLUDE = "exclude"
-		const val KEY_FILE = "file"
-		const val KEY_FILTER = "filter"
-		const val KEY_ID = "id"
-		const val KEY_INDEX = "index"
-		const val KEY_KIND = "kind"
-		const val KEY_LIST_SECTION = "list_section"
-		const val KEY_MANGA = "manga"
-		const val KEY_MANGA_LIST = "manga_list"
-		const val KEY_PAGES = "pages"
-		const val KEY_PREVIEW = "preview"
-		const val KEY_QUERY = "query"
-		const val KEY_READER_MODE = "reader_mode"
-		const val KEY_SORT_ORDER = "sort_order"
-		const val KEY_SOURCE = "source"
-		const val KEY_TAB = "tab"
-		const val KEY_TITLE = "title"
-		const val KEY_URL = "url"
-		const val KEY_USER_AGENT = "user_agent"
-
-		const val ACTION_HISTORY = "${BuildConfig.APPLICATION_ID}.action.MANAGE_HISTORY"
-		const val ACTION_MANAGE_DOWNLOADS = "${BuildConfig.APPLICATION_ID}.action.MANAGE_DOWNLOADS"
-		const val ACTION_MANAGE_SOURCES = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCES_LIST"
-		const val ACTION_MANGA_EXPLORE = "${BuildConfig.APPLICATION_ID}.action.EXPLORE_MANGA"
-		const val ACTION_PROXY = "${BuildConfig.APPLICATION_ID}.action.MANAGE_PROXY"
-		const val ACTION_READER = "${BuildConfig.APPLICATION_ID}.action.MANAGE_READER_SETTINGS"
-		const val ACTION_SOURCE = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCE_SETTINGS"
-		const val ACTION_SOURCES = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SOURCES"
-		const val ACTION_SUGGESTIONS = "${BuildConfig.APPLICATION_ID}.action.MANAGE_SUGGESTIONS"
-		const val ACTION_TRACKER = "${BuildConfig.APPLICATION_ID}.action.MANAGE_TRACKER"
-
-		private const val ACCOUNT_KEY = "account"
-		private const val ACTION_ACCOUNT_SYNC_SETTINGS = "android.settings.ACCOUNT_SYNC_SETTINGS"
-		private const val EXTRA_SHOW_FRAGMENT_ARGUMENTS = ":settings:show_fragment_args"
-
-		private const val TYPE_TEXT = "text/plain"
-		private const val TYPE_IMAGE = "image/*"
-		private const val TYPE_CBZ = "application/x-cbz"
-
-		private fun Class<out Fragment>.fragmentTag() = name // TODO
-
-		private inline fun <reified F : Fragment> fragmentTag() = F::class.java.fragmentTag()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouterEntryPoint.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/AppRouterEntryPoint.kt
@@ -1,13 +0,0 @@
-package org.koitharu.kotatsu.core.nav
-
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import org.koitharu.kotatsu.core.prefs.AppSettings
-
-@EntryPoint
-@InstallIn(SingletonComponent::class)
-interface AppRouterEntryPoint {
-
-	val settings: AppSettings
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/NavUtil.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/NavUtil.kt
@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.core.nav
-
-import android.app.ActivityOptions
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
-
-inline val FragmentActivity.router: AppRouter
-	get() = AppRouter(this)
-
-inline val Fragment.router: AppRouter
-	get() = AppRouter(this)
-
-tailrec fun Fragment.dismissParentDialog(): Boolean {
-	return when (val parent = parentFragment) {
-		null -> return false
-		is DialogFragment -> {
-			parent.dismiss()
-			true
-		}
-
-		else -> parent.dismissParentDialog()
-	}
-}
-
-fun scaleUpActivityOptionsOf(view: View): Bundle? = if (view.context.isAnimationsEnabled) {
-	ActivityOptions.makeScaleUpAnimation(
-		view,
-		0,
-		0,
-		view.width,
-		view.height,
-	).toBundle()
-} else {
-	null
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/ReaderIntent.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/nav/ReaderIntent.kt
@@ -1,61 +0,0 @@
-package org.koitharu.kotatsu.core.nav
-
-import android.content.Context
-import android.content.Intent
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.ReaderActivity
-import org.koitharu.kotatsu.reader.ui.ReaderState
-
-@JvmInline
-value class ReaderIntent private constructor(
-	val intent: Intent,
-) {
-
-	class Builder(context: Context) {
-
-		private val intent = Intent(context, ReaderActivity::class.java)
-			.setAction(ACTION_MANGA_READ)
-
-		fun manga(manga: Manga) = apply {
-			intent.putExtra(AppRouter.KEY_MANGA, ParcelableManga(manga))
-		}
-
-		fun mangaId(mangaId: Long) = apply {
-			intent.putExtra(AppRouter.KEY_ID, mangaId)
-		}
-
-		fun incognito(incognito: Boolean) = apply {
-			intent.putExtra(EXTRA_INCOGNITO, incognito)
-		}
-
-		fun branch(branch: String?) = apply {
-			intent.putExtra(EXTRA_BRANCH, branch)
-		}
-
-		fun state(state: ReaderState?) = apply {
-			intent.putExtra(EXTRA_STATE, state)
-		}
-
-		fun bookmark(bookmark: Bookmark) = manga(
-			bookmark.manga,
-		).state(
-			ReaderState(
-				chapterId = bookmark.chapterId,
-				page = bookmark.page,
-				scroll = bookmark.scroll,
-			),
-		)
-
-		fun build() = ReaderIntent(intent)
-	}
-
-	companion object {
-		const val ACTION_MANGA_READ = "${BuildConfig.APPLICATION_ID}.action.READ_MANGA"
-		const val EXTRA_STATE = "state"
-		const val EXTRA_BRANCH = "branch"
-		const val EXTRA_INCOGNITO = "incognito"
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/AppProxySelector.kt
@@ -0,0 +1,51 @@
+package org.koitharu.kotatsu.core.network
+
+import okio.IOException
+import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.net.ProxySelector
+import java.net.SocketAddress
+import java.net.URI
+
+class AppProxySelector(
+	private val settings: AppSettings,
+) : ProxySelector() {
+
+	init {
+		setDefault(this)
+	}
+
+	private var cachedProxy: Proxy? = null
+
+	override fun select(uri: URI?): List<Proxy> {
+		return listOf(getProxy())
+	}
+
+	override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: IOException?) {
+		ioe?.printStackTraceDebug()
+	}
+
+	private fun getProxy(): Proxy {
+		val type = settings.proxyType
+		val address = settings.proxyAddress
+		val port = settings.proxyPort
+		if (type == Proxy.Type.DIRECT) {
+			return Proxy.NO_PROXY
+		}
+		if (address.isNullOrEmpty() || port < 0 || port > 0xFFFF) {
+			throw ProxyConfigException()
+		}
+		cachedProxy?.let {
+			val addr = it.address() as? InetSocketAddress
+			if (addr != null && it.type() == type && addr.port == port && addr.hostString == address) {
+				return it
+			}
+		}
+		val proxy = Proxy(type, InetSocketAddress(address, port))
+		cachedProxy = proxy
+		return proxy
+	}
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/CommonHeadersInterceptor.kt
@@ -65,7 +65,7 @@ class CommonHeadersInterceptor @Inject constructor(
 	private fun Interceptor.interceptSafe(chain: Chain): Response = runCatchingCancellable {
 		intercept(chain)
 	}.getOrElse { e ->
-		if (e is IOException || e is Error) {
+		if (e is IOException) {
 			throw e
 		} else {
 			// only IOException can be safely thrown from an Interceptor
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/NetworkModule.kt
@@ -16,7 +16,6 @@ import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.network.cookies.PreferencesCookieJar
 import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.imageproxy.RealImageProxyInterceptor
-import org.koitharu.kotatsu.core.network.proxy.ProxyProvider
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.assertNotInMainThread
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
@@ -63,15 +62,14 @@ interface NetworkModule {
 			cache: Cache,
 			cookieJar: CookieJar,
 			settings: AppSettings,
-			proxyProvider: ProxyProvider,
 		): OkHttpClient = OkHttpClient.Builder().apply {
 			assertNotInMainThread()
 			connectTimeout(20, TimeUnit.SECONDS)
 			readTimeout(60, TimeUnit.SECONDS)
 			writeTimeout(20, TimeUnit.SECONDS)
 			cookieJar(cookieJar)
-			proxySelector(proxyProvider.selector)
-			proxyAuthenticator(proxyProvider.authenticator)
+			proxySelector(AppProxySelector(settings))
+			proxyAuthenticator(ProxyAuthenticator(settings))
 			dns(DoHManager(cache, settings))
 			if (settings.isSSLBypassEnabled) {
 				disableCertificateVerification()
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/ProxyAuthenticator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/ProxyAuthenticator.kt
@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.network
+
+import okhttp3.Authenticator
+import okhttp3.Credentials
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import java.net.PasswordAuthentication
+import java.net.Proxy
+
+class ProxyAuthenticator(
+	private val settings: AppSettings,
+) : Authenticator, java.net.Authenticator() {
+
+	init {
+		setDefault(this)
+	}
+
+	override fun authenticate(route: Route?, response: Response): Request? {
+		if (!isProxyEnabled()) {
+			return null
+		}
+		if (response.request.header(CommonHeaders.PROXY_AUTHORIZATION) != null) {
+			return null
+		}
+		val login = settings.proxyLogin ?: return null
+		val password = settings.proxyPassword ?: return null
+		val credential = Credentials.basic(login, password)
+		return response.request.newBuilder()
+			.header(CommonHeaders.PROXY_AUTHORIZATION, credential)
+			.build()
+	}
+
+	override fun getPasswordAuthentication(): PasswordAuthentication? {
+		if (!isProxyEnabled()) {
+			return null
+		}
+		val login = settings.proxyLogin ?: return null
+		val password = settings.proxyPassword ?: return null
+		return PasswordAuthentication(login, password.toCharArray())
+	}
+
+	private fun isProxyEnabled() = settings.proxyType != Proxy.Type.DIRECT
+}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/network/proxy/ProxyProvider.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/network/proxy/ProxyProvider.kt
@@ -1,150 +0,0 @@
-package org.koitharu.kotatsu.core.network.proxy
-
-import androidx.webkit.ProxyConfig
-import androidx.webkit.ProxyController
-import androidx.webkit.WebViewFeature
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
-import okhttp3.Authenticator
-import okhttp3.Credentials
-import okhttp3.Request
-import okhttp3.Response
-import okhttp3.Route
-import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
-import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import java.net.InetSocketAddress
-import java.net.PasswordAuthentication
-import java.net.Proxy
-import java.net.ProxySelector
-import java.net.SocketAddress
-import java.net.URI
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-import java.net.Authenticator as JavaAuthenticator
-
-@Singleton
-class ProxyProvider @Inject constructor(
-	private val settings: AppSettings,
-) {
-
-	private var cachedProxy: Proxy? = null
-
-	val selector = object : ProxySelector() {
-		override fun select(uri: URI?): List<Proxy> {
-			return listOf(getProxy())
-		}
-
-		override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: okio.IOException?) {
-			ioe?.printStackTraceDebug()
-		}
-	}
-
-	val authenticator = ProxyAuthenticator()
-
-	init {
-		ProxySelector.setDefault(selector)
-		JavaAuthenticator.setDefault(authenticator)
-	}
-
-	suspend fun applyWebViewConfig() {
-		val isProxyEnabled = isProxyEnabled()
-		if (!WebViewFeature.isFeatureSupported(WebViewFeature.PROXY_OVERRIDE)) {
-			if (isProxyEnabled) {
-				throw IllegalArgumentException("Proxy for WebView is not supported") // TODO localize
-			}
-		} else {
-			val controller = ProxyController.getInstance()
-			if (settings.proxyType == Proxy.Type.DIRECT) {
-				suspendCoroutine { cont ->
-					controller.clearProxyOverride(
-						(cont.context[CoroutineDispatcher] ?: Dispatchers.Main).asExecutor(),
-					) {
-						cont.resume(Unit)
-					}
-				}
-			} else {
-				val url = buildString {
-					when (settings.proxyType) {
-						Proxy.Type.DIRECT -> Unit
-						Proxy.Type.HTTP -> append("http")
-						Proxy.Type.SOCKS -> append("socks")
-					}
-					append("://")
-					append(settings.proxyAddress)
-					append(':')
-					append(settings.proxyPort)
-				}
-				if (settings.proxyType == Proxy.Type.SOCKS) {
-					System.setProperty("java.net.socks.username", settings.proxyLogin);
-					System.setProperty("java.net.socks.password", settings.proxyPassword);
-				}
-				val proxyConfig = ProxyConfig.Builder()
-					.addProxyRule(url)
-					.build()
-				suspendCoroutine { cont ->
-					controller.setProxyOverride(
-						proxyConfig,
-						(cont.context[CoroutineDispatcher] ?: Dispatchers.Main).asExecutor(),
-					) {
-						cont.resume(Unit)
-					}
-				}
-			}
-		}
-	}
-
-	private fun isProxyEnabled() = settings.proxyType != Proxy.Type.DIRECT
-
-	private fun getProxy(): Proxy {
-		val type = settings.proxyType
-		val address = settings.proxyAddress
-		val port = settings.proxyPort
-		if (type == Proxy.Type.DIRECT) {
-			return Proxy.NO_PROXY
-		}
-		if (address.isNullOrEmpty() || port < 0 || port > 0xFFFF) {
-			throw ProxyConfigException()
-		}
-		cachedProxy?.let {
-			val addr = it.address() as? InetSocketAddress
-			if (addr != null && it.type() == type && addr.port == port && addr.hostString == address) {
-				return it
-			}
-		}
-		val proxy = Proxy(type, InetSocketAddress(address, port))
-		cachedProxy = proxy
-		return proxy
-	}
-
-	inner class ProxyAuthenticator : Authenticator, JavaAuthenticator() {
-
-		override fun authenticate(route: Route?, response: Response): Request? {
-			if (!isProxyEnabled()) {
-				return null
-			}
-			if (response.request.header(CommonHeaders.PROXY_AUTHORIZATION) != null) {
-				return null
-			}
-			val login = settings.proxyLogin ?: return null
-			val password = settings.proxyPassword ?: return null
-			val credential = Credentials.basic(login, password)
-			return response.request.newBuilder()
-				.header(CommonHeaders.PROXY_AUTHORIZATION, credential)
-				.build()
-		}
-
-		public override fun getPasswordAuthentication(): PasswordAuthentication? {
-			if (!isProxyEnabled()) {
-				return null
-			}
-			val login = settings.proxyLogin ?: return null
-			val password = settings.proxyPassword ?: return null
-			return PasswordAuthentication(login, password.toCharArray())
-		}
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManager.kt
@@ -23,8 +23,6 @@ import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.nav.ReaderIntent
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -38,6 +36,8 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 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

@@ -133,7 +133,7 @@ class AppShortcutManager @Inject constructor(
 		}
 	}

-	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat = withContext(Dispatchers.Default) {
+	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat {
 		val icon = runCatchingCancellable {
 			coil.execute(
 				ImageRequest.Builder(context)
@@ -149,17 +149,17 @@ class AppShortcutManager @Inject constructor(
 			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
 		)
 		mangaRepository.storeManga(manga)
-		ShortcutInfoCompat.Builder(context, manga.id.toString())
+		return ShortcutInfoCompat.Builder(context, manga.id.toString())
 			.setShortLabel(manga.title)
 			.setLongLabel(manga.title)
 			.setIcon(icon)
 			.setLongLived(true)
 			.setIntent(
-				ReaderIntent.Builder(context)
+				ReaderActivity.IntentBuilder(context)
 					.mangaId(manga.id)
-					.build()
-					.intent,
-			).build()
+					.build(),
+			)
+			.build()
 	}

 	private suspend fun buildShortcutInfo(source: MangaSource): ShortcutInfoCompat = withContext(Dispatchers.Default) {
@@ -181,7 +181,7 @@ class AppShortcutManager @Inject constructor(
 			.setLongLabel(title)
 			.setIcon(icon)
 			.setLongLived(true)
-			.setIntent(AppRouter.listIntent(context, source, null, null))
+			.setIntent(MangaListActivity.newIntent(context, source, null))
 			.build()
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppValidator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/AppValidator.kt
@@ -1,12 +1,9 @@
 package org.koitharu.kotatsu.core.os

-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.pm.PackageInfoCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
 import javax.inject.Inject
 import javax.inject.Singleton

@@ -14,8 +11,8 @@ import javax.inject.Singleton
 class AppValidator @Inject constructor(
 	@ApplicationContext private val context: Context,
 ) {
-	@SuppressLint("InlinedApi")
-	val isOriginalApp = suspendLazy(Dispatchers.Default) {
+	@Suppress("NewApi")
+	val isOriginalApp by lazy {
 		val certificates = mapOf(CERT_SHA256.hexToByteArray() to PackageManager.CERT_INPUT_SHA256)
 		PackageInfoCompat.hasSignatures(context.packageManager, context.packageName, certificates, false)
 	}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkState.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/NetworkState.kt
@@ -69,7 +69,7 @@ class NetworkState(
 				return true
 			}
 			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-				activeNetwork?.let { isOnline(it) } == true
+				activeNetwork?.let { isOnline(it) } ?: false
 			} else {
 				@Suppress("DEPRECATION")
 				activeNetworkInfo?.isConnected == true
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/OpenDocumentTreeHelper.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/OpenDocumentTreeHelper.kt
@@ -1,92 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.storage.StorageManager
-import android.provider.DocumentsContract
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultCaller
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.annotation.RequiresApi
-import androidx.core.app.ActivityOptionsCompat
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-
-// https://stackoverflow.com/questions/77555641/saf-no-activity-found-to-handle-intent-android-intent-action-open-document-tr
-class OpenDocumentTreeHelper(
-	activityResultCaller: ActivityResultCaller,
-	flags: Int,
-	callback: ActivityResultCallback<Uri?>
-) : ActivityResultLauncher<Uri?>() {
-
-	constructor(activityResultCaller: ActivityResultCaller, callback: ActivityResultCallback<Uri?>) : this(
-		activityResultCaller,
-		0,
-		callback,
-	)
-
-	private val pickFileTreeLauncherQ = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		activityResultCaller.registerForActivityResult(OpenDocumentTreeContractQ(flags), callback)
-	} else {
-		null
-	}
-	private val pickFileTreeLauncherLegacy = activityResultCaller.registerForActivityResult(
-		contract = OpenDocumentTreeContractLegacy(flags),
-		callback = callback,
-	)
-
-	override fun launch(input: Uri?, options: ActivityOptionsCompat?) {
-		if (pickFileTreeLauncherQ == null) {
-			pickFileTreeLauncherLegacy.launch(input, options)
-			return
-		}
-		try {
-			pickFileTreeLauncherQ.launch(input, options)
-		} catch (e: Exception) {
-			e.printStackTraceDebug()
-			pickFileTreeLauncherLegacy.launch(input, options)
-		}
-	}
-
-	override fun unregister() {
-		pickFileTreeLauncherQ?.unregister()
-		pickFileTreeLauncherLegacy.unregister()
-	}
-
-	override val contract: ActivityResultContract<Uri?, *>
-		get() = pickFileTreeLauncherQ?.contract ?: pickFileTreeLauncherLegacy.contract
-
-	private open class OpenDocumentTreeContractLegacy(
-		private val flags: Int,
-	) : ActivityResultContracts.OpenDocumentTree() {
-
-		override fun createIntent(context: Context, input: Uri?): Intent {
-			val intent = super.createIntent(context, input)
-			intent.addFlags(flags)
-			return intent
-		}
-	}
-
-	@RequiresApi(Build.VERSION_CODES.Q)
-	private class OpenDocumentTreeContractQ(
-		private val flags: Int,
-	) : OpenDocumentTreeContractLegacy(flags) {
-
-		override fun createIntent(context: Context, input: Uri?): Intent {
-			val intent = (context.getSystemService(Context.STORAGE_SERVICE) as? StorageManager)
-				?.primaryStorageVolume
-				?.createOpenDocumentTreeIntent()
-			if (intent == null) { // fallback
-				return super.createIntent(context, input)
-			}
-			intent.addFlags(flags)
-			if (input != null) {
-				intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, input)
-			}
-			return intent
-		}
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/os/RomCompat.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/os/RomCompat.kt
@@ -1,18 +0,0 @@
-package org.koitharu.kotatsu.core.os
-
-import kotlinx.coroutines.Dispatchers
-import org.jetbrains.annotations.Blocking
-import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy
-import java.io.InputStreamReader
-
-object RomCompat {
-
-	val isMiui = suspendLazy<Boolean>(Dispatchers.IO) {
-		getProp("ro.miui.ui.version.name").isNotEmpty()
-	}
-
-	@Blocking
-	private fun getProp(propName: String) = Runtime.getRuntime().exec("getprop $propName").inputStream.use {
-		it.reader().use(InputStreamReader::readText).trim()
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/DummyParser.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/DummyParser.kt
@@ -2,22 +2,22 @@ package org.koitharu.kotatsu.core.parser

 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.config.ConfigKey
-import org.koitharu.kotatsu.parsers.core.AbstractMangaParser
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaListFilterCapabilities
 import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.model.search.MangaSearchQuery
-import org.koitharu.kotatsu.parsers.model.search.MangaSearchQueryCapabilities
 import java.util.EnumSet

 /**
 * This parser is just for parser development, it should not be used in releases
 */
-class DummyParser(context: MangaLoaderContext) : AbstractMangaParser(context, MangaParserSource.DUMMY) {
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaParserSource.DUMMY) {

 	override val configKeyDomain: ConfigKey.Domain
 		get() = ConfigKey.Domain("localhost")
@@ -25,14 +25,14 @@ class DummyParser(context: MangaLoaderContext) : AbstractMangaParser(context, Ma
 	override val availableSortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)

-	override val searchQueryCapabilities: MangaSearchQueryCapabilities
-		get() = MangaSearchQueryCapabilities()
-
-	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
+	override val filterCapabilities: MangaListFilterCapabilities
+		get() = MangaListFilterCapabilities()

 	override suspend fun getFilterOptions(): MangaListFilterOptions = stub(null)

-	override suspend fun getList(query: MangaSearchQuery): List<Manga> = stub(null)
+	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
+
+	override suspend fun getList(offset: Int, order: SortOrder, filter: MangaListFilter): List<Manga> = stub(null)

 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaDataRepository.kt
@@ -14,8 +14,6 @@ import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.LocalMangaSource
 import org.koitharu.kotatsu.core.model.isLocal
-import org.koitharu.kotatsu.core.nav.MangaIntent
-import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -29,7 +27,6 @@ import javax.inject.Provider
 class MangaDataRepository @Inject constructor(
 	private val db: MangaDatabase,
 	private val resolverProvider: Provider<MangaLinkResolver>,
-	private val appShortcutManagerProvider: Provider<AppShortcutManager>,
 ) {

 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
@@ -48,8 +45,8 @@ class MangaDataRepository @Inject constructor(
 				entity.copy(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
-					cfInvert = colorFilter?.isInverted == true,
-					cfGrayscale = colorFilter?.isGrayscale == true,
+					cfInvert = colorFilter?.isInverted ?: false,
+					cfGrayscale = colorFilter?.isGrayscale ?: false,
 				),
 			)
 		}
@@ -73,13 +70,8 @@ class MangaDataRepository @Inject constructor(
 			.distinctUntilChanged()
 	}

-	suspend fun findMangaById(mangaId: Long, withChapters: Boolean): Manga? {
-		val chapters = if (withChapters) {
-			db.getChaptersDao().findAll(mangaId).takeUnless { it.isEmpty() }
-		} else {
-			null
-		}
-		return db.getMangaDao().find(mangaId)?.toManga(chapters)
+	suspend fun findMangaById(mangaId: Long): Manga? {
+		return db.getMangaDao().find(mangaId)?.toManga()
 	}

 	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
@@ -88,7 +80,7 @@ class MangaDataRepository @Inject constructor(

 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
 		intent.manga != null -> intent.manga
-		intent.mangaId != 0L -> findMangaById(intent.mangaId, true)
+		intent.mangaId != 0L -> findMangaById(intent.mangaId)
 		intent.uri != null -> resolverProvider.get().resolve(intent.uri)
 		else -> null
 	}
@@ -105,26 +97,10 @@ class MangaDataRepository @Inject constructor(
 				val tags = manga.tags.toEntities()
 				db.getTagsDao().upsert(tags)
 				db.getMangaDao().upsert(manga.toEntity(), tags)
-				if (!manga.isLocal) {
-					manga.chapters?.let { chapters ->
-						db.getChaptersDao().replaceAll(manga.id, chapters.withIndex().toEntities(manga.id))
-					}
-				}
 			}
 		}
 	}

-	suspend fun updateChapters(manga: Manga) {
-		val chapters = manga.chapters
-		if (!chapters.isNullOrEmpty() && manga.id in db.getMangaDao()) {
-			db.getChaptersDao().replaceAll(manga.id, chapters.withIndex().toEntities(manga.id))
-		}
-	}
-
-	suspend fun gcChaptersCache() {
-		db.getChaptersDao().gc()
-	}
-
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
 		return db.getTagsDao().findTags(source.name).toMangaTags()
 	}
@@ -138,14 +114,6 @@ class MangaDataRepository @Inject constructor(
 		}
 	}

-	suspend fun cleanupDatabase() {
-		db.withTransaction {
-			gcChaptersCache()
-			val idsFromShortcuts = appShortcutManagerProvider.get().getMangaShortcuts()
-			db.getMangaDao().cleanup(idsFromShortcuts)
-		}
-	}
-
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {
 		return if (cfBrightness != 0f || cfContrast != 0f || cfInvert || cfGrayscale) {
 			ReaderColorFilter(cfBrightness, cfContrast, cfInvert, cfGrayscale)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaIntent.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaIntent.kt
@@ -1,12 +1,11 @@
-package org.koitharu.kotatsu.core.nav
+package org.koitharu.kotatsu.core.parser

 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.lifecycle.SavedStateHandle
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.nav.AppRouter.Companion.KEY_ID
-import org.koitharu.kotatsu.core.nav.AppRouter.Companion.KEY_MANGA
+import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -26,7 +25,7 @@ class MangaIntent private constructor(
 	constructor(savedStateHandle: SavedStateHandle) : this(
 		manga = savedStateHandle.get<ParcelableManga>(KEY_MANGA)?.manga,
 		id = savedStateHandle[KEY_ID] ?: ID_NONE,
-		uri = savedStateHandle[AppRouter.KEY_DATA],
+		uri = savedStateHandle[BaseActivity.EXTRA_DATA],
 	)

 	constructor(args: Bundle?) : this(
@@ -42,6 +41,9 @@ class MangaIntent private constructor(

 		const val ID_NONE = 0L

+		const val KEY_MANGA = "manga"
+		const val KEY_ID = "id"
+
 		fun of(manga: Manga) = MangaIntent(manga, manga.id, null)
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLinkResolver.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLinkResolver.kt
@@ -6,7 +6,6 @@ import dagger.Reusable
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.UnknownMangaSource
 import org.koitharu.kotatsu.core.model.isNsfw
-import org.koitharu.kotatsu.core.util.ext.isHttpUrl
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -110,11 +109,4 @@ class MangaLinkResolver @Inject constructor(
 		chapters = null,
 		source = source,
 	)
-
-	companion object {
-
-		fun isValidLink(str: String): Boolean {
-			return str.isHttpUrl() || str.startsWith("kotatsu://", ignoreCase = true)
-		}
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/MangaLoaderContextImpl.kt
@@ -23,7 +23,6 @@ import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
-import org.koitharu.kotatsu.core.util.ext.toMimeType
 import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.bitmap.Bitmap
@@ -79,14 +78,13 @@ class MangaLoaderContextImpl @Inject constructor(

 	override fun redrawImageResponse(response: Response, redraw: (image: Bitmap) -> Bitmap): Response {
 		return response.map { body ->
-			BitmapDecoderCompat.decode(body.byteStream(), body.contentType()?.toMimeType(), isMutable = true)
-				.use { bitmap ->
-					(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
-						Buffer().also {
-							result.compressTo(it.outputStream())
-						}.asResponseBody("image/jpeg".toMediaType())
-					}
+			BitmapDecoderCompat.decode(body.byteStream(), body.contentType(), isMutable = true).use { bitmap ->
+				(redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper).use { result ->
+					Buffer().also {
+						result.compressTo(it.outputStream())
+					}.asResponseBody("image/jpeg".toMediaType())
 				}
+			}
 		}
 	}

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/ParserMangaRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/ParserMangaRepository.kt
@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.parsers.model.MangaListFilterOptions
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaParserSource
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.parsers.util.domain
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.parsers.util.suspendlazy.suspendLazy

@@ -57,7 +58,13 @@ class ParserMangaRepository(
 	val domains: Array<out String>
 		get() = parser.configKeyDomain.presetValues

-	override fun intercept(chain: Interceptor.Chain): Response = parser.intercept(chain)
+	override fun intercept(chain: Interceptor.Chain): Response {
+		return if (parser is Interceptor) {
+			parser.intercept(chain)
+		} else {
+			chain.proceed(chain.request())
+		}
+	}

 	override suspend fun getList(offset: Int, order: SortOrder?, filter: MangaListFilter?): List<Manga> {
 		return mirrorSwitchInterceptor.withMirrorSwitching {
@@ -89,7 +96,7 @@ class ParserMangaRepository(
 		parser.getDetails(manga)
 	}

-	fun getAuthProvider(): MangaParserAuthProvider? = parser.authorizationProvider
+	fun getAuthProvider(): MangaParserAuthProvider? = parser as? MangaParserAuthProvider

 	fun getRequestHeaders() = parser.getRequestHeaders()

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalMangaRepository.kt
@@ -42,7 +42,7 @@ class ExternalMangaRepository(

 	override var defaultSortOrder: SortOrder
 		get() = capabilities?.availableSortOrders?.firstOrNull() ?: SortOrder.ALPHABETICAL
-		set(value) = Unit
+		set(_) = Unit

 	override suspend fun getFilterOptions(): MangaListFilterOptions = filterOptions.get()

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginContentSource.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginContentSource.kt
@@ -229,7 +229,7 @@ class ExternalPluginContentSource(
 					do {
 						result += MangaChapter(
 							id = cursor.getLong(COLUMN_ID),
-							title = cursor.getStringOrNull(COLUMN_NAME),
+							name = cursor.getString(COLUMN_NAME),
 							number = cursor.getFloatOrDefault(COLUMN_NUMBER, 0f),
 							volume = cursor.getIntOrDefault(COLUMN_VOLUME, 0),
 							url = cursor.getString(COLUMN_URL),
@@ -252,7 +252,7 @@ class ExternalPluginContentSource(
 		publicUrl = getString(COLUMN_PUBLIC_URL),
 		rating = getFloat(COLUMN_RATING),
 		isNsfw = getBooleanOrDefault(COLUMN_IS_NSFW, false),
-		coverUrl = getStringOrNull(COLUMN_COVER_URL),
+		coverUrl = getString(COLUMN_COVER_URL),
 		tags = getStringOrNull(COLUMN_TAGS)?.split(':')?.mapNotNullToSet {
 			val parts = it.splitTwoParts('=') ?: return@mapNotNullToSet null
 			MangaTag(key = parts.first, title = parts.second, source = source)
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginCursor.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/parser/external/ExternalPluginCursor.kt
@@ -20,7 +20,7 @@ class ExternalPluginCursor(private val source: ExternalMangaSource, cursor: Curs
 		return when {
 			columnIndex < 0 -> null
 			isNull(columnIndex) -> null
-			else -> getString(columnIndex).takeUnless { it == "null" }
+			else -> getString(columnIndex)
 		}
 	}

--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -15,13 +15,12 @@ import androidx.core.os.LocaleListCompat
 import androidx.documentfile.provider.DocumentFile
 import androidx.preference.PreferenceManager
 import dagger.hilt.android.qualifiers.ApplicationContext
-import org.koitharu.kotatsu.R
+import org.json.JSONArray
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.getEnumValue
 import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.putAll
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
@@ -45,7 +44,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {

 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 	private val connectivityManager = context.connectivityManager
-	private val mangaListBadgesDefault = ArraySet(context.resources.getStringArray(R.array.values_list_badges))

 	var listMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.GRID)
@@ -105,9 +103,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getEnumValue(KEY_LIST_MODE_FAVORITES, listMode)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE_FAVORITES, value) }

-	val isTagsWarningsEnabled: Boolean
-		get() = prefs.getBoolean(KEY_TAGS_WARNINGS, true)
-
 	var isNsfwContentDisabled: Boolean
 		get() = prefs.getBoolean(KEY_DISABLE_NSFW, false)
 		set(value) = prefs.edit { putBoolean(KEY_DISABLE_NSFW, value) }
@@ -146,11 +141,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderOptimizationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_OPTIMIZE, false)

-	val readerControls: Set<ReaderControl>
-		get() = prefs.getStringSet(KEY_READER_CONTROLS, null)?.mapNotNullTo(EnumSet.noneOf(ReaderControl::class.java)) {
-			ReaderControl.entries.find(it)
-		} ?: ReaderControl.DEFAULT
-
 	val isOfflineCheckDisabled: Boolean
 		get() = prefs.getBoolean(KEY_OFFLINE_DISABLED, false)

@@ -309,10 +299,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getInt(KEY_SOURCES_VERSION, 0)
 		set(value) = prefs.edit { putInt(KEY_SOURCES_VERSION, value) }

-	var isAllSourcesEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SOURCES_ENABLED_ALL, false)
-		set(value) = prefs.edit { putBoolean(KEY_SOURCES_ENABLED_ALL, value) }
-
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)

@@ -362,9 +348,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isSuggestionsExcludeNsfw: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS_EXCLUDE_NSFW, false)

-	val isSuggestionsIncludeDisabledSources: Boolean
-		get() = prefs.getBoolean(KEY_SUGGESTIONS_DISABLED_SOURCES, false)
-
 	val isSuggestionsNotificationAvailable: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS_NOTIFICATIONS, false)

@@ -380,8 +363,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isReaderBarEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READER_BAR, true)

-	val isReaderBarTransparent: Boolean
-		get() = prefs.getBoolean(KEY_READER_BAR_TRANSPARENT, true)
+	val isReaderSliderEnabled: Boolean
+		get() = prefs.getBoolean(KEY_READER_SLIDER, true)

 	val isReaderKeepScreenOn: Boolean
 		get() = prefs.getBoolean(KEY_READER_SCREEN_ON, true)
@@ -506,12 +489,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
 		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }

-	val isBackupTelegramUploadEnabled: Boolean
-		get() = prefs.getBoolean(KEY_BACKUP_TG_ENABLED, false)
-
-	val backupTelegramChatId: String?
-		get() = prefs.getString(KEY_BACKUP_TG_CHAT, null)?.nullIfEmpty()
-
 	val isReadingTimeEstimationEnabled: Boolean
 		get() = prefs.getBoolean(KEY_READING_TIME, true)

@@ -554,15 +531,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		prefs.edit { putString(KEY_PAGES_SAVE_DIR, uri?.toString()) }
 	}

-	fun getMangaListBadges(): Int {
-		val raw = prefs.getStringSet(KEY_MANGA_LIST_BADGES, mangaListBadgesDefault).orEmpty()
-		var result = 0
-		for (item in raw) {
-			result = result or item.toInt()
-		}
-		return result
-	}
-
 	fun subscribe(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
 		prefs.registerOnSharedPreferenceChangeListener(listener)
 	}
@@ -575,9 +543,19 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {

 	fun getAllValues(): Map<String, *> = prefs.all

-	fun upsertAll(m: Map<String, *>) = prefs.edit {
-		clear()
-		putAll(m)
+	fun upsertAll(m: Map<String, *>) {
+		prefs.edit {
+			m.forEach { e ->
+				when (val v = e.value) {
+					is Boolean -> putBoolean(e.key, v)
+					is Int -> putInt(e.key, v)
+					is Long -> putLong(e.key, v)
+					is Float -> putFloat(e.key, v)
+					is String -> putString(e.key, v)
+					is JSONArray -> putStringSet(e.key, v.toStringSet())
+				}
+			}
+		}
 	}

 	private fun isBackgroundNetworkRestricted(): Boolean {
@@ -588,6 +566,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}

+	private fun JSONArray.toStringSet(): Set<String> {
+		val len = length()
+		val result = ArraySet<String>(len)
+		for (i in 0 until len) {
+			result.add(getString(i))
+		}
+		return result
+	}
+
 	companion object {

 		const val TRACK_HISTORY = "history"
@@ -634,7 +621,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		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_CONTROLS = "reader_controls"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
 		const val KEY_READER_CROP = "reader_crop"
@@ -664,7 +650,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SUGGESTIONS_WIFI_ONLY = "suggestions_wifi"
 		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
 		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
-		const val KEY_SUGGESTIONS_DISABLED_SOURCES = "suggestions_disabled_sources"
 		const val KEY_SUGGESTIONS_NOTIFICATIONS = "suggestions_notifications"
 		const val KEY_SHIKIMORI = "shikimori"
 		const val KEY_ANILIST = "anilist"
@@ -679,7 +664,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_SYNC = "sync"
 		const val KEY_SYNC_SETTINGS = "sync_settings"
 		const val KEY_READER_BAR = "reader_bar"
-		const val KEY_READER_BAR_TRANSPARENT = "reader_bar_transparent"
+		const val KEY_READER_SLIDER = "reader_slider"
 		const val KEY_READER_BACKGROUND = "reader_background"
 		const val KEY_READER_SCREEN_ON = "reader_screen_on"
 		const val KEY_SHORTCUTS = "dynamic_shortcuts"
@@ -730,17 +715,13 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
 		const val KEY_SOURCES_VERSION = "sources_version"
-		const val KEY_SOURCES_ENABLED_ALL = "sources_enabled_all"
 		const val KEY_QUICK_FILTER = "quick_filter"
-		const val KEY_BACKUP_TG_ENABLED = "backup_periodic_tg_enabled"
-		const val KEY_BACKUP_TG_CHAT = "backup_periodic_tg_chat_id"
-		const val KEY_MANGA_LIST_BADGES = "manga_list_badges"
-		const val KEY_TAGS_WARNINGS = "tags_warnings"

 		// keys for non-persistent preferences
 		const val KEY_APP_VERSION = "app_version"
 		const val KEY_IGNORE_DOZE = "ignore_dose"
 		const val KEY_TRACKER_DEBUG = "tracker_debug"
+		const val KEY_APP_UPDATE = "app_update"
 		const val KEY_LINK_WEBLATE = "about_app_translation"
 		const val KEY_LINK_TELEGRAM = "about_telegram"
 		const val KEY_LINK_GITHUB = "about_github"
@@ -748,11 +729,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PROXY_TEST = "proxy_test"
 		const val KEY_OPEN_BROWSER = "open_browser"
 		const val KEY_HANDLE_LINKS = "handle_links"
-		const val KEY_BACKUP_TG_OPEN = "backup_periodic_tg_open"
-		const val KEY_BACKUP_TG_TEST = "backup_periodic_tg_test"
-		const val KEY_CLEAR_MANGA_DATA = "manga_data_clear"
-		const val KEY_STORAGE_USAGE = "storage_usage"
-		const val KEY_WEBVIEW_CLEAR = "webview_clear"

 		// old keys are for migration only
 		private const val KEY_IMAGES_PROXY_OLD = "images_proxy"
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderBackground.kt
@@ -1,13 +1,11 @@
 package org.koitharu.kotatsu.core.prefs

 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.view.ContextThemeWrapper
 import androidx.annotation.Keep
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import org.koitharu.kotatsu.core.util.ext.getThemeDrawable
-import org.koitharu.kotatsu.core.util.ext.isNightMode
 import com.google.android.material.R as materialR

@Keep
@@ -15,7 +13,7 @@ enum class ReaderBackground {

 	DEFAULT, LIGHT, DARK, WHITE, BLACK;

-	fun resolve(context: Context): Drawable? = when (this) {
+	fun resolve(context: Context) = when (this) {
 		DEFAULT -> context.getThemeDrawable(android.R.attr.windowBackground)
 		LIGHT -> ContextThemeWrapper(context, materialR.style.ThemeOverlay_Material3_Light)
 			.getThemeDrawable(android.R.attr.windowBackground)
@@ -26,14 +24,4 @@ enum class ReaderBackground {
 		WHITE -> ContextCompat.getColor(context, android.R.color.white).toDrawable()
 		BLACK -> ContextCompat.getColor(context, android.R.color.black).toDrawable()
 	}
-
-	fun isLight(context: Context): Boolean = when (this) {
-		DEFAULT -> !context.resources.isNightMode
-
-		LIGHT,
-		WHITE -> true
-
-		DARK,
-		BLACK -> false
-	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderControl.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ReaderControl.kt
@@ -1,15 +0,0 @@
-package org.koitharu.kotatsu.core.prefs
-
-import java.util.EnumSet
-
-enum class ReaderControl {
-
-	PREV_CHAPTER, NEXT_CHAPTER, SLIDER, PAGES_SHEET, SCREEN_ROTATION, SAVE_PAGE;
-
-	companion object {
-
-		val DEFAULT: Set<ReaderControl> = EnumSet.of(
-			PREV_CHAPTER, NEXT_CHAPTER, SLIDER, PAGES_SHEET,
-		)
-	}
-}
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
@@ -25,9 +25,6 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 	val isSlowdownEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SLOWDOWN, false)

-	val isCaptchaNotificationsDisabled: Boolean
-		get() = prefs.getBoolean(KEY_NO_CAPTCHA, false)
-
 	@Suppress("UNCHECKED_CAST")
 	override fun <T> get(key: ConfigKey<T>): T {
 		return when (key) {
@@ -68,6 +65,5 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig

 		const val KEY_SORT_ORDER = "sort_order"
 		const val KEY_SLOWDOWN = "slowdown"
-		const val KEY_NO_CAPTCHA = "no_captcha"
 	}
 }
--- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt
@@ -1,22 +1,18 @@
 package org.koitharu.kotatsu.core.ui

-import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
-import android.os.Build
+import android.graphics.Color
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
-import androidx.core.view.OnApplyWindowInsetsListener
-import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.FragmentManager
 import androidx.viewbinding.ViewBinding
 import dagger.hilt.android.EntryPointAccessors
@@ -25,17 +21,16 @@ import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
-import org.koitharu.kotatsu.core.nav.AppRouter
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
+import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
 import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
-import androidx.appcompat.R as appcompatR

 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
 	ExceptionResolver.Host,
-	OnApplyWindowInsetsListener,
-	ScreenshotPolicyHelper.ContentContainer {
+	ScreenshotPolicyHelper.ContentContainer,
+	WindowInsetsDelegate.WindowInsetsListener {

 	private var isAmoledTheme = false

@@ -45,20 +40,16 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected lateinit var exceptionResolver: ExceptionResolver
 		private set

+	@JvmField
+	protected val insetsDelegate = WindowInsetsDelegate()
+
 	@JvmField
 	val actionModeDelegate = ActionModeDelegate()

-	private lateinit var entryPoint: BaseActivityEntryPoint
-
-	override fun attachBaseContext(newBase: Context) {
-		entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(newBase.applicationContext)
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-			AppCompatDelegate.setApplicationLocales(entryPoint.settings.appLocales)
-		}
-		super.attachBaseContext(newBase)
-	}
+	private var defaultStatusBarColor = Color.TRANSPARENT

 	override fun onCreate(savedInstanceState: Bundle?) {
+		val entryPoint = EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(this)
 		val settings = entryPoint.settings
 		isAmoledTheme = settings.isAmoledTheme
 		setTheme(settings.colorScheme.styleResId)
@@ -67,8 +58,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 		putDataToExtras(intent)
 		exceptionResolver = entryPoint.exceptionResolverFactory.create(this)
-		enableEdgeToEdge()
 		super.onCreate(savedInstanceState)
+		WindowCompat.setDecorFitsSystemWindows(window, false)
+		insetsDelegate.handleImeInsets = true
+		insetsDelegate.addInsetsListener(this)
 	}

 	override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -82,10 +75,16 @@ abstract class BaseActivity<B : ViewBinding> :
 	}

 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
-	override fun setContentView(layoutResID: Int) = throw UnsupportedOperationException()
+	override fun setContentView(layoutResID: Int) {
+		super.setContentView(layoutResID)
+		setupToolbar()
+	}

 	@Deprecated("Use ViewBinding", level = DeprecationLevel.ERROR)
-	override fun setContentView(view: View?) = throw UnsupportedOperationException()
+	override fun setContentView(view: View?) {
+		super.setContentView(view)
+		setupToolbar()
+	}

 	override fun getContext() = this

@@ -94,18 +93,9 @@ abstract class BaseActivity<B : ViewBinding> :
 	protected fun setContentView(binding: B) {
 		this.viewBinding = binding
 		super.setContentView(binding.root)
-		ViewCompat.setOnApplyWindowInsetsListener(binding.root, this)
 		val toolbar = (binding.root.findViewById<View>(R.id.toolbar) as? Toolbar)
 		toolbar?.let(this::setSupportActionBar)
-	}
-
-	protected fun setDisplayHomeAsUp(isEnabled: Boolean, showUpAsClose: Boolean) {
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(isEnabled)
-			if (showUpAsClose) {
-				setHomeAsUpIndicator(appcompatR.drawable.abc_ic_clear_material)
-			}
-		}
+		insetsDelegate.onViewCreated(binding.root)
 	}

 	override fun onSupportNavigateUp(): Boolean {
@@ -133,6 +123,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		return super.onKeyDown(keyCode, event)
 	}

+	private fun setupToolbar() {
+		(findViewById<View>(R.id.toolbar) as? Toolbar)?.let(this::setSupportActionBar)
+	}
+
 	protected fun isDarkAmoledTheme(): Boolean {
 		val uiMode = resources.configuration.uiMode
 		val isNight = uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
@@ -165,7 +159,7 @@ abstract class BaseActivity<B : ViewBinding> :
 	override fun isNsfwContent(): Flow<Boolean> = flowOf(false)

 	private fun putDataToExtras(intent: Intent?) {
-		intent?.putExtra(AppRouter.KEY_DATA, intent.data)
+		intent?.putExtra(EXTRA_DATA, intent.data)
 	}

 	protected fun setContentViewWebViewSafe(viewBindingProducer: () -> B): Boolean {
@@ -184,4 +178,9 @@ abstract class BaseActivity<B : ViewBinding> :
 	}

 	protected fun hasViewBinding() = ::viewBinding.isInitialized
+
+	companion object {
+
+		const val EXTRA_DATA = "data"
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Koitharu	0153e90bf0	Fix build	2025-01-22 20:35:51 +02:00
Koitharu	d4f8fe83f5	Release signing config	2025-01-22 20:27:30 +02:00
Koitharu	d28b1e4094	Release build workflow	2025-01-22 20:22:03 +02:00
Koitharu	cd2de0136a	Support for dynamic version	2025-01-22 20:22:02 +02:00