Draft double reader implementation

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+ko_fi: xtimms
+custom: ["https://yoomoney.ru/to/410012543938752"]

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/report_bug.yml

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

.github/ISSUE_TEMPLATE/request_feature.yml

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

.github/workflows/trigger-site-deploy.yml

@@ -1,16 +0,0 @@
-name: Trigger Site Update
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  trigger-site:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send repository_dispatch to site-repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.SITE_REPO_TOKEN }}
-          repository: KotatsuApp/website
-          event-type: app-release

.gitignore

@@ -10,13 +10,11 @@
 /.idea/compiler.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
-/.idea/ktlint-plugin.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
 /.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
-/.idea/deploymentTargetSelector.xml
 /.idea/render.experimental.xml
 /.idea/inspectionProfiles/
 .DS_Store
@@ -24,6 +22,3 @@
 /captures
 .externalNativeBuild
 .cxx
-/.idea/deviceManager.xml
-/.kotlin/
-/.idea/AndroidProjectSystem.xml

.idea/.gitignore

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

.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>

.idea/gradle.xml

@@ -4,15 +4,16 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
+        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-21" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/vcs.xml

@@ -10,6 +10,6 @@
     </option>
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

CONTRIBUTING.md

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

LICENSE

@@ -619,3 +619,56 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,117 +1,57 @@
-<div align="center">
+# Kotatsu
 
-<a href="https://kotatsu.app">
+Kotatsu is a free and open source manga reader for Android.
-    <img src="./.github/assets/vtuber.png" alt="Kotatsu Logo" title="Kotatsu" width="600"/>
-</a>
 
-# [Kotatsu](https://kotatsu.app)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/KotatsuApp/Kotatsu) ![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF)](https://t.me/kotatsuapp) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
-
-**[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)
 
 ### 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.
-* **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 (Unstable, use at your own risk). Application has a built-in self-updating feature.
-
-</div>
 
 ### Main Features
 
-<div align="left">
+* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers)
+* Search manga by name and genres
+* Reading history and bookmarks
+* Favourites organized by user-defined categories
+* Downloading manga and reading it offline. Third-party CBZ archives also supported
+* Tablet-optimized Material You UI
+* Standard and Webtoon-optimized reader
+* Notifications about new chapters with updates feed
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
+* Password/fingerprint protect access to the app
+* History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 
-* Online [manga catalogues](https://github.com/KotatsuApp/kotatsu-parsers) (with 1200+ manga sources)
+### Screenshots
-* Search manga by name, genres and more filters
-* 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)
-* 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.0+
 
-</div>
+| ![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) |
 
-### In-App Screenshots
+| ![](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) |
-
+|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
-<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>
 
 ### Localization
 
-<a href="https://hosted.weblate.org/engage/kotatsu/">
+[<img src="https://hosted.weblate.org/widgets/kotatsu/-/287x66-white.png" alt="Translation status">](https://hosted.weblate.org/engage/kotatsu/)
-<img src="https://hosted.weblate.org/widget/kotatsu/horizontal-auto.png" alt="Translation status" />
-</a>
 
-**[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is localized in a number of different languages.**<br>
+Kotatsu is localized in a number of different languages, if you would like to help improve these or add new 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/)
-please head over to the [Weblate project page](https://hosted.weblate.org/engage/kotatsu/)**
 
 ### Contributing
 
-<br>
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for the guidelines.
-
-<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**
-
-### Certificate fingerprints
-
-```plaintext
-2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE
-```
-
-```plaintext
-67:E1:51:00:BB:80:93:01:78:3E:DC:B6:34:8F:A3:BB:F8:30:34:D9:1E:62:86:8A:91:05:3D:BD:70:DB:3F:18
-```
 
 ### 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 &
-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.
+install instructions.
-
-</div>
 
 ### DMCA disclaimer
 
-<div align="left">
+The developers of this application does not have any affiliation with the content available in the app.
-
+It is collecting from the sources freely available through any web browser.
-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>

app/build.gradle

@@ -1,101 +1,68 @@
-import java.time.LocalDateTime
-
 plugins {
 	id 'com.android.application'
 	id 'kotlin-android'
+	id 'kotlin-kapt'
 	id 'com.google.devtools.ksp'
 	id 'kotlin-parcelize'
 	id 'dagger.hilt.android.plugin'
-	id 'androidx.room'
-	id 'org.jetbrains.kotlin.plugin.serialization'
-	// enable if needed
-	// id 'dev.reformator.stacktracedecoroutinator'
 }
 
 android {
-	compileSdk = 36
+	compileSdk = 34
-	buildToolsVersion = '35.0.0'
+	buildToolsVersion = '34.0.0'
 	namespace = 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
-		targetSdk = 36
+		targetSdk = 34
-		versionCode = 1025
+		versionCode = 584
-		versionName = '9.1.1'
+		versionName = '6.1.6'
 		generatedDensities = []
-		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
+		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
-			arg('room.generateKotlin', 'true')
+			arg("room.schemaLocation", "$projectDir/schemas")
 		}
 		androidResources {
-			// https://issuetracker.google.com/issues/408030127
+			generateLocaleConfig true
-			generateLocaleConfig false
 		}
-		def localProperties = new Properties()
-		def localPropertiesFile = rootProject.file('local.properties')
-		if (localPropertiesFile.exists()) {
-			localProperties.load(new FileInputStream(localPropertiesFile))
-		}
-		resValue 'string', 'tg_backup_bot_token', localProperties.getProperty('tg_backup_bot_token', '')
 	}
 	buildTypes {
 		debug {
 			applicationIdSuffix = '.debug'
 		}
 		release {
+			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 		}
-		nightly {
-			initWith release
-			applicationIdSuffix = '.nightly'
-		}
 	}
 	buildFeatures {
 		viewBinding true
 		buildConfig true
 	}
-	packagingOptions {
-		resources {
-			excludes += [
-				'META-INF/README.md',
-				'META-INF/NOTICE.md'
-			]
-		}
-	}
 	sourceSets {
 		androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
 		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		coreLibraryDesugaringEnabled true
+		sourceCompatibility JavaVersion.VERSION_17
-		sourceCompatibility JavaVersion.VERSION_11
+		targetCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_11
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_11.toString()
+		jvmTarget = JavaVersion.VERSION_17.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.ExperimentalForInheritanceCoroutinesApi',
-			'-opt-in=kotlinx.coroutines.InternalForInheritanceCoroutinesApi',
 			'-opt-in=kotlinx.coroutines.FlowPreview',
 			'-opt-in=kotlin.contracts.ExperimentalContracts',
-			'-opt-in=coil3.annotation.ExperimentalCoilApi',
+			'-opt-in=coil.annotation.ExperimentalCoilApi',
-			'-opt-in=coil3.annotation.InternalCoilApi',
-			'-opt-in=kotlinx.serialization.ExperimentalSerializationApi',
-			'-Xjspecify-annotations=strict',
-			'-Xtype-enhancement-improvements-strict-mode'
 		]
 	}
-	room {
-		schemaDirectory "$projectDir/schemas"
-	}
 	lint {
 		abortOnError true
-		disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'
+		disable 'MissingTranslation', 'PrivateResource', 'NotifyDataSetChanged', 'SetJavaScriptEnabled'
 	}
 	testOptions {
 		unitTests.includeAndroidResources true
@@ -104,107 +71,90 @@ android {
 			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
 		}
 	}
-	applicationVariants.configureEach { variant ->
+}
-		if (variant.name == 'nightly') {
+afterEvaluate {
-			variant.outputs.each { output ->
+	compileDebugKotlin {
-				def now = LocalDateTime.now()
+		kotlinOptions {
-				output.versionCodeOverride = now.format("yyMMdd").toInteger()
+			freeCompilerArgs += ['-opt-in=org.koitharu.kotatsu.parsers.InternalParsersApi']
-				output.versionNameOverride = 'N' + now.format("yyyyMMdd")
-			}
 		}
 	}
 }
 dependencies {
-	def parsersVersion = libs.versions.parsers.get()
+	//noinspection GradleDependency
-	if (System.properties.containsKey('parsersVersionOverride')) {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:400a90464e') {
-		// usage:
-		// -DparsersVersionOverride=$(curl -s https://api.github.com/repos/kotatsuapp/kotatsu-parsers/commits/master -H "Accept: application/vnd.github.sha" | cut -c -10)
-		parsersVersion = System.getProperty('parsersVersionOverride')
-	}
-	//noinspection UseTomlInstead
-	implementation("com.github.KotatsuApp:kotatsu-parsers:$parsersVersion") {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	coreLibraryDesugaring libs.desugar.jdk.libs
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
-	implementation libs.kotlin.stdlib
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-	implementation libs.kotlinx.coroutines.android
-	implementation libs.kotlinx.coroutines.guava
 
-	implementation libs.androidx.appcompat
+	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation libs.androidx.core
+	implementation 'androidx.core:core-ktx:1.12.0'
-	implementation libs.androidx.activity
+	implementation 'androidx.activity:activity-ktx:1.8.0'
-	implementation libs.androidx.fragment
+	implementation 'androidx.fragment:fragment-ktx:1.6.1'
-	implementation libs.androidx.transition
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-	implementation libs.androidx.collection
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-	implementation libs.lifecycle.viewmodel
+	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
-	implementation libs.lifecycle.service
+	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
-	implementation libs.lifecycle.process
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-	implementation libs.androidx.constraintlayout
+	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation libs.androidx.documentfile
+	implementation 'androidx.recyclerview:recyclerview:1.3.1'
-	implementation libs.androidx.swiperefreshlayout
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
-	implementation libs.androidx.recyclerview
+	implementation 'androidx.preference:preference-ktx:1.2.1'
-	implementation libs.androidx.viewpager2
+	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation libs.androidx.preference
+	implementation 'com.google.android.material:material:1.10.0'
-	implementation libs.androidx.biometric
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.2'
-	implementation libs.material
-	implementation libs.androidx.lifecycle.common.java8
-	implementation libs.androidx.webkit
 
-	implementation libs.androidx.work.runtime
+	// TODO https://issuetracker.google.com/issues/254846063
-	implementation libs.guava
+	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	//noinspection GradleDependency
+	implementation('com.google.guava:guava:32.0.1-android') {
+		exclude group: 'com.google.guava', module: 'failureaccess'
+		exclude group: 'org.checkerframework', module: 'checker-qual'
+		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
+	}
 
-	implementation libs.androidx.room.runtime
+	implementation 'androidx.room:room-runtime:2.5.2'
-	implementation libs.androidx.room.ktx
+	implementation 'androidx.room:room-ktx:2.5.2'
-	ksp libs.androidx.room.compiler
+	ksp 'androidx.room:room-compiler:2.5.2'
 
-	implementation libs.okhttp
+	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-	implementation libs.okhttp.tls
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation libs.okhttp.dnsoverhttps
+	implementation 'com.squareup.okio:okio:3.6.0'
-	implementation libs.okio
-	implementation libs.kotlinx.serialization.json
 
-	implementation libs.adapterdelegates
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
-	implementation libs.adapterdelegates.viewbinding
+	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation libs.hilt.android
+	implementation 'com.google.dagger:hilt-android:2.48.1'
-	ksp libs.hilt.compiler
+	kapt 'com.google.dagger:hilt-compiler:2.48.1'
-	implementation libs.androidx.hilt.work
+	implementation 'androidx.hilt:hilt-work:1.0.0'
-	ksp libs.androidx.hilt.compiler
+	kapt 'androidx.hilt:hilt-compiler:1.0.0'
 
-	implementation libs.coil.core
+	implementation 'io.coil-kt:coil-base:2.4.0'
-	implementation libs.coil.network
+	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation libs.coil.gif
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:169806d928'
-	implementation libs.coil.svg
+	implementation 'com.github.solkin:disk-lru-cache:1.4'
-	implementation libs.avif.decoder
+	implementation 'io.noties.markwon:core:4.6.2'
-	implementation libs.ssiv
-	implementation libs.disk.lru.cache
-	implementation libs.markwon
-	implementation libs.kizzyrpc
 
-	implementation libs.acra.http
+	implementation 'ch.acra:acra-http:5.11.2'
-	implementation libs.acra.dialog
+	implementation 'ch.acra:acra-dialog:5.11.2'
 
-	implementation libs.conscrypt.android
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
-	debugImplementation libs.leakcanary.android
+	testImplementation 'junit:junit:4.13.2'
-	nightlyImplementation libs.leakcanary.android
+	testImplementation 'org.json:json:20230618'
-	debugImplementation libs.workinspector
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
-	testImplementation libs.junit
+	androidTestImplementation 'androidx.test:runner:1.5.2'
-	testImplementation libs.json
+	androidTestImplementation 'androidx.test:rules:1.5.0'
-	testImplementation libs.kotlinx.coroutines.test
+	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation libs.androidx.runner
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
-	androidTestImplementation libs.androidx.rules
-	androidTestImplementation libs.androidx.test.core
-	androidTestImplementation libs.androidx.junit
 
-	androidTestImplementation libs.kotlinx.coroutines.test
+	androidTestImplementation 'androidx.room:room-testing:2.5.2'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
-	androidTestImplementation libs.androidx.room.testing
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
-	androidTestImplementation libs.moshi.kotlin
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.48.1'
-
-	androidTestImplementation libs.hilt.android.testing
-	kspAndroidTest libs.hilt.android.compiler
 }

app/proguard-rules.pro

@@ -14,17 +14,7 @@
 -dontwarn org.conscrypt.**
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
--dontwarn com.google.j2objc.annotations.**
--dontwarn coil3.PlatformContext
 
 -keep class org.koitharu.kotatsu.core.exceptions.* { *; }
 -keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment
 -keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; }
--keep class org.koitharu.kotatsu.backups.ui.periodical.PeriodicalBackupSettingsFragment { *; }
--keep class org.jsoup.parser.Tag
--keep class org.jsoup.internal.StringUtil
-
--keep class org.acra.security.NoKeyStoreFactory { *; }
--keep class org.acra.config.DefaultRetryPolicy { *; }
--keep class org.acra.attachment.DefaultAttachmentProvider { *; }
--keep class org.acra.sender.JobSenderService

app/src/androidTest/assets/manga/bad_ids.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 1552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 1552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 1552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 1552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 1552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 1552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 1552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 1552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 1552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 1552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 1552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 1552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 1552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -166,9 +151,8 @@
 		},
 		{
 			"id": 1552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,

app/src/androidTest/assets/manga/empty.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,7 +29,6 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [],

app/src/androidTest/assets/manga/first_chapters.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,

app/src/androidTest/assets/manga/full.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541665,
-			"title": "2 - 1",
+			"name": "2 - 1",
 			"number": 6,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1415570400000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 3552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 3552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -166,9 +151,8 @@
 		},
 		{
 			"id": 3552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,

app/src/androidTest/assets/manga/header.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,7 +29,6 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": null,
 	"source": "READMANGA_RU"

app/src/androidTest/assets/manga/without_middle_chapter.json

@@ -1,7 +1,6 @@
 {
 	"id": -2096681732556647985,
 	"title": "Странствия Эманон",
-	"altTitles": [],
 	"url": "/stranstviia_emanon",
 	"publicUrl": "https://readmanga.io/stranstviia_emanon",
 	"rating": 0.9400894,
@@ -30,15 +29,13 @@
 		}
 	],
 	"state": "FINISHED",
-	"authors": [],
 	"largeCoverUrl": "https://staticrm.rmr.rocks/uploads/pics/01/12/559_o.jpg",
 	"description": "Продолжение истории о загадочной девушке по имени Эманон, которая помнит всё, что происходило на Земле за последние три миллиарда лет. \n<br>Начало истории читайте в \"Воспоминаниях Эманон\". \n<div class=\"clearfix\"></div>",
 	"chapters": [
 		{
 			"id": 3552943969433540704,
-			"title": "1 - 1",
+			"name": "1 - 1",
 			"number": 1,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/1",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -46,9 +43,8 @@
 		},
 		{
 			"id": 3552943969433540705,
-			"title": "1 - 2",
+			"name": "1 - 2",
 			"number": 2,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/2",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -56,9 +52,8 @@
 		},
 		{
 			"id": 3552943969433540706,
-			"title": "1 - 3",
+			"name": "1 - 3",
 			"number": 3,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/3",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -66,9 +61,8 @@
 		},
 		{
 			"id": 3552943969433540707,
-			"title": "1 - 4",
+			"name": "1 - 4",
 			"number": 4,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/4",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -76,9 +70,8 @@
 		},
 		{
 			"id": 3552943969433540708,
-			"title": "1 - 5",
+			"name": "1 - 5",
 			"number": 5,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol1/5",
 			"scanlator": "Sad-Robot",
 			"uploadDate": 1342731600000,
@@ -86,9 +79,8 @@
 		},
 		{
 			"id": 3552943969433541666,
-			"title": "2 - 2",
+			"name": "2 - 2",
 			"number": 7,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1419976800000,
@@ -96,9 +88,8 @@
 		},
 		{
 			"id": 3552943969433541667,
-			"title": "2 - 3",
+			"name": "2 - 3",
 			"number": 8,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/3",
 			"scanlator": "Sup!",
 			"uploadDate": 1427922000000,
@@ -106,9 +97,8 @@
 		},
 		{
 			"id": 3552943969433541668,
-			"title": "2 - 4",
+			"name": "2 - 4",
 			"number": 9,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/4",
 			"scanlator": "Sup!",
 			"uploadDate": 1436907600000,
@@ -116,9 +106,8 @@
 		},
 		{
 			"id": 3552943969433541669,
-			"title": "2 - 5",
+			"name": "2 - 5",
 			"number": 10,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/5",
 			"scanlator": "Sup!",
 			"uploadDate": 1446674400000,
@@ -126,9 +115,8 @@
 		},
 		{
 			"id": 3552943969433541670,
-			"title": "2 - 6",
+			"name": "2 - 6",
 			"number": 11,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol2/6",
 			"scanlator": "Sup!",
 			"uploadDate": 1451512800000,
@@ -136,9 +124,8 @@
 		},
 		{
 			"id": 3552943969433542626,
-			"title": "3 - 1",
+			"name": "3 - 1",
 			"number": 12,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/1",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -146,9 +133,8 @@
 		},
 		{
 			"id": 3552943969433542627,
-			"title": "3 - 2",
+			"name": "3 - 2",
 			"number": 13,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/2",
 			"scanlator": "Sup!",
 			"uploadDate": 1461618000000,
@@ -156,9 +142,8 @@
 		},
 		{
 			"id": 3552943969433542628,
-			"title": "3 - 3",
+			"name": "3 - 3",
 			"number": 14,
-			"volume": 0,
 			"url": "/stranstviia_emanon/vol3/3",
 			"scanlator": "",
 			"uploadDate": 1465851600000,

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

@@ -1,29 +1,19 @@
 package org.koitharu.kotatsu
 
 import androidx.test.platform.app.InstrumentationRegistry
-import com.squareup.moshi.FromJson
+import com.squareup.moshi.*
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okio.buffer
 import okio.source
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import java.util.*
-import java.time.Instant
-import java.util.Date
 import kotlin.reflect.KClass
 
 object SampleData {
 
 	private val moshi = Moshi.Builder()
 		.add(DateAdapter())
-		.add(InstantAdapter())
-		.add(MangaSourceAdapter())
 		.add(KotlinJsonAdapterFactory())
 		.build()
 
@@ -61,36 +51,4 @@ object SampleData {
 			writer.value(value?.time ?: 0L)
 		}
 	}
-
-	private class MangaSourceAdapter : JsonAdapter<MangaSource>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): MangaSource? {
-			val name = reader.nextString() ?: return null
-			return MangaSource(name)
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: MangaSource?) {
-			writer.value(value?.name)
-		}
-	}
-
-	private class InstantAdapter : JsonAdapter<Instant>() {
-
-		@FromJson
-		override fun fromJson(reader: JsonReader): Instant? {
-			val ms = reader.nextLong()
-			return if (ms == 0L) {
-				null
-			} else {
-				Instant.ofEpochMilli(ms)
-			}
-		}
-
-		@ToJson
-		override fun toJson(writer: JsonWriter, value: Instant?) {
-			writer.value(value?.toEpochMilli() ?: 0L)
-		}
-	}
 }

app/src/androidTest/kotlin/org/koitharu/kotatsu/core/os/AppShortcutManagerTest.kt

@@ -57,7 +57,6 @@ class AppShortcutManagerTest {
 			page = 4,
 			scroll = 2,
 			percent = 0.3f,
-			force = false,
 		)
 		awaitUpdate()
 

app/src/androidTest/kotlin/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt

@@ -7,16 +7,13 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
+import org.junit.Assert.*
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.koitharu.kotatsu.SampleData
-import org.koitharu.kotatsu.backups.data.BackupRepository
+import org.koitharu.kotatsu.core.backup.BackupRepository
-import org.koitharu.kotatsu.backups.domain.AppBackupAgent
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
@@ -64,7 +61,6 @@ class AppBackupAgentTest {
 			page = 3,
 			scroll = 40,
 			percent = 0.2f,
-			force = false,
 		)
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
 
@@ -86,7 +82,7 @@ class AppBackupAgentTest {
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
 		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
 
-		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}
 

app/src/androidTest/kotlin/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt

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

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

@@ -1,91 +1,45 @@
 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
 
 class KotatsuApp : BaseApp() {
 
-	var isLeakCanaryEnabled: Boolean
+	override fun attachBaseContext(base: Context?) {
-		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() {
-		val notifier = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-			StrictModeNotifier(this)
-		} else {
-			null
-		}
 		StrictMode.setThreadPolicy(
-			StrictMode.ThreadPolicy.Builder().apply {
+			StrictMode.ThreadPolicy.Builder()
-				detectNetwork()
+				.detectAll()
-				detectDiskWrites()
+				.penaltyLog()
-				detectCustomSlowCalls()
+				.build(),
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectUnbufferedIo()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) detectResourceMismatches()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) detectExplicitGc()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
 		)
 		StrictMode.setVmPolicy(
-			StrictMode.VmPolicy.Builder().apply {
+			StrictMode.VmPolicy.Builder()
-				detectActivityLeaks()
+				.detectAll()
-				detectLeakedSqlLiteObjects()
+				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
-				detectLeakedClosableObjects()
+				.setClassInstanceLimit(PagesCache::class.java, 1)
-				detectLeakedRegistrationObjects()
+				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				.setClassInstanceLimit(PageLoader::class.java, 1)
-					detectContentUriWithoutPermission()
+				.penaltyLog()
-				}
+				.build(),
-				detectFileUriExposure()
-				penaltyLog()
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) {
-					penaltyListener(notifier.executor, notifier)
-				}
-			}.build(),
 		)
-		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder().apply {
+		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
-			detectWrongFragmentContainer()
+			.penaltyDeath()
-			detectFragmentTagUsage()
+			.detectFragmentReuse()
-			detectRetainInstanceUsage()
+			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
-			detectSetUserVisibleHint()
+			.detectRetainInstanceUsage()
-			detectWrongNestedHierarchy()
+			.detectSetUserVisibleHint()
-			detectFragmentReuse()
+			.detectFragmentTagUsage()
-			penaltyLog()
+			.build()
-			if (notifier != null) {
-				penaltyListener(notifier)
-			}
-		}.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)
 	}
 }

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

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

app/src/debug/kotlin/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.core.network
 
 import android.util.Log
 import okhttp3.Interceptor
-import okhttp3.Request
 import okhttp3.Response
 import okio.Buffer
 import org.koitharu.kotatsu.core.network.CommonHeaders.ACCEPT_ENCODING
@@ -11,13 +10,8 @@ class CurlLoggingInterceptor(
 	private val curlOptions: String? = null
 ) : Interceptor {
 
-	private val escapeRegex = Regex("([\\[\\]\"])")
+	override fun intercept(chain: Interceptor.Chain): Response {
-
+		val request = chain.request()
-	override fun intercept(chain: Interceptor.Chain): Response = chain.proceed(chain.request()).also {
-		logRequest(it.networkResponse?.request ?: it.request)
-	}
-
-	private fun logRequest(request: Request) {
 		var isCompressed = false
 
 		val curlCmd = StringBuilder()
@@ -46,15 +40,15 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
+		curlCmd.append(" \"").append(request.url).append('"')
 
 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
+
+		return chain.proceed(request)
 	}
 
-	private fun String.escape() = replace(escapeRegex) { match ->
+	private fun String.escape() = replace("\"", "\\\"")
-		"\\" + match.value
-	}
 
 	private fun log(msg: String) {
 		Log.d("CURL", msg)

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.EnumSet
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("")
+
+	override val sortOrders: Set<SortOrder>
+		get() = EnumSet.allOf(SortOrder::class.java)
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder,
+	): List<Manga> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		TODO("Not yet implemented")
+	}
+}

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",
-		)
-	}
-}

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

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

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

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

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

@@ -1,64 +0,0 @@
-package org.koitharu.kotatsu.settings
-
-import android.os.Bundle
-import androidx.preference.Preference
-import leakcanary.LeakCanary
-import org.koitharu.kotatsu.KotatsuApp
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-import org.koitharu.workinspector.WorkInspector
-
-class DebugSettingsFragment : BasePreferenceFragment(R.string.debug), Preference.OnPreferenceChangeListener,
-	Preference.OnPreferenceClickListener {
-
-	private val application
-		get() = requireContext().applicationContext as KotatsuApp
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_debug)
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.let { pref ->
-			pref.isChecked = application.isLeakCanaryEnabled
-			pref.onPreferenceChangeListener = this
-			pref.onContainerClickListener = this
-		}
-	}
-
-	override fun onResume() {
-		super.onResume()
-		findPreference<SplitSwitchPreference>(KEY_LEAK_CANARY)?.isChecked = application.isLeakCanaryEnabled
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_WORK_INSPECTOR -> {
-			startActivity(WorkInspector.getIntent(preference.context))
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceClick(preference: Preference): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			startActivity(LeakCanary.newLeakDisplayActivityIntent())
-			true
-		}
-
-		else -> super.onPreferenceTreeClick(preference)
-	}
-
-	override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean = when (preference.key) {
-		KEY_LEAK_CANARY -> {
-			application.isLeakCanaryEnabled = newValue as Boolean
-			true
-		}
-
-		else -> false
-	}
-
-	private companion object {
-
-		const val KEY_LEAK_CANARY = "leak_canary"
-		const val KEY_WORK_INSPECTOR = "work_inspector"
-	}
-}

app/src/debug/res/drawable-anydpi-v24/ic_bug.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.98150784"
-      android:scaleY="0.98150784"
-      android:translateX="0.22190611"
-      android:translateY="-0.2688478">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-  </group>
-</vector>

app/src/debug/res/drawable/ic_debug.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M20,8H17.19C16.74,7.2 16.12,6.5 15.37,6L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.05,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6C7.87,6.5 7.26,7.21 6.81,8H4V10H6.09C6.03,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.03,15.67 6.09,16H4V18H6.81C8.47,20.87 12.14,21.84 15,20.18C15.91,19.66 16.67,18.9 17.19,18H20V16H17.91C17.97,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.97,10.33 17.91,10H20V8M16,15A4,4 0 0,1 12,19A4,4 0 0,1 8,15V11A4,4 0 0,1 12,7A4,4 0 0,1 16,11V15M14,10V12H10V10H14M10,14H14V16H10V14Z" />
-</vector>

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

@@ -4,9 +4,8 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
-		android:id="@+id/action_clear"
+		android:id="@id/action_leaks"
-		android:title="@string/clear_stats"
+		android:title="@string/leak_canary_display_activity_label"
-		android:titleCondensed="@string/clear"
 		app:showAsAction="never" />
 
 </menu>

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

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

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

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

app/src/debug/res/xml/pref_debug.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<org.koitharu.kotatsu.settings.utils.SplitSwitchPreference
-		android:id="@+id/action_leakcanary"
-		android:key="leak_canary"
-		android:persistent="false"
-		android:title="LeakCanary" />
-
-	<Preference
-		android:id="@+id/action_works"
-		android:key="work_inspector"
-		android:persistent="false"
-		android:title="@string/wi_lib_name" />
-
-</androidx.preference.PreferenceScreen>

app/src/debug/res/xml/pref_root_debug.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<PreferenceScreen
-		android:fragment="org.koitharu.kotatsu.settings.DebugSettingsFragment"
-		android:icon="@drawable/ic_debug"
-		android:key="debug"
-		android:title="@string/debug" />
-
-</androidx.preference.PreferenceScreen>

app/src/main/assets/isrgrootx1.pem

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

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

@@ -1,79 +0,0 @@
-package org.koitharu.kotatsu.alternatives.domain
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.emptyFlow
-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.MangaParserSource
-import org.koitharu.kotatsu.parsers.model.MangaSource
-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
-
-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)
-		if (sources.isEmpty()) {
-			return emptyFlow()
-		}
-		val semaphore = Semaphore(MAX_PARALLELISM)
-		return channelFlow {
-			for (source in sources) {
-				launch {
-					val searchHelper = searchHelperFactory.create(source)
-					val list = runCatchingCancellable {
-						semaphore.withPermit {
-							searchHelper(manga.title, SearchKind.TITLE)?.manga
-						}
-					}.getOrNull()
-					list?.forEach { m ->
-						if (m.id != manga.id) {
-							launch {
-								val details = runCatchingCancellable {
-									mangaRepositoryFactory.create(m.source).getDetails(m)
-								}.getOrDefault(m)
-								send(details)
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun getSources(ref: MangaSource, disabled: Boolean): List<MangaSource> = if (disabled) {
-		sourcesRepository.getDisabledSources()
-	} else {
-		sourcesRepository.getEnabledSources()
-	}.sortedByDescending { it.priority(ref) }
-
-	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++
-			}
-		}
-		return res
-	}
-}

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

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

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

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

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

@@ -1,104 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-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
-import coil3.request.allowRgb565
-import coil3.request.crossfade
-import coil3.request.error
-import coil3.request.fallback
-import coil3.request.lifecycle
-import coil3.request.placeholder
-import coil3.request.transformations
-import coil3.transform.RoundedCornersTransformation
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.model.getTitle
-import org.koitharu.kotatsu.core.parser.favicon.faviconUri
-import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.enqueueWith
-import org.koitharu.kotatsu.core.util.ext.getQuantityStringSafe
-import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
-import org.koitharu.kotatsu.databinding.ItemMangaAlternativeBinding
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import kotlin.math.sign
-import com.google.android.material.R as materialR
-
-fun alternativeAD(
-	coil: ImageLoader,
-	lifecycleOwner: LifecycleOwner,
-	listener: OnListItemClickListener<MangaAlternativeModel>,
-) = adapterDelegateViewBinding<MangaAlternativeModel, ListModel, ItemMangaAlternativeBinding>(
-	{ inflater, parent -> ItemMangaAlternativeBinding.inflate(inflater, parent, false) },
-) {
-
-	val colorGreen = ContextCompat.getColor(context, R.color.common_green)
-	val colorRed = ContextCompat.getColor(context, R.color.common_red)
-	val clickListener = AdapterDelegateClickListenerAdapter(this, listener)
-	itemView.setOnClickListener(clickListener)
-	binding.buttonMigrate.setOnClickListener(clickListener)
-	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.textViewSubtitle.text = buildSpannedString {
-			if (item.chaptersCount > 0) {
-				append(
-					context.resources.getQuantityStringSafe(
-						R.plurals.chapters,
-						item.chaptersCount,
-						item.chaptersCount,
-					),
-				)
-			} else {
-				append(context.getString(R.string.no_chapters))
-			}
-			when (item.chaptersDiff.sign) {
-				-1 -> inSpans(ForegroundColorSpan(colorRed)) {
-					append("  ▼ ")
-					append(item.chaptersDiff.toString())
-				}
-
-				1 -> inSpans(ForegroundColorSpan(colorGreen)) {
-					append("  ▲ +")
-					append(item.chaptersDiff.toString())
-				}
-			}
-		}
-		binding.progressView.setProgress(
-			item.mangaModel.progress,
-			ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads,
-		)
-		binding.chipSource.also { chip ->
-			chip.text = item.manga.source.getTitle(chip.context)
-			ImageRequest.Builder(context)
-				.data(item.manga.source.faviconUri())
-				.lifecycle(lifecycleOwner)
-				.crossfade(false)
-				.size(context.resources.getDimensionPixelSize(materialR.dimen.m3_chip_icon_size))
-				.target(ChipIconTarget(chip))
-				.placeholder(R.drawable.ic_web)
-				.fallback(R.drawable.ic_web)
-				.error(R.drawable.ic_web)
-				.mangaSourceExtra(item.manga.source)
-				.transformations(RoundedCornersTransformation(context.resources.getDimension(R.dimen.chip_icon_corner)))
-				.allowRgb565(true)
-				.enqueueWith(coil)
-		}
-		binding.imageViewCover.setImageAsync(item.manga.coverUrl, item.manga)
-	}
-}

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

@@ -1,124 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.core.view.WindowInsetsCompat
-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.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.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 javax.inject.Inject
-
-@AndroidEntryPoint
-class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
-	ListStateHolderListener,
-	OnListItemClickListener<MangaAlternativeModel> {
-
-	@Inject
-	lateinit var coil: ImageLoader
-
-	private val viewModel by viewModels<AlternativesViewModel>()
-
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		setContentView(ActivityAlternativesBinding.inflate(layoutInflater))
-		supportActionBar?.run {
-			setDisplayHomeAsUpEnabled(true)
-			subtitle = viewModel.manga.title
-		}
-		val listAdapter = BaseListAdapter<ListModel>()
-			.addDelegate(ListItemType.MANGA_LIST_DETAILED, alternativeAD(coil, this, this))
-			.addDelegate(ListItemType.STATE_EMPTY, emptyStateListAD(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))
-			adapter = listAdapter
-		}
-
-		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
-		viewModel.list.observe(this, listAdapter)
-		viewModel.onMigrated.observeEvent(this) {
-			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
-			router.openDetails(it)
-			finishAfterTransition()
-		}
-	}
-
-	override fun onApplyWindowInsets(
-		v: View,
-		insets: WindowInsetsCompat
-	): WindowInsetsCompat {
-		val barsInsets = insets.systemBarsInsets
-		viewBinding.recyclerView.updatePadding(
-			left = barsInsets.left,
-			right = barsInsets.right,
-			bottom = barsInsets.bottom,
-		)
-		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.button_migrate -> confirmMigration(item.manga)
-			else -> router.openDetails(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)
-			setTitle(R.string.manga_migration)
-			setMessage(
-				getString(
-					R.string.migrate_confirmation,
-					viewModel.manga.title,
-					viewModel.manga.source.getTitle(context),
-					target.title,
-					target.source.getTitle(context),
-				),
-			)
-			setNegativeButton(android.R.string.cancel, null)
-			setPositiveButton(R.string.migrate) { _, _ ->
-				viewModel.migrate(target)
-			}
-		}.show()
-	}
-}

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

@@ -1,136 +0,0 @@
-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 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.MangaRepository
-import org.koitharu.kotatsu.core.prefs.ListMode
-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.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 javax.inject.Inject
-
-@HiltViewModel
-class AlternativesViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
-	private val mangaRepositoryFactory: MangaRepository.Factory,
-	private val alternativesUseCase: AlternativesUseCase,
-	private val migrateUseCase: MigrateUseCase,
-	private val mangaListMapper: MangaListMapper,
-) : 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 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))
-
-	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)
-		}
-	}
-
-	fun migrate(target: Manga) {
-		if (migrationJob?.isActive == true) {
-			return
-		}
-		migrationJob = launchLoadingJob(Dispatchers.Default) {
-			migrateUseCase(manga, target)
-			onMigrated.call(target)
-		}
-	}
-
-	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)
-				}
-		}
-	}
-}

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

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

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

@@ -1,30 +0,0 @@
-package org.koitharu.kotatsu.alternatives.ui
-
-import org.koitharu.kotatsu.core.model.chaptersCount
-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,
-	private val referenceChapters: Int,
-) : ListModel {
-
-	val manga: Manga
-		get() = mangaModel.manga
-
-	val chaptersCount = manga.chaptersCount()
-
-	val chaptersDiff: Int
-		get() = if (referenceChapters == 0 || chaptersCount == 0) 0 else chaptersCount - referenceChapters
-
-	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
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/BackupRepository.kt

@@ -1,262 +0,0 @@
-package org.koitharu.kotatsu.backups.data
-
-import androidx.collection.ArrayMap
-import androidx.room.withTransaction
-import dagger.Reusable
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collectIndexed
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.onStart
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.json.DecodeSequenceMode
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeToSequence
-import kotlinx.serialization.json.encodeToStream
-import kotlinx.serialization.serializer
-import org.json.JSONArray
-import org.json.JSONObject
-import org.koitharu.kotatsu.backups.data.model.BackupIndex
-import org.koitharu.kotatsu.backups.data.model.BookmarkBackup
-import org.koitharu.kotatsu.backups.data.model.CategoryBackup
-import org.koitharu.kotatsu.backups.data.model.FavouriteBackup
-import org.koitharu.kotatsu.backups.data.model.HistoryBackup
-import org.koitharu.kotatsu.backups.data.model.MangaBackup
-import org.koitharu.kotatsu.backups.data.model.SourceBackup
-import org.koitharu.kotatsu.backups.domain.BackupSection
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.CompositeResult
-import org.koitharu.kotatsu.core.util.progress.Progress
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import org.koitharu.kotatsu.reader.data.TapGridSettings
-import java.io.InputStream
-import java.io.OutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
-
-@Reusable
-class BackupRepository @Inject constructor(
-	private val database: MangaDatabase,
-	private val settings: AppSettings,
-	private val tapGridSettings: TapGridSettings,
-) {
-
-	private val json = Json {
-		allowSpecialFloatingPointValues = true
-		coerceInputValues = true
-		encodeDefaults = true
-		ignoreUnknownKeys = true
-		useAlternativeNames = false
-	}
-
-	suspend fun createBackup(
-		output: ZipOutputStream,
-		progress: FlowCollector<Progress>?,
-	) {
-		progress?.emit(Progress.INDETERMINATE)
-		var commonProgress = Progress(0, BackupSection.entries.size)
-		for (section in BackupSection.entries) {
-			when (section) {
-				BackupSection.INDEX -> output.writeJsonArray(
-					section = BackupSection.INDEX,
-					data = flowOf(BackupIndex()),
-					serializer = serializer(),
-				)
-
-				BackupSection.HISTORY -> output.writeJsonArray(
-					section = BackupSection.HISTORY,
-					data = database.getHistoryDao().dump().map { HistoryBackup(it) },
-					serializer = serializer(),
-				)
-
-				BackupSection.CATEGORIES -> output.writeJsonArray(
-					section = BackupSection.CATEGORIES,
-					data = database.getFavouriteCategoriesDao().findAll().asFlow().map { CategoryBackup(it) },
-					serializer = serializer(),
-				)
-
-				BackupSection.FAVOURITES -> output.writeJsonArray(
-					section = BackupSection.FAVOURITES,
-					data = database.getFavouritesDao().dump().map { FavouriteBackup(it) },
-					serializer = serializer(),
-				)
-
-				BackupSection.SETTINGS -> output.writeString(
-					section = BackupSection.SETTINGS,
-					data = dumpSettings(),
-				)
-
-				BackupSection.SETTINGS_READER_GRID -> output.writeString(
-					section = BackupSection.SETTINGS_READER_GRID,
-					data = dumpReaderGridSettings(),
-				)
-
-				BackupSection.BOOKMARKS -> output.writeJsonArray(
-					section = BackupSection.BOOKMARKS,
-					data = database.getBookmarksDao().dump().map { BookmarkBackup(it.first, it.second) },
-					serializer = serializer(),
-				)
-
-				BackupSection.SOURCES -> output.writeJsonArray(
-					section = BackupSection.SOURCES,
-					data = database.getSourcesDao().dumpEnabled().map { SourceBackup(it) },
-					serializer = serializer(),
-				)
-			}
-			progress?.emit(commonProgress)
-			commonProgress++
-		}
-		progress?.emit(commonProgress)
-	}
-
-	suspend fun restoreBackup(
-		input: ZipInputStream,
-		sections: Set<BackupSection>,
-		progress: FlowCollector<Progress>?,
-	): CompositeResult {
-		progress?.emit(Progress.INDETERMINATE)
-		var commonProgress = Progress(0, sections.size)
-		var entry = input.nextEntry
-		var result = CompositeResult.EMPTY
-		while (entry != null) {
-			val section = BackupSection.of(entry)
-			if (section in sections) {
-				result = result + when (section) {
-					BackupSection.INDEX -> CompositeResult.EMPTY // useless in our case
-					BackupSection.HISTORY -> input.readJsonArray<HistoryBackup>(serializer()).restoreToDb {
-						upsertManga(it.manga)
-						getHistoryDao().upsert(it.toEntity())
-					}
-
-					BackupSection.CATEGORIES -> input.readJsonArray<CategoryBackup>(serializer()).restoreToDb {
-						getFavouriteCategoriesDao().upsert(it.toEntity())
-					}
-
-					BackupSection.FAVOURITES -> input.readJsonArray<FavouriteBackup>(serializer()).restoreToDb {
-						upsertManga(it.manga)
-						getFavouritesDao().upsert(it.toEntity())
-					}
-
-					BackupSection.SETTINGS -> input.readMap().let {
-						settings.upsertAll(it)
-						CompositeResult.success()
-					}
-
-					BackupSection.SETTINGS_READER_GRID -> input.readMap().let {
-						tapGridSettings.upsertAll(it)
-						CompositeResult.success()
-					}
-
-					BackupSection.BOOKMARKS -> input.readJsonArray<BookmarkBackup>(serializer()).restoreToDb {
-						upsertManga(it.manga)
-						getBookmarksDao().upsert(it.bookmarks.map { b -> b.toEntity() })
-					}
-
-					BackupSection.SOURCES -> input.readJsonArray<SourceBackup>(serializer()).restoreToDb {
-						getSourcesDao().upsert(it.toEntity())
-					}
-
-					null -> CompositeResult.EMPTY // skip unknown entries
-				}
-				progress?.emit(commonProgress)
-				commonProgress++
-			}
-			input.closeEntry()
-			entry = input.nextEntry
-		}
-		progress?.emit(commonProgress)
-		return result
-	}
-
-	private suspend fun <T> ZipOutputStream.writeJsonArray(
-		section: BackupSection,
-		data: Flow<T>,
-		serializer: SerializationStrategy<T>,
-	) {
-		data.onStart {
-			putNextEntry(ZipEntry(section.entryName))
-			write("[")
-		}.onCompletion { error ->
-			if (error == null) {
-				write("]")
-			}
-			closeEntry()
-			flush()
-		}.collectIndexed { index, value ->
-			if (index > 0) {
-				write(",")
-			}
-			json.encodeToStream(serializer, value, this)
-		}
-	}
-
-	private fun <T> InputStream.readJsonArray(
-		serializer: DeserializationStrategy<T>,
-	): Sequence<T> = json.decodeToSequence(this, serializer, DecodeSequenceMode.ARRAY_WRAPPED)
-
-	private fun InputStream.readMap(): Map<String, Any?> {
-		val jo = JSONArray(readString()).getJSONObject(0)
-		val map = ArrayMap<String, Any?>(jo.length())
-		val keys = jo.keys()
-		while (keys.hasNext()) {
-			val key = keys.next()
-			map[key] = jo.get(key)
-		}
-		return map
-	}
-
-	private fun ZipOutputStream.writeString(
-		section: BackupSection,
-		data: String,
-	) {
-		putNextEntry(ZipEntry(section.entryName))
-		try {
-			write("[")
-			write(data)
-			write("]")
-		} finally {
-			closeEntry()
-			flush()
-		}
-	}
-
-	private fun OutputStream.write(str: String) = write(str.toByteArray())
-
-	private fun InputStream.readString(): String = readBytes().decodeToString()
-
-	private fun dumpSettings(): String {
-		val map = settings.getAllValues().toMutableMap()
-		map.remove(AppSettings.KEY_APP_PASSWORD)
-		map.remove(AppSettings.KEY_PROXY_PASSWORD)
-		map.remove(AppSettings.KEY_PROXY_LOGIN)
-		map.remove(AppSettings.KEY_INCOGNITO_MODE)
-		return JSONObject(map).toString()
-	}
-
-	private fun dumpReaderGridSettings(): String {
-		return JSONObject(tapGridSettings.getAllValues()).toString()
-	}
-
-	private suspend fun MangaDatabase.upsertManga(manga: MangaBackup) {
-		val tags = manga.tags.map { it.toEntity() }
-		getTagsDao().upsert(tags)
-		getMangaDao().upsert(manga.toEntity(), tags)
-	}
-
-	private suspend inline fun <T> Sequence<T>.restoreToDb(crossinline block: suspend MangaDatabase.(T) -> Unit): CompositeResult {
-		return fold(CompositeResult.EMPTY) { result, item ->
-			result + runCatchingCancellable {
-				database.withTransaction {
-					database.block(item)
-				}
-			}
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/BackupIndex.kt

@@ -1,19 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.BuildConfig
-
-@Serializable
-class BackupIndex(
-	@SerialName("app_id") val appId: String,
-	@SerialName("app_version") val appVersion: Int,
-	@SerialName("created_at") val createdAt: Long,
-) {
-
-	constructor() : this(
-		appId = BuildConfig.APPLICATION_ID,
-		appVersion = BuildConfig.VERSION_CODE,
-		createdAt = System.currentTimeMillis(),
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/BookmarkBackup.kt

@@ -1,56 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
-import org.koitharu.kotatsu.core.db.entity.MangaWithTags
-import org.koitharu.kotatsu.parsers.util.mapToSet
-
-@Serializable
-class BookmarkBackup(
-	@SerialName("manga") val manga: MangaBackup,
-	@SerialName("tags") val tags: Set<TagBackup>,
-	@SerialName("bookmarks") val bookmarks: List<Bookmark>,
-) {
-
-	@Serializable
-	class Bookmark(
-		@SerialName("manga_id") val mangaId: Long,
-		@SerialName("page_id") val pageId: Long,
-		@SerialName("chapter_id") val chapterId: Long,
-		@SerialName("page") val page: Int,
-		@SerialName("scroll") val scroll: Int,
-		@SerialName("image_url") val imageUrl: String,
-		@SerialName("created_at") val createdAt: Long,
-		@SerialName("percent") val percent: Float,
-	) {
-
-		fun toEntity() = BookmarkEntity(
-			mangaId = mangaId,
-			pageId = pageId,
-			chapterId = chapterId,
-			page = page,
-			scroll = scroll,
-			imageUrl = imageUrl,
-			createdAt = createdAt,
-			percent = percent,
-		)
-	}
-
-	constructor(manga: MangaWithTags, entities: List<BookmarkEntity>) : this(
-		manga = MangaBackup(manga.copy(tags = emptyList())),
-		tags = manga.tags.mapToSet { TagBackup(it) },
-		bookmarks = entities.map {
-			Bookmark(
-				mangaId = it.mangaId,
-				pageId = it.pageId,
-				chapterId = it.chapterId,
-				page = it.page,
-				scroll = it.scroll,
-				imageUrl = it.imageUrl,
-				createdAt = it.createdAt,
-				percent = it.percent,
-			)
-		},
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/CategoryBackup.kt

@@ -1,39 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
-import org.koitharu.kotatsu.list.domain.ListSortOrder
-
-@Serializable
-class CategoryBackup(
-	@SerialName("category_id") val categoryId: Int,
-	@SerialName("created_at") val createdAt: Long,
-	@SerialName("sort_key") val sortKey: Int,
-	@SerialName("title") val title: String,
-	@SerialName("order") val order: String = ListSortOrder.NEWEST.name,
-	@SerialName("track") val track: Boolean = true,
-	@SerialName("show_in_lib") val isVisibleInLibrary: Boolean = true,
-) {
-
-	constructor(entity: FavouriteCategoryEntity) : this(
-		categoryId = entity.categoryId,
-		createdAt = entity.createdAt,
-		sortKey = entity.sortKey,
-		title = entity.title,
-		order = entity.order,
-		track = entity.track,
-		isVisibleInLibrary = entity.isVisibleInLibrary,
-	)
-
-	fun toEntity() = FavouriteCategoryEntity(
-		categoryId = categoryId,
-		createdAt = createdAt,
-		sortKey = sortKey,
-		title = title,
-		order = order,
-		track = track,
-		isVisibleInLibrary = isVisibleInLibrary,
-		deletedAt = 0L,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/FavouriteBackup.kt

@@ -1,36 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.core.db.entity.MangaWithTags
-import org.koitharu.kotatsu.favourites.data.FavouriteEntity
-import org.koitharu.kotatsu.favourites.data.FavouriteManga
-
-@Serializable
-class FavouriteBackup(
-	@SerialName("manga_id") val mangaId: Long,
-	@SerialName("category_id") val categoryId: Long,
-	@SerialName("sort_key") val sortKey: Int = 0,
-	@SerialName("pinned") val isPinned: Boolean = false,
-	@SerialName("created_at") val createdAt: Long,
-	@SerialName("manga") val manga: MangaBackup,
-) {
-
-	constructor(entity: FavouriteManga) : this(
-		mangaId = entity.manga.id,
-		categoryId = entity.favourite.categoryId,
-		sortKey = entity.favourite.sortKey,
-		isPinned = entity.favourite.isPinned,
-		createdAt = entity.favourite.createdAt,
-		manga = MangaBackup(MangaWithTags(entity.manga, entity.tags)),
-	)
-
-	fun toEntity() = FavouriteEntity(
-		mangaId = mangaId,
-		categoryId = categoryId,
-		sortKey = sortKey,
-		isPinned = isPinned,
-		createdAt = createdAt,
-		deletedAt = 0L,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/HistoryBackup.kt

@@ -1,46 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.core.db.entity.MangaWithTags
-import org.koitharu.kotatsu.history.data.HistoryEntity
-import org.koitharu.kotatsu.history.data.HistoryWithManga
-import org.koitharu.kotatsu.list.domain.ReadingProgress.Companion.PROGRESS_NONE
-
-@Serializable
-class HistoryBackup(
-	@SerialName("manga_id") val mangaId: Long,
-	@SerialName("created_at") val createdAt: Long,
-	@SerialName("updated_at") val updatedAt: Long,
-	@SerialName("chapter_id") val chapterId: Long,
-	@SerialName("page") val page: Int,
-	@SerialName("scroll") val scroll: Float,
-	@SerialName("percent") val percent: Float = PROGRESS_NONE,
-	@SerialName("chapters") val chaptersCount: Int = 0,
-	@SerialName("manga") val manga: MangaBackup,
-) {
-
-	constructor(entity: HistoryWithManga) : this(
-		mangaId = entity.manga.id,
-		createdAt = entity.history.createdAt,
-		updatedAt = entity.history.updatedAt,
-		chapterId = entity.history.chapterId,
-		page = entity.history.page,
-		scroll = entity.history.scroll,
-		percent = entity.history.percent,
-		chaptersCount = entity.history.chaptersCount,
-		manga = MangaBackup(MangaWithTags(entity.manga, entity.tags)),
-	)
-
-	fun toEntity() = HistoryEntity(
-		mangaId = mangaId,
-		createdAt = createdAt,
-		updatedAt = updatedAt,
-		chapterId = chapterId,
-		page = page,
-		scroll = scroll,
-		percent = percent,
-		deletedAt = 0L,
-		chaptersCount = chaptersCount,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/MangaBackup.kt

@@ -1,60 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.core.db.entity.MangaEntity
-import org.koitharu.kotatsu.core.db.entity.MangaWithTags
-import org.koitharu.kotatsu.parsers.model.RATING_UNKNOWN
-import org.koitharu.kotatsu.parsers.util.mapToSet
-
-@Serializable
-class MangaBackup(
-	@SerialName("id") val id: Long,
-	@SerialName("title") val title: String,
-	@SerialName("alt_title") val altTitles: String? = null,
-	@SerialName("url") val url: String,
-	@SerialName("public_url") val publicUrl: String,
-	@SerialName("rating") val rating: Float = RATING_UNKNOWN,
-	@SerialName("nsfw") val isNsfw: Boolean = false,
-	@SerialName("content_rating") val contentRating: String? = null,
-	@SerialName("cover_url") val coverUrl: String,
-	@SerialName("large_cover_url") val largeCoverUrl: String? = null,
-	@SerialName("state") val state: String? = null,
-	@SerialName("author") val authors: String? = null,
-	@SerialName("source") val source: String,
-	@SerialName("tags") val tags: Set<TagBackup> = emptySet(),
-) {
-
-	constructor(entity: MangaWithTags) : this(
-		id = entity.manga.id,
-		title = entity.manga.title,
-		altTitles = entity.manga.altTitles,
-		url = entity.manga.url,
-		publicUrl = entity.manga.publicUrl,
-		rating = entity.manga.rating,
-		isNsfw = entity.manga.isNsfw,
-		contentRating = entity.manga.contentRating,
-		coverUrl = entity.manga.coverUrl,
-		largeCoverUrl = entity.manga.largeCoverUrl,
-		state = entity.manga.state,
-		authors = entity.manga.authors,
-		source = entity.manga.source,
-		tags = entity.tags.mapToSet { TagBackup(it) },
-	)
-
-	fun toEntity() = MangaEntity(
-		id = id,
-		title = title,
-		altTitles = altTitles,
-		url = url,
-		publicUrl = publicUrl,
-		rating = rating,
-		isNsfw = isNsfw,
-		contentRating = contentRating,
-		coverUrl = coverUrl,
-		largeCoverUrl = largeCoverUrl,
-		state = state,
-		authors = authors,
-		source = source,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/SourceBackup.kt

@@ -1,35 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
-
-@Serializable
-class SourceBackup(
-	@SerialName("source") val source: String,
-	@SerialName("sort_key") val sortKey: Int,
-	@SerialName("used_at") val lastUsedAt: Long,
-	@SerialName("added_in") val addedIn: Int,
-	@SerialName("pinned") val isPinned: Boolean = false,
-	@SerialName("enabled") val isEnabled: Boolean = true, // for compatibility purposes, should be only true
-) {
-
-	constructor(entity: MangaSourceEntity) : this(
-		source = entity.source,
-		sortKey = entity.sortKey,
-		lastUsedAt = entity.lastUsedAt,
-		addedIn = entity.addedIn,
-		isPinned = entity.isPinned,
-		isEnabled = entity.isEnabled,
-	)
-
-	fun toEntity() = MangaSourceEntity(
-		source = source,
-		isEnabled = isEnabled,
-		sortKey = sortKey,
-		addedIn = addedIn,
-		lastUsedAt = lastUsedAt,
-		isPinned = isPinned,
-		cfState = 0,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/data/model/TagBackup.kt

@@ -1,31 +0,0 @@
-package org.koitharu.kotatsu.backups.data.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import org.koitharu.kotatsu.core.db.entity.TagEntity
-
-@Serializable
-class TagBackup(
-	@SerialName("id") val id: Long,
-	@SerialName("title") val title: String,
-	@SerialName("key") val key: String,
-	@SerialName("source") val source: String,
-	@SerialName("pinned") val isPinned: Boolean = false,
-) {
-
-	constructor(entity: TagEntity) : this(
-		id = entity.id,
-		title = entity.title,
-		key = entity.key,
-		source = entity.source,
-		isPinned = entity.isPinned,
-	)
-
-	fun toEntity() = TagEntity(
-		id = id,
-		title = title,
-		key = key,
-		source = source,
-		isPinned = isPinned,
-	)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/domain/AppBackupAgent.kt

@@ -1,98 +0,0 @@
-package org.koitharu.kotatsu.backups.domain
-
-import android.app.backup.BackupAgent
-import android.app.backup.BackupDataInput
-import android.app.backup.BackupDataOutput
-import android.app.backup.FullBackupDataOutput
-import android.content.Context
-import android.os.ParcelFileDescriptor
-import androidx.annotation.VisibleForTesting
-import com.google.common.io.ByteStreams
-import kotlinx.coroutines.runBlocking
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.reader.data.TapGridSettings
-import java.io.File
-import java.io.FileDescriptor
-import java.io.FileInputStream
-import java.util.EnumSet
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-class AppBackupAgent : BackupAgent() {
-
-	override fun onBackup(
-		oldState: ParcelFileDescriptor?,
-		data: BackupDataOutput?,
-		newState: ParcelFileDescriptor?
-	) = Unit
-
-	override fun onRestore(
-		data: BackupDataInput?,
-		appVersionCode: Int,
-		newState: ParcelFileDescriptor?
-	) = Unit
-
-	override fun onFullBackup(data: FullBackupDataOutput) {
-		super.onFullBackup(data)
-		val file =
-			createBackupFile(
-				this,
-				BackupRepository(
-					MangaDatabase(context = applicationContext),
-					AppSettings(applicationContext),
-					TapGridSettings(applicationContext),
-				),
-			)
-		try {
-			fullBackupFile(file, data)
-		} finally {
-			file.delete()
-		}
-	}
-
-	override fun onRestoreFile(
-		data: ParcelFileDescriptor,
-		size: Long,
-		destination: File?,
-		type: Int,
-		mode: Long,
-		mtime: Long
-	) {
-		if (destination?.name?.endsWith(".bk.zip") == true) {
-			restoreBackupFile(
-				data.fileDescriptor,
-				size,
-				BackupRepository(
-					database = MangaDatabase(applicationContext),
-					settings = AppSettings(applicationContext),
-					tapGridSettings = TapGridSettings(applicationContext),
-				),
-			)
-			destination.delete()
-		} else {
-			super.onRestoreFile(data, size, destination, type, mode, mtime)
-		}
-	}
-
-	@VisibleForTesting
-	fun createBackupFile(context: Context, repository: BackupRepository): File {
-		val file = BackupUtils.createTempFile(context)
-		ZipOutputStream(file.outputStream()).use { output ->
-			runBlocking {
-				repository.createBackup(output, null)
-			}
-		}
-		return file
-	}
-
-	@VisibleForTesting
-	fun restoreBackupFile(fd: FileDescriptor, size: Long, repository: BackupRepository) {
-		ZipInputStream(ByteStreams.limit(FileInputStream(fd), size)).use { input ->
-			runBlocking {
-				repository.restoreBackup(input, EnumSet.allOf(BackupSection::class.java), null)
-			}
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/domain/BackupFile.kt

@@ -1,12 +0,0 @@
-package org.koitharu.kotatsu.backups.domain
-
-import android.net.Uri
-import java.util.Date
-
-data class BackupFile(
-	val uri: Uri,
-	val dateTime: Date,
-) : Comparable<BackupFile> {
-
-	override fun compareTo(other: BackupFile): Int = compareValues(dateTime, other.dateTime)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/domain/BackupSection.kt

@@ -1,27 +0,0 @@
-package org.koitharu.kotatsu.backups.domain
-
-import java.util.Locale
-import java.util.zip.ZipEntry
-
-enum class BackupSection(
-	val entryName: String,
-) {
-
-	INDEX("index"),
-	HISTORY("history"),
-	CATEGORIES("categories"),
-	FAVOURITES("favourites"),
-	SETTINGS("settings"),
-	SETTINGS_READER_GRID("reader_grid"),
-	BOOKMARKS("bookmarks"),
-	SOURCES("sources"),
-	;
-
-	companion object {
-
-		fun of(entry: ZipEntry): BackupSection? {
-			val name = entry.name.lowercase(Locale.ROOT)
-			return entries.first { x -> x.entryName == name }
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/domain/BackupUtils.kt

@@ -1,42 +0,0 @@
-package org.koitharu.kotatsu.backups.domain
-
-import android.content.Context
-import androidx.annotation.CheckResult
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import java.io.File
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-object BackupUtils {
-
-	private const val DIR_BACKUPS = "backups"
-	private val dateTimeFormat = SimpleDateFormat("yyyyMMdd-HHmm")
-
-	@CheckResult
-	fun createTempFile(context: Context): File {
-		val dir = getAppBackupDir(context)
-		dir.mkdirs()
-		return File(dir, generateFileName(context))
-	}
-
-	fun getAppBackupDir(context: Context) = context.run {
-		getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
-	}
-
-	fun parseBackupDateTime(fileName: String): Date? = try {
-		dateTimeFormat.parse(fileName.substringAfterLast('_').substringBefore('.'))
-	} catch (e: ParseException) {
-		e.printStackTraceDebug()
-		null
-	}
-
-	fun generateFileName(context: Context) = buildString {
-		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
-		append('_')
-		append(dateTimeFormat.format(Date()))
-		append(".bk.zip")
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/domain/ExternalBackupStorage.kt

@@ -1,96 +0,0 @@
-package org.koitharu.kotatsu.backups.domain
-
-import android.content.Context
-import android.net.Uri
-import androidx.annotation.CheckResult
-import androidx.documentfile.provider.DocumentFile
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import okio.buffer
-import okio.sink
-import okio.source
-import org.jetbrains.annotations.Blocking
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.io.File
-import javax.inject.Inject
-
-class ExternalBackupStorage @Inject constructor(
-	@ApplicationContext private val context: Context,
-	private val settings: AppSettings,
-) {
-
-	suspend fun list(): List<BackupFile> = runInterruptible(Dispatchers.IO) {
-		getRootOrThrow().listFiles().mapNotNull {
-			if (it.isFile && it.canRead()) {
-				BackupFile(
-					uri = it.uri,
-					dateTime = it.name?.let { fileName ->
-						BackupUtils.parseBackupDateTime(fileName)
-					} ?: return@mapNotNull null,
-				)
-			} else {
-				null
-			}
-		}.sortedDescending()
-	}
-
-	suspend fun listOrNull() = runCatchingCancellable {
-		list()
-	}.onFailure { e ->
-		e.printStackTraceDebug()
-	}.getOrNull()
-
-	suspend fun put(file: File): Uri = runInterruptible(Dispatchers.IO) {
-		val out = checkNotNull(
-			getRootOrThrow().createFile(
-				"application/zip",
-				file.nameWithoutExtension,
-			),
-		) {
-			"Cannot create target backup file"
-		}
-		checkNotNull(context.contentResolver.openOutputStream(out.uri, "wt")).sink().use { sink ->
-			file.source().buffer().use { src ->
-				src.readAll(sink)
-			}
-		}
-		out.uri
-	}
-
-	@CheckResult
-	suspend fun delete(victim: BackupFile) = runInterruptible(Dispatchers.IO) {
-		val df = DocumentFile.fromSingleUri(context, victim.uri)
-		df != null && df.delete()
-	}
-
-	suspend fun getLastBackupDate() = listOrNull()?.maxOfOrNull { it.dateTime }
-
-	suspend fun trim(maxCount: Int): Boolean {
-		if (maxCount == Int.MAX_VALUE) {
-			return false
-		}
-		val list = listOrNull()
-		if (list == null || list.size <= maxCount) {
-			return false
-		}
-		var result = false
-		for (i in maxCount until list.size) {
-			if (delete(list[i])) {
-				result = true
-			}
-		}
-		return result
-	}
-
-	@Blocking
-	private fun getRootOrThrow(): DocumentFile {
-		val uri = checkNotNull(settings.periodicalBackupDirectory) {
-			"Backup directory is not specified"
-		}
-		val root = DocumentFile.fromTreeUri(context, uri)
-		return checkNotNull(root) { "Cannot obtain DocumentFile from $uri" }
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/BaseBackupRestoreService.kt

@@ -1,136 +0,0 @@
-package org.koitharu.kotatsu.backups.ui
-
-import android.content.Context
-import android.net.Uri
-import androidx.core.app.NotificationChannelCompat
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
-import androidx.core.app.ShareCompat
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ErrorReporterReceiver
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.ui.CoroutineIntentService
-import org.koitharu.kotatsu.core.util.CompositeResult
-import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-import org.koitharu.kotatsu.core.util.ext.getFileDisplayName
-import androidx.appcompat.R as appcompatR
-
-abstract class BaseBackupRestoreService : CoroutineIntentService() {
-
-	protected abstract val notificationTag: String
-	protected abstract val isRestoreService: Boolean
-
-	protected lateinit var notificationManager: NotificationManagerCompat
-		private set
-
-	override fun onCreate() {
-		super.onCreate()
-		notificationManager = NotificationManagerCompat.from(applicationContext)
-		createNotificationChannel(this)
-	}
-
-	override fun IntentJobContext.onError(error: Throwable) {
-		showResultNotification(null, CompositeResult.failure(error))
-	}
-
-	protected fun IntentJobContext.showResultNotification(
-		fileUri: Uri?,
-		result: CompositeResult,
-	) {
-		if (!applicationContext.checkNotificationPermission(CHANNEL_ID)) {
-			return
-		}
-		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
-			.setPriority(NotificationCompat.PRIORITY_HIGH)
-			.setDefaults(0)
-			.setSilent(true)
-			.setAutoCancel(true)
-			.setSubText(fileUri?.let { contentResolver.getFileDisplayName(it) })
-		when {
-			result.isAllSuccess -> {
-				if (isRestoreService) {
-					notification
-						.setContentTitle(getString(R.string.restoring_backup))
-						.setContentText(getString(R.string.data_restored_success))
-				} else {
-					notification
-						.setContentTitle(getString(R.string.backup_saved))
-						.setContentText(fileUri?.let { contentResolver.getFileDisplayName(it) })
-						.setSubText(null)
-
-				}
-				notification.setSmallIcon(R.drawable.ic_stat_done)
-			}
-
-			result.isAllFailed || !isRestoreService -> {
-				val title = getString(if (isRestoreService) R.string.data_not_restored else R.string.error_occurred)
-				val message = result.failures.joinToString("\n") {
-					it.getDisplayMessage(applicationContext.resources)
-				}
-				notification
-					.setContentText(if (isRestoreService) getString(R.string.data_not_restored_text) else message)
-					.setBigText(title, message)
-					.setSmallIcon(android.R.drawable.stat_notify_error)
-				result.failures.firstNotNullOfOrNull { error ->
-					ErrorReporterReceiver.getNotificationAction(applicationContext, error, startId, notificationTag)
-				}?.let { action ->
-					notification.addAction(action)
-				}
-			}
-
-			else -> {
-				notification
-					.setContentTitle(getString(R.string.restoring_backup))
-					.setContentText(getString(R.string.data_restored_with_errors))
-					.setSmallIcon(R.drawable.ic_stat_done)
-			}
-		}
-		notification.setContentIntent(
-			PendingIntentCompat.getActivity(
-				applicationContext,
-				0,
-				AppRouter.homeIntent(this@BaseBackupRestoreService),
-				0,
-				false,
-			),
-		)
-		if (!isRestoreService && fileUri != null) {
-			val shareIntent = ShareCompat.IntentBuilder(this@BaseBackupRestoreService)
-				.setStream(fileUri)
-				.setType("application/zip")
-				.setChooserTitle(R.string.share_backup)
-				.createChooserIntent()
-			notification.addAction(
-				appcompatR.drawable.abc_ic_menu_share_mtrl_alpha,
-				getString(R.string.share),
-				PendingIntentCompat.getActivity(this@BaseBackupRestoreService, 0, shareIntent, 0, false),
-			)
-		}
-		notificationManager.notify(notificationTag, startId, notification.build())
-	}
-
-	protected fun NotificationCompat.Builder.setBigText(title: String, text: CharSequence) = setStyle(
-		NotificationCompat.BigTextStyle()
-			.bigText(text)
-			.setSummaryText(text)
-			.setBigContentTitle(title),
-	)
-
-	companion object {
-
-		const val CHANNEL_ID = "backup_restore"
-
-		fun createNotificationChannel(context: Context) {
-			val channel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_HIGH)
-				.setName(context.getString(R.string.backup_restore))
-				.setShowBadge(true)
-				.setVibrationEnabled(false)
-				.setSound(null, null)
-				.setLightsEnabled(false)
-				.build()
-			NotificationManagerCompat.from(context).createNotificationChannel(channel)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/backup/BackupService.kt

@@ -1,131 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.backup
-
-import android.annotation.SuppressLint
-import android.app.Notification
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.net.Uri
-import android.widget.Toast
-import androidx.annotation.CheckResult
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import androidx.documentfile.provider.DocumentFile
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.backups.ui.BaseBackupRestoreService
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.util.CompositeResult
-import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.core.util.ext.powerManager
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
-import org.koitharu.kotatsu.core.util.progress.Progress
-import java.io.FileNotFoundException
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
-import androidx.appcompat.R as appcompatR
-
-@AndroidEntryPoint
-@SuppressLint("InlinedApi")
-class BackupService : BaseBackupRestoreService() {
-
-	override val notificationTag = TAG
-	override val isRestoreService = false
-
-	@Inject
-	lateinit var repository: BackupRepository
-
-	override suspend fun IntentJobContext.processIntent(intent: Intent) {
-		val notification = buildNotification(Progress.INDETERMINATE)
-		setForeground(
-			FOREGROUND_NOTIFICATION_ID,
-			notification,
-			ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
-		)
-		val destination = intent.getStringExtra(AppRouter.KEY_DATA)?.toUriOrNull() ?: throw FileNotFoundException()
-		powerManager.withPartialWakeLock(TAG) {
-			val progress = MutableStateFlow(Progress.INDETERMINATE)
-			val progressUpdateJob = if (checkNotificationPermission(CHANNEL_ID)) {
-				launch {
-					progress.collect {
-						notificationManager.notify(FOREGROUND_NOTIFICATION_ID, buildNotification(it))
-					}
-				}
-			} else {
-				null
-			}
-			try {
-				ZipOutputStream(contentResolver.openOutputStream(destination)).use { output ->
-					repository.createBackup(output, progress)
-				}
-			} catch (e: Throwable) {
-				try {
-					DocumentFile.fromSingleUri(applicationContext, destination)?.delete()
-				} catch (e2: Throwable) {
-					e.addSuppressed(e2)
-				}
-				throw e
-			}
-			progressUpdateJob?.cancelAndJoin()
-			contentResolver.notifyChange(destination, null)
-			showResultNotification(destination, CompositeResult.success())
-			withContext(Dispatchers.Main) {
-				Toast.makeText(this@BackupService, R.string.backup_saved, Toast.LENGTH_SHORT).show()
-			}
-		}
-	}
-
-	private fun IntentJobContext.buildNotification(progress: Progress): Notification {
-		return NotificationCompat.Builder(applicationContext, CHANNEL_ID)
-			.setContentTitle(getString(R.string.creating_backup))
-			.setPriority(NotificationCompat.PRIORITY_HIGH)
-			.setDefaults(0)
-			.setSilent(true)
-			.setOngoing(true)
-			.setProgress(
-				progress.total.coerceAtLeast(0),
-				progress.progress.coerceAtLeast(0),
-				progress.isIndeterminate,
-			)
-			.setContentText(
-				if (progress.isIndeterminate) {
-					getString(R.string.processing_)
-				} else {
-					getString(R.string.fraction_pattern, progress.progress, progress.total)
-				},
-			)
-			.setSmallIcon(android.R.drawable.stat_sys_upload)
-			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-			.addAction(
-				appcompatR.drawable.abc_ic_clear_material,
-				applicationContext.getString(android.R.string.cancel),
-				getCancelIntent(),
-			).build()
-	}
-
-	companion object {
-
-		private const val TAG = "BACKUP"
-		private const val FOREGROUND_NOTIFICATION_ID = 33
-
-		@CheckResult
-		fun start(context: Context, uri: Uri): Boolean = try {
-			val intent = Intent(context, BackupService::class.java)
-			intent.putExtra(AppRouter.KEY_DATA, uri.toString())
-			ContextCompat.startForegroundService(context, intent)
-			true
-		} catch (e: Exception) {
-			e.printStackTraceDebug()
-			false
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/backup/BackupViewModel.kt

@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.backup
-
-import android.content.ContentResolver
-import android.content.Context
-import android.net.Uri
-import androidx.lifecycle.SavedStateHandle
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.require
-import org.koitharu.kotatsu.core.util.progress.Progress
-import java.util.zip.Deflater
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
-
-@HiltViewModel
-class BackupViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
-	private val repository: BackupRepository,
-	@ApplicationContext context: Context,
-) : BaseViewModel() {
-
-	val progress = MutableStateFlow(Progress.INDETERMINATE)
-	val onBackupDone = MutableEventFlow<Uri>()
-
-	private val destination = savedStateHandle.require<Uri>(AppRouter.KEY_DATA)
-	private val contentResolver: ContentResolver = context.contentResolver
-
-	init {
-		launchLoadingJob(Dispatchers.Default) {
-			ZipOutputStream(checkNotNull(contentResolver.openOutputStream(destination))).use {
-				it.setLevel(Deflater.BEST_COMPRESSION)
-				repository.createBackup(it, progress)
-			}
-			onBackupDone.call(destination)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/periodical/PeriodicalBackupService.kt

@@ -1,105 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.periodical
-
-import android.content.Intent
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.PendingIntentCompat
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.backups.domain.BackupUtils
-import org.koitharu.kotatsu.backups.domain.ExternalBackupStorage
-import org.koitharu.kotatsu.backups.ui.BaseBackupRestoreService
-import org.koitharu.kotatsu.core.ErrorReporterReceiver
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.CoroutineIntentService
-import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-import java.util.zip.ZipOutputStream
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class PeriodicalBackupService : CoroutineIntentService() {
-
-	@Inject
-	lateinit var externalBackupStorage: ExternalBackupStorage
-
-	@Inject
-	lateinit var telegramBackupUploader: TelegramBackupUploader
-
-	@Inject
-	lateinit var repository: BackupRepository
-
-	@Inject
-	lateinit var settings: AppSettings
-
-	override suspend fun IntentJobContext.processIntent(intent: Intent) {
-		if (!settings.isPeriodicalBackupEnabled || settings.periodicalBackupDirectory == null) {
-			return
-		}
-		val lastBackupDate = externalBackupStorage.getLastBackupDate()
-		if (lastBackupDate != null && lastBackupDate.time + settings.periodicalBackupFrequencyMillis > System.currentTimeMillis()) {
-			return
-		}
-		val output = BackupUtils.createTempFile(applicationContext)
-		try {
-			ZipOutputStream(output.outputStream()).use {
-				repository.createBackup(it, null)
-			}
-			externalBackupStorage.put(output)
-			externalBackupStorage.trim(settings.periodicalBackupMaxCount)
-			if (settings.isBackupTelegramUploadEnabled && telegramBackupUploader.isAvailable) {
-				telegramBackupUploader.uploadBackup(output)
-			}
-		} finally {
-			output.delete()
-		}
-	}
-
-	override fun IntentJobContext.onError(error: Throwable) {
-		if (!applicationContext.checkNotificationPermission(CHANNEL_ID)) {
-			return
-		}
-		BaseBackupRestoreService.createNotificationChannel(applicationContext)
-		val notification = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
-			.setPriority(NotificationCompat.PRIORITY_HIGH)
-			.setDefaults(0)
-			.setSilent(true)
-			.setAutoCancel(true)
-		val title = getString(R.string.periodic_backups)
-		val message = getString(
-			R.string.inline_preference_pattern,
-			getString(R.string.packup_creation_failed),
-			error.getDisplayMessage(resources),
-		)
-		notification
-			.setContentText(message)
-			.setSmallIcon(android.R.drawable.stat_notify_error)
-			.setStyle(
-				NotificationCompat.BigTextStyle()
-					.bigText(message)
-					.setSummaryText(getString(R.string.packup_creation_failed))
-					.setBigContentTitle(title),
-			)
-		ErrorReporterReceiver.getNotificationAction(applicationContext, error, startId, TAG)?.let { action ->
-			notification.addAction(action)
-		}
-		notification.setContentIntent(
-			PendingIntentCompat.getActivity(
-				applicationContext,
-				0,
-				AppRouter.periodicBackupSettingsIntent(applicationContext),
-				0,
-				false,
-			),
-		)
-		NotificationManagerCompat.from(applicationContext).notify(TAG, startId, notification.build())
-	}
-
-	private companion object {
-
-		const val CHANNEL_ID = BaseBackupRestoreService.CHANNEL_ID
-		const val TAG = "periodical_backup"
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/periodical/PeriodicalBackupSettingsFragment.kt

@@ -1,107 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.periodical
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.text.format.DateUtils
-import android.view.View
-import androidx.activity.result.ActivityResultCallback
-import androidx.fragment.app.viewModels
-import androidx.preference.EditTextPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
-import org.koitharu.kotatsu.core.nav.router
-import org.koitharu.kotatsu.core.os.OpenDocumentTreeHelper
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.tryLaunch
-import org.koitharu.kotatsu.settings.utils.EditTextFallbackSummaryProvider
-import java.util.Date
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class PeriodicalBackupSettingsFragment : BasePreferenceFragment(R.string.periodic_backups),
-	ActivityResultCallback<Uri?> {
-
-	@Inject
-	lateinit var telegramBackupUploader: TelegramBackupUploader
-
-	private val viewModel by viewModels<PeriodicalBackupSettingsViewModel>()
-
-	private val outputSelectCall = OpenDocumentTreeHelper(this, this)
-
-	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-		addPreferencesFromResource(R.xml.pref_backup_periodic)
-		findPreference<PreferenceCategory>(AppSettings.KEY_BACKUP_TG)?.isVisible = viewModel.isTelegramAvailable
-		findPreference<EditTextPreference>(AppSettings.KEY_BACKUP_TG_CHAT)?.summaryProvider =
-			EditTextFallbackSummaryProvider(R.string.telegram_chat_id_summary)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		viewModel.lastBackupDate.observe(viewLifecycleOwner, ::bindLastBackupInfo)
-		viewModel.backupsDirectory.observe(viewLifecycleOwner, ::bindOutputSummary)
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(listView, this))
-		viewModel.isTelegramCheckLoading.observe(viewLifecycleOwner) {
-			findPreference<Preference>(AppSettings.KEY_BACKUP_TG_TEST)?.isEnabled = !it
-		}
-	}
-
-	override fun onPreferenceTreeClick(preference: Preference): Boolean {
-		val result = when (preference.key) {
-			AppSettings.KEY_BACKUP_PERIODICAL_OUTPUT -> outputSelectCall.tryLaunch(null)
-			AppSettings.KEY_BACKUP_TG_OPEN -> telegramBackupUploader.openBotInApp(router)
-			AppSettings.KEY_BACKUP_TG_TEST -> {
-				viewModel.checkTelegram()
-				true
-			}
-
-			else -> return super.onPreferenceTreeClick(preference)
-		}
-		if (!result) {
-			Snackbar.make(listView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
-		}
-		return true
-	}
-
-	override fun onActivityResult(result: Uri?) {
-		if (result != null) {
-			val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-			context?.contentResolver?.takePersistableUriPermission(result, takeFlags)
-			settings.periodicalBackupDirectory = result
-			viewModel.updateSummaryData()
-		}
-	}
-
-	private fun bindOutputSummary(path: String?) {
-		val preference = findPreference<Preference>(AppSettings.KEY_BACKUP_PERIODICAL_OUTPUT) ?: return
-		preference.summary = when (path) {
-			null -> getString(R.string.invalid_value_message)
-			"" -> null
-			else -> path
-		}
-		preference.icon = if (path == null) {
-			getWarningIcon()
-		} else {
-			null
-		}
-	}
-
-	private fun bindLastBackupInfo(lastBackupDate: Date?) {
-		val preference = findPreference<Preference>(AppSettings.KEY_BACKUP_PERIODICAL_LAST) ?: return
-		preference.summary = lastBackupDate?.let {
-			preference.context.getString(
-				R.string.last_successful_backup,
-				DateUtils.getRelativeTimeSpanString(it.time),
-			)
-		}
-		preference.isVisible = lastBackupDate != null
-	}
-}
-

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/periodical/PeriodicalBackupSettingsViewModel.kt

@@ -1,79 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.periodical
-
-import android.content.Context
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.backups.domain.BackupUtils
-import org.koitharu.kotatsu.backups.domain.ExternalBackupStorage
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
-import org.koitharu.kotatsu.core.util.ext.call
-import org.koitharu.kotatsu.core.util.ext.resolveFile
-import java.util.Date
-import javax.inject.Inject
-
-@HiltViewModel
-class PeriodicalBackupSettingsViewModel @Inject constructor(
-	private val settings: AppSettings,
-	private val telegramUploader: TelegramBackupUploader,
-	private val backupStorage: ExternalBackupStorage,
-	@ApplicationContext private val appContext: Context,
-) : BaseViewModel() {
-
-	val isTelegramAvailable
-		get() = telegramUploader.isAvailable
-
-	val lastBackupDate = MutableStateFlow<Date?>(null)
-	val backupsDirectory = MutableStateFlow<String?>("")
-	val isTelegramCheckLoading = MutableStateFlow(false)
-	val onActionDone = MutableEventFlow<ReversibleAction>()
-
-	init {
-		updateSummaryData()
-	}
-
-	fun checkTelegram() {
-		launchJob(Dispatchers.Default) {
-			try {
-				isTelegramCheckLoading.value = true
-				telegramUploader.sendTestMessage()
-				onActionDone.call(ReversibleAction(R.string.connection_ok, null))
-			} finally {
-				isTelegramCheckLoading.value = false
-			}
-		}
-	}
-
-	fun updateSummaryData() {
-		updateBackupsDirectory()
-		updateLastBackupDate()
-	}
-
-	private fun updateBackupsDirectory() = launchJob(Dispatchers.Default) {
-		val dir = settings.periodicalBackupDirectory
-		backupsDirectory.value = if (dir != null) {
-			dir.toUserFriendlyString()
-		} else {
-			BackupUtils.getAppBackupDir(appContext).path
-		}
-	}
-
-	private fun updateLastBackupDate() = launchJob(Dispatchers.Default) {
-		lastBackupDate.value = backupStorage.getLastBackupDate()
-	}
-
-	private fun Uri.toUserFriendlyString(): String? {
-		val df = DocumentFile.fromTreeUri(appContext, this)
-		if (df?.canWrite() != true) {
-			return null
-		}
-		return resolveFile(appContext)?.path ?: toString()
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/periodical/TelegramBackupUploader.kt

@@ -1,96 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.periodical
-
-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)
-
-	val isAvailable: Boolean
-		get() = botToken.isNotEmpty()
-
-	suspend fun uploadBackup(file: File) {
-		val requestBody = file.asRequestBody("application/zip".toMediaTypeOrNull())
-		val multipartBody = MultipartBody.Builder()
-			.setType(MultipartBody.Companion.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)
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/restore/BackupEntriesAdapter.kt

@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.restore
-
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.setChecked
-import org.koitharu.kotatsu.databinding.ItemCheckableMultipleBinding
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback.Companion.PAYLOAD_CHECKED_CHANGED
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
-
-class BackupSectionsAdapter(
-	clickListener: OnListItemClickListener<BackupSectionModel>,
-) : BaseListAdapter<BackupSectionModel>() {
-
-	init {
-		addDelegate(ListItemType.NAV_ITEM, backupSectionAD(clickListener))
-	}
-}
-
-private fun backupSectionAD(
-	clickListener: OnListItemClickListener<BackupSectionModel>,
-) = adapterDelegateViewBinding<BackupSectionModel, BackupSectionModel, ItemCheckableMultipleBinding>(
-	{ layoutInflater, parent -> ItemCheckableMultipleBinding.inflate(layoutInflater, parent, false) },
-) {
-
-	binding.root.setOnClickListener { v ->
-		clickListener.onItemClick(item, v)
-	}
-
-	bind { payloads ->
-		with(binding.root) {
-			setText(item.titleResId)
-			setChecked(item.isChecked, PAYLOAD_CHECKED_CHANGED in payloads)
-			isEnabled = item.isEnabled
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/restore/BackupSectionModel.kt

@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.restore
-
-import androidx.annotation.StringRes
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.backups.domain.BackupSection
-import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-data class BackupSectionModel(
-	val section: BackupSection,
-	val isChecked: Boolean,
-	val isEnabled: Boolean,
-) : ListModel {
-
-	@get:StringRes
-	val titleResId: Int
-		get() = when (section) {
-			BackupSection.INDEX -> 0 // should not appear here
-			BackupSection.HISTORY -> R.string.history
-			BackupSection.CATEGORIES -> R.string.favourites_categories
-			BackupSection.FAVOURITES -> R.string.favourites
-			BackupSection.SETTINGS -> R.string.settings
-			BackupSection.SETTINGS_READER_GRID -> R.string.reader_actions
-			BackupSection.BOOKMARKS -> R.string.bookmarks
-			BackupSection.SOURCES -> R.string.remote_sources
-		}
-
-	override fun areItemsTheSame(other: ListModel): Boolean {
-		return other is BackupSectionModel && other.section == section
-	}
-
-	override fun getChangePayload(previousState: ListModel): Any? {
-		if (previousState !is BackupSectionModel) {
-			return null
-		}
-		return if (previousState.isEnabled != isEnabled) {
-			ListModelDiffCallback.PAYLOAD_ANYTHING_CHANGED
-		} else if (previousState.isChecked != isChecked) {
-			ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED
-		} else {
-			super.getChangePayload(previousState)
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/restore/RestoreDialogFragment.kt

@@ -1,118 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.restore
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.fragment.app.viewModels
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.nav.router
-import org.koitharu.kotatsu.core.ui.AlertDialogFragment
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
-import org.koitharu.kotatsu.core.util.ext.observe
-import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.textAndVisible
-import org.koitharu.kotatsu.databinding.DialogRestoreBinding
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.Date
-
-@AndroidEntryPoint
-class RestoreDialogFragment : AlertDialogFragment<DialogRestoreBinding>(), OnListItemClickListener<BackupSectionModel>,
-	View.OnClickListener {
-
-	private val viewModel: RestoreViewModel by viewModels()
-
-	override fun onCreateViewBinding(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-	) = DialogRestoreBinding.inflate(inflater, container, false)
-
-	override fun onViewBindingCreated(binding: DialogRestoreBinding, savedInstanceState: Bundle?) {
-		super.onViewBindingCreated(binding, savedInstanceState)
-		val adapter = BackupSectionsAdapter(this)
-		binding.recyclerView.adapter = adapter
-		binding.buttonCancel.setOnClickListener(this)
-		binding.buttonRestore.setOnClickListener(this)
-		viewModel.availableEntries.observe(viewLifecycleOwner, adapter)
-		viewModel.onError.observeEvent(viewLifecycleOwner, this::onError)
-		combine(
-			viewModel.isLoading,
-			viewModel.availableEntries,
-			viewModel.backupDate,
-			::Triple,
-		).observe(viewLifecycleOwner, this::onLoadingChanged)
-	}
-
-	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
-		return super.onBuildDialog(builder)
-			.setTitle(R.string.restore_backup)
-			.setCancelable(false)
-	}
-
-	override fun onClick(v: View) {
-		when (v.id) {
-			R.id.button_cancel -> dismiss()
-			R.id.button_restore -> {
-				if (startRestoreService()) {
-					Toast.makeText(v.context, R.string.backup_restored_background, Toast.LENGTH_SHORT).show()
-					router.closeWelcomeSheet()
-					dismiss()
-				} else {
-					Toast.makeText(v.context, R.string.operation_not_supported, Toast.LENGTH_SHORT).show()
-				}
-			}
-		}
-	}
-
-	override fun onItemClick(item: BackupSectionModel, view: View) {
-		viewModel.onItemClick(item)
-	}
-
-	private fun onLoadingChanged(value: Triple<Boolean, List<BackupSectionModel>, Date?>) {
-		val (isLoading, entries, backupDate) = value
-		val hasEntries = entries.isNotEmpty()
-		with(requireViewBinding()) {
-			progressBar.isVisible = isLoading
-			recyclerView.isGone = isLoading
-			textViewSubtitle.textAndVisible =
-				when {
-					!isLoading -> backupDate?.formatBackupDate()
-					hasEntries -> getString(R.string.processing_)
-					else -> getString(R.string.loading_)
-				}
-			buttonRestore.isEnabled = !isLoading && entries.any { it.isChecked }
-		}
-	}
-
-	private fun startRestoreService(): Boolean {
-		return RestoreService.start(
-			context ?: return false,
-			viewModel.uri ?: return false,
-			viewModel.getCheckedSections(),
-		)
-	}
-
-	private fun Date.formatBackupDate(): String {
-		return getString(
-			R.string.backup_date_,
-			SimpleDateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT).format(this),
-		)
-	}
-
-	private fun onError(e: Throwable) {
-		MaterialAlertDialogBuilder(context ?: return)
-			.setNegativeButton(R.string.close, null)
-			.setTitle(R.string.error)
-			.setMessage(e.getDisplayMessage(resources))
-			.show()
-		dismiss()
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/restore/RestoreService.kt

@@ -1,118 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.restore
-
-import android.annotation.SuppressLint
-import android.app.Notification
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ServiceInfo
-import android.net.Uri
-import androidx.annotation.CheckResult
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.backups.data.BackupRepository
-import org.koitharu.kotatsu.backups.domain.BackupSection
-import org.koitharu.kotatsu.backups.ui.BaseBackupRestoreService
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
-import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
-import org.koitharu.kotatsu.core.util.ext.powerManager
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import org.koitharu.kotatsu.core.util.ext.withPartialWakeLock
-import org.koitharu.kotatsu.core.util.progress.Progress
-import java.io.FileNotFoundException
-import java.util.zip.ZipInputStream
-import javax.inject.Inject
-import androidx.appcompat.R as appcompatR
-
-@AndroidEntryPoint
-@SuppressLint("InlinedApi")
-class RestoreService : BaseBackupRestoreService() {
-
-	override val notificationTag = TAG
-	override val isRestoreService = true
-
-	@Inject
-	lateinit var repository: BackupRepository
-
-	override suspend fun IntentJobContext.processIntent(intent: Intent) {
-		val notification = buildNotification(Progress.INDETERMINATE)
-		setForeground(
-			FOREGROUND_NOTIFICATION_ID,
-			notification,
-			ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC,
-		)
-		val source = intent.getStringExtra(AppRouter.KEY_DATA)?.toUriOrNull() ?: throw FileNotFoundException()
-		val sections =
-			requireNotNull(intent.getSerializableExtraCompat<Array<BackupSection>>(AppRouter.KEY_ENTRIES)?.toSet())
-		powerManager.withPartialWakeLock(TAG) {
-			val progress = MutableStateFlow(Progress.INDETERMINATE)
-			val progressUpdateJob = if (checkNotificationPermission(CHANNEL_ID)) {
-				launch {
-					progress.collect {
-						notificationManager.notify(FOREGROUND_NOTIFICATION_ID, buildNotification(it))
-					}
-				}
-			} else {
-				null
-			}
-			val result = ZipInputStream(contentResolver.openInputStream(source)).use { input ->
-				repository.restoreBackup(input, sections, progress)
-			}
-			progressUpdateJob?.cancelAndJoin()
-			showResultNotification(source, result)
-		}
-	}
-
-	private fun IntentJobContext.buildNotification(progress: Progress): Notification {
-		return NotificationCompat.Builder(applicationContext, CHANNEL_ID)
-			.setContentTitle(getString(R.string.restoring_backup))
-			.setPriority(NotificationCompat.PRIORITY_HIGH)
-			.setDefaults(0)
-			.setSilent(true)
-			.setOngoing(true)
-			.setProgress(
-				progress.total.coerceAtLeast(0),
-				progress.progress.coerceAtLeast(0),
-				progress.isIndeterminate,
-			)
-			.setContentText(
-				if (progress.isIndeterminate) {
-					getString(R.string.processing_)
-				} else {
-					getString(R.string.fraction_pattern, progress.progress, progress.total)
-				},
-			)
-			.setSmallIcon(android.R.drawable.stat_sys_upload)
-			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
-			.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-			.addAction(
-				appcompatR.drawable.abc_ic_clear_material,
-				applicationContext.getString(android.R.string.cancel),
-				getCancelIntent(),
-			).build()
-	}
-
-	companion object {
-
-		private const val TAG = "RESTORE"
-		private const val FOREGROUND_NOTIFICATION_ID = 39
-
-		@CheckResult
-		fun start(context: Context, uri: Uri, sections: Set<BackupSection>): Boolean = try {
-			val intent = Intent(context, RestoreService::class.java)
-			intent.putExtra(AppRouter.KEY_DATA, uri.toString())
-			intent.putExtra(AppRouter.KEY_ENTRIES, sections.toTypedArray())
-			ContextCompat.startForegroundService(context, intent)
-			true
-		} catch (e: Exception) {
-			e.printStackTraceDebug()
-			false
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/backups/ui/restore/RestoreViewModel.kt

@@ -1,112 +0,0 @@
-package org.koitharu.kotatsu.backups.ui.restore
-
-import android.content.Context
-import androidx.lifecycle.SavedStateHandle
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.runInterruptible
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.decodeFromStream
-import org.koitharu.kotatsu.backups.data.model.BackupIndex
-import org.koitharu.kotatsu.backups.domain.BackupSection
-import org.koitharu.kotatsu.core.nav.AppRouter
-import org.koitharu.kotatsu.core.ui.BaseViewModel
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.core.util.ext.toUriOrNull
-import java.io.FileNotFoundException
-import java.io.InputStream
-import java.util.Date
-import java.util.EnumMap
-import java.util.EnumSet
-import java.util.zip.ZipInputStream
-import javax.inject.Inject
-
-@HiltViewModel
-class RestoreViewModel @Inject constructor(
-	savedStateHandle: SavedStateHandle,
-	@ApplicationContext context: Context,
-) : BaseViewModel() {
-
-	val uri = savedStateHandle.get<String>(AppRouter.KEY_FILE)?.toUriOrNull()
-	private val contentResolver = context.contentResolver
-
-	val availableEntries = MutableStateFlow<List<BackupSectionModel>>(emptyList())
-	val backupDate = MutableStateFlow<Date?>(null)
-
-	init {
-		launchLoadingJob(Dispatchers.Default) {
-			loadBackupInfo()
-		}
-	}
-
-	private suspend fun loadBackupInfo() {
-		val sections = runInterruptible(Dispatchers.IO) {
-			if (uri == null) throw FileNotFoundException()
-			ZipInputStream(contentResolver.openInputStream(uri)).use { stream ->
-				val result = EnumSet.noneOf(BackupSection::class.java)
-				var entry = stream.nextEntry
-				while (entry != null) {
-					val s = BackupSection.of(entry)
-					if (s != null) {
-						result.add(s)
-						if (s == BackupSection.INDEX) {
-							backupDate.value = stream.readDate()
-						}
-					}
-					stream.closeEntry()
-					entry = stream.nextEntry
-				}
-				result
-			}
-		}
-		availableEntries.value = BackupSection.entries.mapNotNull { entry ->
-			if (entry == BackupSection.INDEX || entry !in sections) {
-				return@mapNotNull null
-			}
-			BackupSectionModel(
-				section = entry,
-				isChecked = true,
-				isEnabled = true,
-			)
-		}
-	}
-
-	fun onItemClick(item: BackupSectionModel) {
-		val map = availableEntries.value.associateByTo(EnumMap(BackupSection::class.java)) { it.section }
-		map[item.section] = item.copy(isChecked = !item.isChecked)
-		map.validate()
-		availableEntries.value = map.values.sortedBy { it.section.ordinal }
-	}
-
-	fun getCheckedSections(): Set<BackupSection> = availableEntries.value
-		.mapNotNullTo(EnumSet.noneOf(BackupSection::class.java)) {
-			if (it.isChecked) it.section else null
-		}
-
-	/**
-	 * Check for inconsistent user selection
-	 * Favorites cannot be restored without categories
-	 */
-	private fun MutableMap<BackupSection, BackupSectionModel>.validate() {
-		val favorites = this[BackupSection.FAVOURITES] ?: return
-		val categories = this[BackupSection.CATEGORIES]
-		if (categories?.isChecked == true) {
-			if (!favorites.isEnabled) {
-				this[BackupSection.FAVOURITES] = favorites.copy(isEnabled = true)
-			}
-		} else {
-			if (favorites.isEnabled) {
-				this[BackupSection.FAVOURITES] = favorites.copy(isEnabled = false, isChecked = false)
-			}
-		}
-	}
-
-	private fun InputStream.readDate(): Date? = runCatching {
-		val index = Json.decodeFromStream<List<BackupIndex>>(this)
-		Date(index.single().createdAt)
-	}.onFailure { e ->
-		e.printStackTraceDebug()
-	}.getOrNull()
-}

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

@@ -6,23 +6,23 @@ import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Upsert
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.isActive
 import org.koitharu.kotatsu.core.db.entity.MangaWithTags
 
 @Dao
 abstract class BookmarksDao {
 
+	@Query("SELECT * FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun find(mangaId: Long, pageId: Long): BookmarkEntity?
+
 	@Query("SELECT * FROM bookmarks WHERE page_id = :pageId")
 	abstract suspend fun find(pageId: Long): BookmarkEntity?
 
 	@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?>
@@ -42,6 +42,9 @@ abstract class BookmarksDao {
 	@Delete
 	abstract suspend fun delete(entity: BookmarkEntity)
 
+	@Query("DELETE FROM bookmarks WHERE manga_id = :mangaId AND page_id = :pageId")
+	abstract suspend fun delete(mangaId: Long, pageId: Long): Int
+
 	@Query("DELETE FROM bookmarks WHERE page_id = :pageId")
 	abstract suspend fun delete(pageId: Long): Int
 
@@ -50,17 +53,4 @@ abstract class BookmarksDao {
 
 	@Upsert
 	abstract suspend fun upsert(bookmarks: Collection<BookmarkEntity>)
-
-	fun dump(): Flow<Pair<MangaWithTags, List<BookmarkEntity>>> = flow {
-		val window = 4
-		var offset = 0
-		while (currentCoroutineContext().isActive) {
-			val list = findAll(offset, window)
-			if (list.isEmpty()) {
-				break
-			}
-			offset += window
-			list.forEach { emit(it.key to it.value) }
-		}
-	}
 }

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.time.Instant
+import java.util.Date
 
 fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	manga = manga,
@@ -11,7 +11,7 @@ fun BookmarkEntity.toBookmark(manga: Manga) = Bookmark(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = Instant.ofEpochMilli(createdAt),
+	createdAt = Date(createdAt),
 	percent = percent,
 )
 
@@ -22,7 +22,7 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = createdAt.toEpochMilli(),
+	createdAt = createdAt.time,
 	percent = percent,
 )
 

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

@@ -1,11 +1,10 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
-import org.koitharu.kotatsu.core.util.MimeTypes
-import org.koitharu.kotatsu.core.util.ext.isImage
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.local.data.ImageFileFilter
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import java.time.Instant
+import java.util.Date
 
 data class Bookmark(
 	val manga: Manga,
@@ -14,10 +13,16 @@ data class Bookmark(
 	val page: Int,
 	val scroll: Int,
 	val imageUrl: String,
-	val createdAt: Instant,
+	val createdAt: Date,
 	val percent: Float,
 ) : ListModel {
 
+	val directImageUrl: String?
+		get() = if (isImageUrlDirect()) imageUrl else null
+
+	val imageLoadData: Any
+		get() = if (isImageUrlDirect()) imageUrl else toMangaPage()
+
 	override fun areItemsTheSame(other: ListModel): Boolean {
 		return other is Bookmark &&
 			manga.id == other.manga.id &&
@@ -28,9 +33,12 @@ data class Bookmark(
 	fun toMangaPage() = MangaPage(
 		id = pageId,
 		url = imageUrl,
-		preview = imageUrl.takeIf {
+		preview = null,
-			MimeTypes.getMimeTypeFromUrl(it)?.isImage == true
-		},
 		source = manga.source,
 	)
+
+	private fun isImageUrlDirect(): Boolean {
+		val extension = imageUrl.substringAfterLast('.')
+		return extension.isNotEmpty() && ImageFileFilter().isExtensionValid(extension)
+	}
 }

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

@@ -25,15 +25,15 @@ class BookmarksRepository @Inject constructor(
 ) {
 
 	fun observeBookmark(manga: Manga, chapterId: Long, page: Int): Flow<Bookmark?> {
-		return db.getBookmarksDao().observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+		return db.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
-		return db.getBookmarksDao().observe(manga.id).mapItems { it.toBookmark(manga) }
+		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.getBookmarksDao().observe().map { map ->
+		return db.bookmarksDao.observe().map { map ->
 			val res = LinkedHashMap<Manga, List<Bookmark>>(map.size)
 			for ((k, v) in map) {
 				val manga = k.toManga()
@@ -46,9 +46,9 @@ class BookmarksRepository @Inject constructor(
 	suspend fun addBookmark(bookmark: Bookmark) {
 		db.withTransaction {
 			val tags = bookmark.manga.tags.toEntities()
-			db.getTagsDao().upsert(tags)
+			db.tagsDao.upsert(tags)
-			db.getMangaDao().upsert(bookmark.manga.toEntity(), tags)
+			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
-			db.getBookmarksDao().insert(bookmark.toEntity())
+			db.bookmarksDao.insert(bookmark.toEntity())
 		}
 	}
 
@@ -56,11 +56,11 @@ class BookmarksRepository @Inject constructor(
 		val entity = bookmark.toEntity().copy(
 			imageUrl = imageUrl,
 		)
-		db.getBookmarksDao().upsert(listOf(entity))
+		db.bookmarksDao.upsert(listOf(entity))
 	}
 
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.getBookmarksDao().delete(mangaId, chapterId, page) != 0) {
+		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
 			"Bookmark not found"
 		}
 	}
@@ -72,7 +72,7 @@ class BookmarksRepository @Inject constructor(
 	suspend fun removeBookmarks(ids: Set<Long>): ReversibleHandle {
 		val entities = ArrayList<BookmarkEntity>(ids.size)
 		db.withTransaction {
-			val dao = db.getBookmarksDao()
+			val dao = db.bookmarksDao
 			for (pageId in ids) {
 				val e = dao.find(pageId)
 				if (e != null) {
@@ -92,7 +92,7 @@ class BookmarksRepository @Inject constructor(
 			db.withTransaction {
 				for (e in entities) {
 					try {
-						db.getBookmarksDao().insert(e)
+						db.bookmarksDao.insert(e)
 					} catch (e: SQLException) {
 						e.printStackTraceDebug()
 					}

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

@@ -1,5 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui
-
-import org.koitharu.kotatsu.core.ui.FragmentContainerActivity
-
-class AllBookmarksActivity : FragmentContainerActivity(AllBookmarksFragment::class.java)

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

@@ -1,22 +1,22 @@
-package org.koitharu.kotatsu.core.ui
+package org.koitharu.kotatsu.bookmarks.ui
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
 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.util.ext.consumeSystemBarsInsets
+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
 
 @AndroidEntryPoint
-abstract class FragmentContainerActivity(private val fragmentClass: Class<out Fragment>) :
+class BookmarksActivity :
 	BaseActivity<ActivityContainerBinding>(),
 	AppBarOwner,
 	SnackbarOwner {
@@ -30,25 +30,25 @@ abstract class FragmentContainerActivity(private val fragmentClass: Class<out Fr
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityContainerBinding.inflate(layoutInflater))
-		setDisplayHomeAsUp(isEnabled = true, showUpAsClose = false)
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
-				setReorderingAllowed(true)
+				val fragment = BookmarksFragment.newInstance()
-				replace(R.id.container, fragmentClass, getFragmentExtras())
+				replace(R.id.container, fragment)
 			}
 		}
 	}
 
-	override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+	override fun onWindowInsetsChanged(insets: Insets) {
-		val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+		viewBinding.root.updatePadding(
-		viewBinding.appbar.updatePadding(
+			left = insets.left,
-			left = bars.left,
+			right = insets.right,
-			right = bars.right,
-			top = bars.top,
 		)
-		return insets.consumeSystemBarsInsets(top = true)
 	}
 
-	protected open fun getFragmentExtras(): Bundle? = intent.extras
+	companion object {
+
+		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+	}
 }

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

@@ -3,35 +3,33 @@ package org.koitharu.kotatsu.bookmarks.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 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 coil.ImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.sheet.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.list.ui.GridSpanResolver
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -39,33 +37,27 @@ 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.PageSaveHelper
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AllBookmarksFragment :
+class BookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
-	ListSelectionController.Callback,
+	ListSelectionController.Callback2,
 	FastScroller.FastScrollListener, ListHeaderClickListener {
 
+	@Inject
+	lateinit var coil: ImageLoader
+
 	@Inject
 	lateinit var settings: AppSettings
 
-	@Inject
+	private val viewModel by viewModels<BookmarksViewModel>()
-	lateinit var pageSaveHelperFactory: PageSaveHelper.Factory
-
-	private lateinit var pageSaveHelper: PageSaveHelper
-	private val viewModel by viewModels<AllBookmarksViewModel>()
 	private var bookmarksAdapter: BookmarksAdapter? = null
 	private var selectionController: ListSelectionController? = null
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		pageSaveHelper = pageSaveHelperFactory.create(this)
-	}
-
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -79,19 +71,21 @@ class AllBookmarksFragment :
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		selectionController = ListSelectionController(
-			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
+			activity = requireActivity(),
 			decoration = BookmarksSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
 		)
 		bookmarksAdapter = BookmarksAdapter(
+			lifecycleOwner = viewLifecycleOwner,
+			coil = coil,
 			clickListener = this,
 			headerClickListener = this,
 		)
 		val spanSizeLookup = SpanSizeLookup()
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
-			val spanResolver = GridSpanResolver(resources)
+			val spanResolver = MangaListSpanResolver(resources)
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
@@ -106,23 +100,11 @@ class AllBookmarksFragment :
 		}
 		viewModel.onError.observeEvent(
 			viewLifecycleOwner,
-			SnackbarErrorObserver(binding.recyclerView, this),
+			SnackbarErrorObserver(binding.recyclerView, this)
 		)
 		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
@@ -131,26 +113,22 @@ 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()
+				.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(item.pageId) ?: false
-	}
-
-	override fun onItemContextClick(item: Bookmark, view: View): Boolean {
-		return selectionController?.onItemContextClick(view, item.pageId) == true
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -169,29 +147,23 @@ class AllBookmarksFragment :
 
 	override fun onCreateActionMode(
 		controller: ListSelectionController,
-		menuInflater: MenuInflater,
+		mode: ActionMode,
 		menu: Menu,
 	): Boolean {
-		menuInflater.inflate(R.menu.mode_bookmarks, menu)
+		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
 		return true
 	}
 
 	override fun onActionItemClicked(
 		controller: ListSelectionController,
-		mode: ActionMode?,
+		mode: ActionMode,
 		item: MenuItem,
 	): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
 				viewModel.removeBookmarks(ids)
-				mode?.finish()
+				mode.finish()
-				true
-			}
-
-			R.id.action_save -> {
-				viewModel.savePages(pageSaveHelper, selectionController?.snapshot() ?: return false)
-				mode?.finish()
 				true
 			}
 
@@ -199,6 +171,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 {
@@ -220,4 +202,15 @@ class AllBookmarksFragment :
 			invalidateSpanIndexCache()
 		}
 	}
+
+	companion object {
+
+		@Deprecated(
+			"", ReplaceWith(
+				"BookmarksFragment()",
+				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment"
+			)
+		)
+		fun newInstance() = BookmarksFragment()
+	}
 }

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

@@ -22,11 +22,10 @@ import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.reader.ui.PageSaveHelper
 import javax.inject.Inject
 
 @HiltViewModel
-class AllBookmarksViewModel @Inject constructor(
+class BookmarksViewModel @Inject constructor(
 	private val repository: BookmarksRepository,
 ) : BaseViewModel() {
 
@@ -57,23 +56,6 @@ class AllBookmarksViewModel @Inject constructor(
 		}
 	}
 
-	fun savePages(pageSaveHelper: PageSaveHelper, ids: Set<Long>) {
-		launchLoadingJob(Dispatchers.Default) {
-			val tasks = content.value.mapNotNull {
-				if (it !is Bookmark || it.pageId !in ids) return@mapNotNull null
-				PageSaveHelper.Task(
-					manga = it.manga,
-					chapterId = it.chapterId,
-					pageNumber = it.page + 1,
-					page = it.toMangaPage(),
-				)
-			}
-			val dest = pageSaveHelper.save(tasks)
-			val msg = if (dest.size == 1) R.string.page_saved else R.string.pages_saved
-			onActionDone.call(ReversibleAction(msg, null))
-		}
-	}
-
 	private fun mapList(data: Map<Manga, List<Bookmark>>): List<ListModel> {
 		val result = ArrayList<ListModel>(data.values.sumOf { it.size + 1 })
 		for ((manga, bookmarks) in data) {

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

@@ -1,21 +0,0 @@
-package org.koitharu.kotatsu.bookmarks.ui.adapter
-
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
-import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemBookmarkLargeBinding
-import org.koitharu.kotatsu.list.ui.model.ListModel
-
-fun bookmarkLargeAD(
-	clickListener: OnListItemClickListener<Bookmark>,
-) = adapterDelegateViewBinding<Bookmark, ListModel, ItemBookmarkLargeBinding>(
-	{ inflater, parent -> ItemBookmarkLargeBinding.inflate(inflater, parent, false) },
-) {
-	AdapterDelegateClickListenerAdapter(this, clickListener).attach(itemView)
-
-	bind {
-		binding.imageViewThumb.setImageAsync(item)
-		binding.progressView.setProgress(item.percent, false)
-	}
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-package org.koitharu.kotatsu.browser
-
-import android.content.Intent
-import dagger.hilt.android.AndroidEntryPoint
-import org.koitharu.kotatsu.core.network.webview.adblock.AdBlock
-import org.koitharu.kotatsu.core.ui.CoroutineIntentService
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AdListUpdateService : CoroutineIntentService() {
-
-	@Inject
-	lateinit var updater: AdBlock.Updater
-
-	override suspend fun IntentJobContext.processIntent(intent: Intent) {
-		updater.updateList()
-	}
-
-	override fun IntentJobContext.onError(error: Throwable) = Unit
-}

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

@@ -1,111 +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.network.webview.adblock.AdBlock
-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
-
-	@Inject
-	lateinit var adBlock: AdBlock
-
-	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()
-	}
-}

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

@@ -1,50 +1,70 @@
 package org.koitharu.kotatsu.browser
 
+import android.annotation.SuppressLint
+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.activity.result.contract.ActivityResultContract
+import android.webkit.CookieManager
-import androidx.lifecycle.lifecycleScope
+import androidx.core.graphics.Insets
-import com.google.android.material.snackbar.Snackbar
+import androidx.core.view.isVisible
-import dagger.hilt.android.AndroidEntryPoint
+import androidx.core.view.updatePadding
-import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.InteractiveActionRequiredException
+import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.nav.AppRouter
+import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
-import org.koitharu.kotatsu.core.nav.router
+import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.core.parser.ParserMangaRepository
+import org.koitharu.kotatsu.parsers.network.UserAgents
-import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import com.google.android.material.R as materialR
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
-import org.koitharu.kotatsu.parsers.model.MangaSource
 
-@AndroidEntryPoint
+@SuppressLint("SetJavaScriptEnabled")
-class BrowserActivity : BaseBrowserActivity() {
+class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
-	override fun onCreate2(savedInstanceState: Bundle?, source: MangaSource, repository: ParserMangaRepository?) {
+	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
-		setDisplayHomeAsUp(isEnabled = true, showUpAsClose = true)
+
-		viewBinding.webView.webViewClient = BrowserClient(this, adBlock)
+	override fun onCreate(savedInstanceState: Bundle?) {
-		lifecycleScope.launch {
+		super.onCreate(savedInstanceState)
-			try {
+		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
-				proxyProvider.applyWebViewConfig()
+			return
-			} 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)
-				}
-			}
 		}
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
+		}
+		with(viewBinding.webView.settings) {
+			javaScriptEnabled = true
+			userAgentString = UserAgents.CHROME_MOBILE
+		}
+		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
+		viewBinding.webView.webViewClient = BrowserClient(this)
+		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)
+		}
+	}
+
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		viewBinding.webView.saveState(outState)
+	}
+
+	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+		super.onRestoreInstanceState(savedInstanceState)
+		viewBinding.webView.restoreState(savedInstanceState)
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -61,8 +81,11 @@ class BrowserActivity : BaseBrowserActivity() {
 		}
 
 		R.id.action_browser -> {
-			if (!router.openExternalBrowser(viewBinding.webView.url.orEmpty(), item.title)) {
+			val intent = Intent(Intent.ACTION_VIEW)
-				Snackbar.make(viewBinding.webView, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
+			intent.data = Uri.parse(viewBinding.webView.url)
+			try {
+				startActivity(Intent.createChooser(intent, item.title))
+			} catch (_: ActivityNotFoundException) {
 			}
 			true
 		}
@@ -70,22 +93,54 @@ class BrowserActivity : BaseBrowserActivity() {
 		else -> super.onOptionsItemSelected(item)
 	}
 
-	class Contract : ActivityResultContract<InteractiveActionRequiredException, Unit>() {
+	override fun onPause() {
-		override fun createIntent(
+		viewBinding.webView.onPause()
-			context: Context,
+		super.onPause()
-			input: InteractiveActionRequiredException
+	}
-		): Intent = AppRouter.browserIntent(
-			context = context,
-			url = input.url,
-			source = input.source,
-			title = null,
-		)
 
-		override fun parseResult(resultCode: Int, intent: Intent?): Unit = Unit
+	override fun onResume() {
+		super.onResume()
+		viewBinding.webView.onResume()
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		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 {
 
-		const val TAG = "BrowserActivity"
+		private const val EXTRA_TITLE = "title"
+
+		fun newIntent(context: Context, url: String, title: String?): Intent {
+			return Intent(context, BrowserActivity::class.java)
+				.setData(Uri.parse(url))
+				.putExtra(EXTRA_TITLE, title)
+		}
 	}
 }

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

@@ -1,27 +1,10 @@
 package org.koitharu.kotatsu.browser
 
-import android.annotation.SuppressLint
 import android.graphics.Bitmap
-import android.os.Looper
-import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.annotation.AnyThread
-import androidx.annotation.WorkerThread
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
-import org.koitharu.kotatsu.core.network.webview.adblock.AdBlock
-import java.io.ByteArrayInputStream
 
-open class BrowserClient(
+open class BrowserClient(private val callback: BrowserCallback) : WebViewClient() {
-	private val callback: BrowserCallback,
-	private val adBlock: AdBlock?,
-) : WebViewClient() {
-
-	/**
-	 * https://stackoverflow.com/questions/57414530/illegalstateexception-reasonphrase-cant-be-empty-with-android-webview
-	 */
 
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
@@ -33,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)
 	}
@@ -42,39 +25,4 @@ open class BrowserClient(
 		super.doUpdateVisitedHistory(view, url, isReload)
 		callback.onHistoryChanged()
 	}
-
-	@WorkerThread
-	@Deprecated("Deprecated in Java")
-	override fun shouldInterceptRequest(
-		view: WebView?,
-		url: String?
-	): WebResourceResponse? = if (url.isNullOrEmpty() || adBlock?.shouldLoadUrl(url, view?.getUrlSafe()) ?: true) {
-		super.shouldInterceptRequest(view, url)
-	} else {
-		emptyResponse()
-	}
-
-	@WorkerThread
-	override fun shouldInterceptRequest(
-		view: WebView?,
-		request: WebResourceRequest?
-	): WebResourceResponse? =
-		if (request == null || adBlock?.shouldLoadUrl(request.url.toString(), view?.getUrlSafe()) ?: true) {
-			super.shouldInterceptRequest(view, request)
-		} else {
-			emptyResponse()
-		}
-
-	private fun emptyResponse(): WebResourceResponse =
-		WebResourceResponse("text/plain", "utf-8", ByteArrayInputStream(byteArrayOf()))
-
-	@SuppressLint("WrongThread")
-	@AnyThread
-	private fun WebView.getUrlSafe(): String? = if (Looper.myLooper() == Looper.getMainLooper()) {
-		url
-	} else {
-		runBlocking(Dispatchers.Main.immediate) {
-			url
-		}
-	}
 }