Fix displaying long author name

Currently translated at 100.0% (636 of 636 strings)

Co-authored-by: Koitharu <nvasya95@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings

.github/FUNDING.yml

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

.gitignore

@@ -10,11 +10,13 @@
 /.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
@@ -22,3 +24,4 @@
 /captures
 .externalNativeBuild
 .cxx
+/.idea/deviceManager.xml

.idea/gradle.xml

@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

CONTRIBUTING.md

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

LICENSE

@@ -619,56 +619,3 @@ 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

@@ -19,7 +19,7 @@ Kotatsu is a free and open source manga reader for Android.
 * Tablet-optimized Material You UI
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters with updates feed
-* Integration with manga tracking services: Shikimori, AniList, MyAnimeList
+* Integration with manga tracking services: Shikimori, AniList, MyAnimeList, Kitsu
 * Password/fingerprint protect access to the app
 * History and favourites [synchronization](https://github.com/KotatsuApp/kotatsu-syncserver) across devices
 

app/build.gradle

@@ -16,12 +16,13 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 574
-		versionName = '6.0.1'
+		versionCode = 641
+		versionName = '7.0'
 		generatedDensities = []
-		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
+		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
-			arg("room.schemaLocation", "$projectDir/schemas")
+			arg('room.generateKotlin', 'true')
+			arg('room.schemaLocation', "$projectDir/schemas")
 		}
 		androidResources {
 			generateLocaleConfig true
@@ -32,7 +33,6 @@ android {
 			applicationIdSuffix = '.debug'
 		}
 		release {
-			multiDexEnabled false
 			minifyEnabled true
 			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -47,11 +47,12 @@ android {
 		main.java.srcDirs += 'src/main/kotlin/'
 	}
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_17
-		targetCompatibility JavaVersion.VERSION_17
+		coreLibraryDesugaringEnabled true
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
 	kotlinOptions {
-		jvmTarget = JavaVersion.VERSION_17.toString()
+		jvmTarget = JavaVersion.VERSION_1_8.toString()
 		freeCompilerArgs += [
 			'-opt-in=kotlin.ExperimentalStdlibApi',
 			'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
@@ -81,32 +82,33 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:3a76504380') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:3e32a6280a') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'androidx.core:core-ktx:1.10.1'
-	implementation 'androidx.activity:activity-ktx:1.7.2'
-	implementation 'androidx.fragment:fragment-ktx:1.6.1'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.6.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
+	implementation 'androidx.core:core-ktx:1.13.1'
+	implementation 'androidx.activity:activity-ktx:1.9.0'
+	implementation 'androidx.fragment:fragment-ktx:1.7.0'
+	implementation 'androidx.collection:collection-ktx:1.4.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.1'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
+	implementation 'androidx.recyclerview:recyclerview:1.3.2'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-rc01'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
-	implementation 'com.google.android.material:material:1.9.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.6.1'
+	implementation 'com.google.android.material:material:1.12.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
+	implementation 'androidx.webkit:webkit:1.11.0'
 
-	// TODO https://issuetracker.google.com/issues/254846063
-	implementation 'androidx.work:work-runtime-ktx:2.8.1'
+	implementation 'androidx.work:work-runtime:2.9.0'
 	//noinspection GradleDependency
 	implementation('com.google.guava:guava:32.0.1-android') {
 		exclude group: 'com.google.guava', module: 'failureaccess'
@@ -114,47 +116,53 @@ dependencies {
 		exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
 	}
 
-	implementation 'androidx.room:room-runtime:2.5.2'
-	implementation 'androidx.room:room-ktx:2.5.2'
-	ksp 'androidx.room:room-compiler:2.5.2'
+	implementation 'androidx.room:room-runtime:2.6.1'
+	implementation 'androidx.room:room-ktx:2.6.1'
+	ksp 'androidx.room:room-compiler:2.6.1'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
-	implementation 'com.squareup.okio:okio:3.5.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+	implementation 'com.squareup.okhttp3:okhttp-tls:4.12.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
+	implementation 'com.squareup.okio:okio:3.9.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
-	implementation 'com.google.dagger:hilt-android:2.47'
-	kapt 'com.google.dagger:hilt-compiler:2.47'
-	implementation 'androidx.hilt:hilt-work:1.0.0'
-	kapt 'androidx.hilt:hilt-compiler:1.0.0'
+	implementation 'com.google.dagger:hilt-android:2.51.1'
+	kapt 'com.google.dagger:hilt-compiler:2.51.1'
+	implementation 'androidx.hilt:hilt-work:1.2.0'
+	kapt 'androidx.hilt:hilt-compiler:1.2.0'
 
-	implementation 'io.coil-kt:coil-base:2.4.0'
-	implementation 'io.coil-kt:coil-svg:2.4.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:9b1d20be67'
+	implementation 'io.coil-kt:coil-base:2.6.0'
+	implementation 'io.coil-kt:coil-svg:2.6.0'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.1'
-	implementation 'ch.acra:acra-dialog:5.11.1'
+	implementation 'ch.acra:acra-http:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.3'
+	compileOnly 'com.google.auto.service:auto-service-annotations:1.1.1'
+	ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.1.0'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+	implementation 'org.conscrypt:conscrypt-android:2.5.2'
+
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
+	debugImplementation 'com.github.Koitharu:WorkInspector:5778dd1747'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20230618'
-	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	testImplementation 'org.json:json:20240303'
+	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
 	androidTestImplementation 'androidx.test:rules:1.5.0'
 	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
 	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
 
-	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.2'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+	androidTestImplementation 'androidx.room:room-testing:2.6.1'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
 
-	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.47'
-	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.47'
+	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.51.1'
+	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.51.1'
 }

app/proguard-rules.pro

@@ -18,3 +18,6 @@
 -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.settings.backup.PeriodicalBackupSettingsFragment { *; }
+-keep class org.jsoup.parser.Tag
+-keep class org.jsoup.internal.StringUtil

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

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

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

@@ -7,7 +7,9 @@ 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.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -61,6 +63,7 @@ class AppBackupAgentTest {
 			page = 3,
 			scroll = 40,
 			percent = 0.2f,
+			force = false,
 		)
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))
 
@@ -82,7 +85,7 @@ class AppBackupAgentTest {
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
 		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
 
-		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
+		val allTags = database.getTagsDao().findTags(SampleData.tag.source.name).toMangaTags()
 		assertTrue(SampleData.tag in allTags)
 	}
 

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

@@ -174,12 +174,12 @@ class TrackerTest {
 		assertEquals(3, repository.getNewChaptersCount(mangaFirst.id))
 
 		var chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex - 1) }
-		repository.syncWithHistory(mangaFull, chapter.id)
+		tracker.syncWithHistory(mangaFull, chapter.id)
 
 		assertEquals(1, repository.getNewChaptersCount(mangaFirst.id))
 
 		chapter = requireNotNull(mangaFull.chapters).run { get(lastIndex) }
-		repository.syncWithHistory(mangaFull, chapter.id)
+		tracker.syncWithHistory(mangaFull, chapter.id)
 
 		assertEquals(0, repository.getNewChaptersCount(mangaFirst.id))
 

app/src/debug/AndroidManifest.xml

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

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

@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.reader.domain.PageLoader
 
 class KotatsuApp : BaseApp() {
 
-	override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		enableStrictMode()
 	}
@@ -36,7 +36,7 @@ class KotatsuApp : BaseApp() {
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
 			.penaltyDeath()
 			.detectFragmentReuse()
-			// .detectWrongFragmentContainer() FIXME: migrate to ViewPager2
+			.detectWrongFragmentContainer()
 			.detectRetainInstanceUsage()
 			.detectSetUserVisibleHint()
 			.detectFragmentTagUsage()

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

@@ -10,6 +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()
 		var isCompressed = false
@@ -40,7 +42,7 @@ class CurlLoggingInterceptor(
 		if (isCompressed) {
 			curlCmd.append(" --compressed")
 		}
-		curlCmd.append(" \"").append(request.url).append('"')
+		curlCmd.append(" \"").append(request.url.toString().escape()).append('"')
 
 		log("---cURL (" + request.url + ")")
 		log(curlCmd.toString())
@@ -48,7 +50,12 @@ class CurlLoggingInterceptor(
 		return chain.proceed(request)
 	}
 
-	private fun String.escape() = replace("\"", "\\\"")
+	private fun String.escape() = replace(escapeRegex) { match ->
+		"\\" + match.value
+	}
+		// .replace("\"", "\\\"")
+		// .replace("[", "\\[")
+		// .replace("]", "\\]")
 
 	private fun log(msg: String) {
 		Log.d("CURL", msg)

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

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

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

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

@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.tracker.ui.debug
+
+import android.graphics.Color
+import android.text.format.DateUtils
+import androidx.core.content.ContextCompat
+import androidx.core.text.bold
+import androidx.core.text.buildSpannedString
+import androidx.core.text.color
+import androidx.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
+import org.koitharu.kotatsu.core.util.ext.drawableStart
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.source
+import org.koitharu.kotatsu.databinding.ItemTrackDebugBinding
+import org.koitharu.kotatsu.tracker.data.TrackEntity
+import com.google.android.material.R as materialR
+
+fun trackDebugAD(
+	lifecycleOwner: LifecycleOwner,
+	coil: ImageLoader,
+	clickListener: OnListItemClickListener<TrackDebugItem>,
+) = adapterDelegateViewBinding<TrackDebugItem, TrackDebugItem, ItemTrackDebugBinding>(
+	{ layoutInflater, parent -> ItemTrackDebugBinding.inflate(layoutInflater, parent, false) },
+) {
+	val indicatorNew = ContextCompat.getDrawable(context, R.drawable.ic_new)
+
+	itemView.setOnClickListener { v ->
+		clickListener.onItemClick(item, v)
+	}
+
+	bind {
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
+			defaultPlaceholders(context)
+			allowRgb565(true)
+			source(item.manga.source)
+			enqueueWith(coil)
+		}
+		binding.textViewTitle.text = item.manga.title
+		binding.textViewSummary.text = buildSpannedString {
+			item.lastCheckTime?.let {
+				append(
+					DateUtils.getRelativeDateTimeString(
+						context,
+						it.toEpochMilli(),
+						DateUtils.MINUTE_IN_MILLIS,
+						DateUtils.WEEK_IN_MILLIS,
+						0,
+					),
+				)
+			}
+			if (item.lastResult == TrackEntity.RESULT_FAILED) {
+				append(" - ")
+				bold {
+					color(context.getThemeColor(materialR.attr.colorError, Color.RED)) {
+						append(getString(R.string.error))
+					}
+				}
+			}
+		}
+		binding.textViewTitle.drawableStart = if (item.newChapters > 0) {
+			indicatorNew
+		} else {
+			null
+		}
+	}
+}

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

@@ -0,0 +1,19 @@
+package org.koitharu.kotatsu.tracker.ui.debug
+
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import java.time.Instant
+
+data class TrackDebugItem(
+	val manga: Manga,
+	val lastChapterId: Long,
+	val newChapters: Int,
+	val lastCheckTime: Instant?,
+	val lastChapterDate: Instant?,
+	val lastResult: Int,
+) : ListModel {
+
+	override fun areItemsTheSame(other: ListModel): Boolean {
+		return other is TrackDebugItem && other.manga.id == manga.id
+	}
+}

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

@@ -0,0 +1,57 @@
+package org.koitharu.kotatsu.tracker.ui.debug
+
+import android.os.Bundle
+import android.view.View
+import androidx.activity.viewModels
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import coil.ImageLoader
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.databinding.ActivityTrackerDebugBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TrackerDebugActivity : BaseActivity<ActivityTrackerDebugBinding>(), OnListItemClickListener<TrackDebugItem> {
+
+	@Inject
+	lateinit var coil: ImageLoader
+
+	private val viewModel by viewModels<TrackerDebugViewModel>()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityTrackerDebugBinding.inflate(layoutInflater))
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		val tracksAdapter = BaseListAdapter<TrackDebugItem>()
+			.addDelegate(ListItemType.FEED, trackDebugAD(this, coil, this))
+		with(viewBinding.recyclerView) {
+			adapter = tracksAdapter
+			addItemDecoration(TypedListSpacingDecoration(context, false))
+		}
+		viewModel.content.observe(this, tracksAdapter)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		val rv = viewBinding.recyclerView
+		rv.updatePadding(
+			left = insets.left + rv.paddingTop,
+			right = insets.right + rv.paddingTop,
+			bottom = insets.bottom,
+		)
+		viewBinding.toolbar.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+	}
+
+	override fun onItemClick(item: TrackDebugItem, view: View) {
+		startActivity(DetailsActivity.newIntent(this, item.manga))
+	}
+}

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

@@ -0,0 +1,36 @@
+package org.koitharu.kotatsu.tracker.ui.debug
+
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.db.entity.toManga
+import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.toInstantOrNull
+import org.koitharu.kotatsu.tracker.data.TrackWithManga
+import javax.inject.Inject
+
+@HiltViewModel
+class TrackerDebugViewModel @Inject constructor(
+	private val db: MangaDatabase
+) : BaseViewModel() {
+
+	val content = db.getTracksDao().observeAll()
+		.map { it.toUiList() }
+		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+
+	private fun List<TrackWithManga>.toUiList(): List<TrackDebugItem> = map {
+		TrackDebugItem(
+			manga = it.manga.toManga(emptySet()),
+			lastChapterId = it.track.lastChapterId,
+			newChapters = it.track.newChapters,
+			lastCheckTime = it.track.lastCheckTime.toInstantOrNull(),
+			lastChapterDate = it.track.lastChapterDate.toInstantOrNull(),
+			lastResult = it.track.lastResult,
+		)
+	}
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fitsSystemWindows="true">
+
+		<com.google.android.material.appbar.CollapsingToolbarLayout
+			android:id="@+id/collapsingToolbarLayout"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+			app:toolbarId="@id/toolbar">
+
+			<com.google.android.material.appbar.MaterialToolbar
+				android:id="@id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:layout_collapseMode="pin" />
+
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		android:orientation="vertical"
+		android:padding="@dimen/list_spacing_normal"
+		android:scrollbars="vertical"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+		tools:listitem="@layout/item_track_debug" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -4,7 +4,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="72dp"
 	android:background="@drawable/list_selector"
 	android:clipChildren="false">
 
@@ -14,7 +14,9 @@
 		android:layout_height="40dp"
 		android:layout_marginStart="8dp"
 		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
 		android:scaleType="centerCrop"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
@@ -26,42 +28,29 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
+		android:drawablePadding="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodyLarge"
-		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
-		app:layout_constraintEnd_toStartOf="@id/button_more"
+		android:textAppearance="?attr/textAppearanceTitleSmall"
+		app:layout_constraintBottom_toTopOf="@+id/textView_summary"
+		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
 		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
 		tools:text="@tools:sample/lorem" />
 
 	<TextView
-		android:id="@+id/textView_subtitle"
+		android:id="@+id/textView_summary"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginEnd="8dp"
 		android:ellipsize="end"
 		android:maxLines="1"
-		android:textAppearance="?attr/textAppearanceBodyMedium"
+		android:textAppearance="?attr/textAppearanceBodySmall"
 		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
-		app:layout_constraintEnd_toStartOf="@id/button_more"
+		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
 		app:layout_constraintTop_toBottomOf="@+id/textView_title"
 		tools:text="@tools:sample/lorem/random" />
 
-	<Button
-		android:id="@+id/button_more"
-		style="@style/Widget.Kotatsu.ExploreButton"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="8dp"
-		android:gravity="center"
-		android:minWidth="120dp"
-		android:text="@string/more"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
-

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

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

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

@@ -1,4 +1,5 @@
 <?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/main/assets/isrgrootx1.pem

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

@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.alternatives.domain
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.util.ext.almostEquals
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import javax.inject.Inject
+
+private const val MAX_PARALLELISM = 4
+private const val MATCH_THRESHOLD = 0.2f
+
+class AlternativesUseCase @Inject constructor(
+	private val sourcesRepository: MangaSourcesRepository,
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+) {
+
+	suspend operator fun invoke(manga: Manga): Flow<Manga> {
+		val sources = getSources(manga.source)
+		if (sources.isEmpty()) {
+			return emptyFlow()
+		}
+		val semaphore = Semaphore(MAX_PARALLELISM)
+		return channelFlow {
+			for (source in sources) {
+				val repository = mangaRepositoryFactory.create(source)
+				if (!repository.isSearchSupported) {
+					continue
+				}
+				launch {
+					val list = runCatchingCancellable {
+						semaphore.withPermit {
+							repository.getList(offset = 0, filter = MangaListFilter.Search(manga.title))
+						}
+					}.getOrDefault(emptyList())
+					for (item in list) {
+						if (item.matches(manga)) {
+							send(item)
+						}
+					}
+				}
+			}
+		}.map {
+			runCatchingCancellable {
+				mangaRepositoryFactory.create(it.source).getDetails(it)
+			}.getOrDefault(it)
+		}
+	}
+
+	private suspend fun getSources(ref: MangaSource): List<MangaSource> {
+		val result = ArrayList<MangaSource>(MangaSource.entries.size - 2)
+		result.addAll(sourcesRepository.getEnabledSources())
+		result.sortByDescending { it.priority(ref) }
+		result.addAll(sourcesRepository.getDisabledSources().sortedByDescending { it.priority(ref) })
+		return result
+	}
+
+	private fun Manga.matches(ref: Manga): Boolean {
+		return matchesTitles(title, ref.title) ||
+			matchesTitles(title, ref.altTitle) ||
+			matchesTitles(altTitle, ref.title) ||
+			matchesTitles(altTitle, ref.altTitle)
+
+	}
+
+	private fun matchesTitles(a: String?, b: String?): Boolean {
+		return !a.isNullOrEmpty() && !b.isNullOrEmpty() && a.almostEquals(b, MATCH_THRESHOLD)
+	}
+
+	private fun MangaSource.priority(ref: MangaSource): Int {
+		var res = 0
+		if (locale == ref.locale) res += 2
+		if (contentType == ref.contentType) res++
+		return res
+	}
+}

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

@@ -0,0 +1,146 @@
+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.PROGRESS_NONE
+import org.koitharu.kotatsu.history.data.toMangaHistory
+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.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,
+) {
+
+	suspend operator fun invoke(oldManga: Manga, newManga: Manga) {
+		val oldDetails = if (oldManga.chapters.isNullOrEmpty()) {
+			runCatchingCancellable {
+				mangaRepositoryFactory.create(oldManga.source).getDetails(oldManga)
+			}.getOrDefault(oldManga)
+		} else {
+			oldManga
+		}
+		val newDetails = if (newManga.chapters.isNullOrEmpty()) {
+			mangaRepositoryFactory.create(newManga.source).getDetails(newManga)
+		} else {
+			newManga
+		}
+		mangaDataRepository.storeManga(newDetails)
+		database.withTransaction {
+			// replace favorites
+			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)
+			if (oldHistory != null) {
+				val newHistory = makeNewHistory(oldDetails, newDetails, oldHistory)
+				historyDao.delete(oldDetails.id)
+				historyDao.upsert(newHistory)
+			}
+			// track
+			val tracksDao = database.getTracksDao()
+			val oldTrack = tracksDao.find(oldDetails.id)
+			if (oldTrack != null) {
+				val lastChapter = newDetails.chapters?.lastOrNull()
+				val newTrack = TrackEntity(
+					mangaId = newDetails.id,
+					lastChapterId = lastChapter?.id ?: 0L,
+					newChapters = 0,
+					lastCheckTime = System.currentTimeMillis(),
+					lastChapterDate = lastChapter?.uploadDate ?: 0L,
+					lastResult = TrackEntity.RESULT_EXTERNAL_MODIFICATION,
+				)
+				tracksDao.delete(oldDetails.id)
+				tracksDao.upsert(newTrack)
+			}
+		}
+		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 = System.currentTimeMillis(),
+				chapterId = currentChapter.id,
+				page = history.page,
+				scroll = history.scroll,
+				percent = history.percent,
+				deletedAt = 0,
+				chaptersCount = chapters.size,
+			)
+		}
+		val branch = oldManga.getPreferredBranch(history.toMangaHistory())
+		val oldChapters = checkNotNull(oldManga.getChapters(branch))
+		var index = oldChapters.indexOfFirst { it.id == history.chapterId }
+		if (index < 0) {
+			index = if (history.percent in 0f..1f) {
+				(oldChapters.lastIndex * history.percent).toInt()
+			} else {
+				0
+			}
+		}
+		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 = System.currentTimeMillis(),
+			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? {
+		return if (number <= 0f) {
+			null
+		} else {
+			firstOrNull { it.volume == volume && it.number == number }
+		}
+	}
+}

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

@@ -0,0 +1,91 @@
+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.lifecycle.LifecycleOwner
+import coil.ImageLoader
+import coil.request.ImageRequest
+import coil.transform.CircleCropTransformation
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.parser.favicon.faviconUri
+import org.koitharu.kotatsu.core.ui.image.ChipIconTarget
+import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
+import org.koitharu.kotatsu.core.ui.image.TrimTransformation
+import org.koitharu.kotatsu.core.ui.list.AdapterDelegateClickListenerAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.defaultPlaceholders
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
+import org.koitharu.kotatsu.core.util.ext.source
+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.manga.title
+		binding.textViewSubtitle.text = buildSpannedString {
+			if (item.chaptersCount > 0) {
+				append(context.resources.getQuantityString(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.setPercent(item.progress, ListModelDiffCallback.PAYLOAD_PROGRESS_CHANGED in payloads)
+		binding.chipSource.also { chip ->
+			chip.text = item.manga.source.title
+			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)
+				.source(item.manga.source)
+				.transformations(CircleCropTransformation())
+				.allowRgb565(true)
+				.enqueueWith(coil)
+		}
+		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
+			size(CoverSizeResolver(binding.imageViewCover))
+			defaultPlaceholders(context)
+			transformations(TrimTransformation())
+			allowRgb565(true)
+			tag(item.manga)
+			source(item.manga.source)
+			enqueueWith(coil)
+		}
+	}
+}

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

@@ -0,0 +1,114 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.core.graphics.Insets
+import androidx.core.view.updatePadding
+import coil.ImageLoader
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.BaseListAdapter
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.util.ext.DIALOG_THEME_CENTERED
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.databinding.ActivityAlternativesBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
+import org.koitharu.kotatsu.list.ui.adapter.ListItemType
+import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
+import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
+import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.search.ui.SearchActivity
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AlternativesActivity : BaseActivity<ActivityAlternativesBinding>(),
+	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(coil, this, null))
+			.addDelegate(ListItemType.FOOTER_LOADING, loadingFooterAD())
+			.addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
+		with(viewBinding.recyclerView) {
+			setHasFixedSize(true)
+			addItemDecoration(TypedListSpacingDecoration(context, addHorizontalPadding = false))
+			adapter = listAdapter
+		}
+
+		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
+		viewModel.content.observe(this, listAdapter)
+		viewModel.onMigrated.observeEvent(this) {
+			Toast.makeText(this, R.string.migration_completed, Toast.LENGTH_SHORT).show()
+			startActivity(DetailsActivity.newIntent(this, it))
+			finishAfterTransition()
+		}
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		viewBinding.root.updatePadding(
+			left = insets.left,
+			right = insets.right,
+		)
+		viewBinding.recyclerView.updatePadding(
+			bottom = insets.bottom + viewBinding.recyclerView.paddingTop,
+		)
+	}
+
+	override fun onItemClick(item: MangaAlternativeModel, view: View) {
+		when (view.id) {
+			R.id.chip_source -> startActivity(SearchActivity.newIntent(this, item.manga.source, viewModel.manga.title))
+			R.id.button_migrate -> confirmMigration(item.manga)
+			else -> startActivity(DetailsActivity.newIntent(this, item.manga))
+		}
+	}
+
+	private fun confirmMigration(target: Manga) {
+		MaterialAlertDialogBuilder(this, DIALOG_THEME_CENTERED)
+			.setIcon(R.drawable.ic_replace)
+			.setTitle(R.string.manga_migration)
+			.setMessage(
+				getString(
+					R.string.migrate_confirmation,
+					viewModel.manga.title,
+					viewModel.manga.source.title,
+					target.title,
+					target.source.title,
+				),
+			)
+			.setNegativeButton(android.R.string.cancel, null)
+			.setPositiveButton(R.string.migrate) { _, _ ->
+				viewModel.migrate(target)
+			}.show()
+	}
+
+	companion object {
+
+		fun newIntent(context: Context, manga: Manga) = Intent(context, AlternativesActivity::class.java)
+			.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+	}
+}

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

@@ -0,0 +1,98 @@
+package org.koitharu.kotatsu.alternatives.ui
+
+import androidx.lifecycle.SavedStateHandle
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEmpty
+import kotlinx.coroutines.flow.runningFold
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.alternatives.domain.AlternativesUseCase
+import org.koitharu.kotatsu.alternatives.domain.MigrateUseCase
+import org.koitharu.kotatsu.core.model.chaptersCount
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.core.parser.MangaIntent
+import org.koitharu.kotatsu.core.parser.MangaRepository
+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.list.domain.ListExtraProvider
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+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 extraProvider: ListExtraProvider,
+) : BaseViewModel() {
+
+	val manga = savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga
+
+	val onMigrated = MutableEventFlow<Manga>()
+	val content = MutableStateFlow<List<ListModel>>(listOf(LoadingState))
+	private var migrationJob: Job? = null
+
+	init {
+		launchJob(Dispatchers.Default) {
+			val ref = runCatchingCancellable {
+				mangaRepositoryFactory.create(manga.source).getDetails(manga)
+			}.getOrDefault(manga)
+			val refCount = ref.chaptersCount()
+			alternativesUseCase(ref)
+				.map {
+					MangaAlternativeModel(
+						manga = it,
+						progress = extraProvider.getProgress(it.id),
+						referenceChapters = refCount,
+					)
+				}.runningFold<MangaAlternativeModel, List<ListModel>>(listOf(LoadingState)) { acc, item ->
+					acc.filterIsInstance<MangaAlternativeModel>() + item + LoadingFooter()
+				}.onEmpty {
+					emit(
+						listOf(
+							EmptyState(
+								icon = R.drawable.ic_empty_common,
+								textPrimary = R.string.nothing_found,
+								textSecondary = R.string.text_search_holder_secondary,
+								actionStringRes = 0,
+							),
+						),
+					)
+				}.collect {
+					content.value = it
+				}
+			content.value = content.value.filterNot { it is LoadingFooter }
+		}
+	}
+
+	fun migrate(target: Manga) {
+		if (migrationJob?.isActive == true) {
+			return
+		}
+		migrationJob = launchLoadingJob(Dispatchers.Default) {
+			migrateUseCase(manga, target)
+			onMigrated.call(target)
+		}
+	}
+
+	private suspend fun mapList(list: List<Manga>, refCount: Int): List<MangaAlternativeModel> {
+		return list.map {
+			MangaAlternativeModel(
+				manga = it,
+				progress = extraProvider.getProgress(it.id),
+				referenceChapters = refCount,
+			)
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+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.parsers.model.Manga
+
+data class MangaAlternativeModel(
+	val manga: Manga,
+	val progress: Float,
+	private val referenceChapters: Int,
+) : ListModel {
+
+	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
+	}
+}

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

@@ -12,9 +12,6 @@ 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?
 
@@ -42,9 +39,6 @@ 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
 

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

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.bookmarks.data
 
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.parsers.model.Manga
-import java.util.Date
+import java.time.Instant
 
 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 = Date(createdAt),
+	createdAt = Instant.ofEpochMilli(createdAt),
 	percent = percent,
 )
 
@@ -22,7 +22,7 @@ fun Bookmark.toEntity() = BookmarkEntity(
 	page = page,
 	scroll = scroll,
 	imageUrl = imageUrl,
-	createdAt = createdAt.time,
+	createdAt = createdAt.toEpochMilli(),
 	percent = percent,
 )
 

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

@@ -1,10 +1,10 @@
 package org.koitharu.kotatsu.bookmarks.domain
 
 import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.local.data.ImageFileFilter
+import org.koitharu.kotatsu.local.data.hasImageExtension
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import java.util.Date
+import java.time.Instant
 
 data class Bookmark(
 	val manga: Manga,
@@ -13,7 +13,7 @@ data class Bookmark(
 	val page: Int,
 	val scroll: Int,
 	val imageUrl: String,
-	val createdAt: Date,
+	val createdAt: Instant,
 	val percent: Float,
 ) : ListModel {
 
@@ -38,7 +38,6 @@ data class Bookmark(
 	)
 
 	private fun isImageUrlDirect(): Boolean {
-		val extension = imageUrl.substringAfterLast('.')
-		return extension.isNotEmpty() && ImageFileFilter().isExtensionValid(extension)
+		return hasImageExtension(imageUrl)
 	}
 }

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.bookmarksDao.observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id, chapterId, page).map { it?.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(manga: Manga): Flow<List<Bookmark>> {
-		return db.bookmarksDao.observe(manga.id).mapItems { it.toBookmark(manga) }
+		return db.getBookmarksDao().observe(manga.id).mapItems { it.toBookmark(manga) }
 	}
 
 	fun observeBookmarks(): Flow<Map<Manga, List<Bookmark>>> {
-		return db.bookmarksDao.observe().map { map ->
+		return db.getBookmarksDao().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.tagsDao.upsert(tags)
-			db.mangaDao.upsert(bookmark.manga.toEntity(), tags)
-			db.bookmarksDao.insert(bookmark.toEntity())
+			db.getTagsDao().upsert(tags)
+			db.getMangaDao().upsert(bookmark.manga.toEntity(), tags)
+			db.getBookmarksDao().insert(bookmark.toEntity())
 		}
 	}
 
@@ -56,11 +56,11 @@ class BookmarksRepository @Inject constructor(
 		val entity = bookmark.toEntity().copy(
 			imageUrl = imageUrl,
 		)
-		db.bookmarksDao.upsert(listOf(entity))
+		db.getBookmarksDao().upsert(listOf(entity))
 	}
 
 	suspend fun removeBookmark(mangaId: Long, chapterId: Long, page: Int) {
-		check(db.bookmarksDao.delete(mangaId, chapterId, page) != 0) {
+		check(db.getBookmarksDao().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.bookmarksDao
+			val dao = db.getBookmarksDao()
 			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.bookmarksDao.insert(e)
+						db.getBookmarksDao().insert(e)
 					} catch (e: SQLException) {
 						e.printStackTraceDebug()
 					}

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

@@ -16,7 +16,7 @@ import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 
 @AndroidEntryPoint
-class BookmarksActivity :
+class AllBookmarksActivity :
 	BaseActivity<ActivityContainerBinding>(),
 	AppBarOwner,
 	SnackbarOwner {
@@ -34,8 +34,8 @@ class BookmarksActivity :
 		val fm = supportFragmentManager
 		if (fm.findFragmentById(R.id.container) == null) {
 			fm.commit {
-				val fragment = BookmarksFragment.newInstance()
-				replace(R.id.container, fragment)
+				setReorderingAllowed(true)
+				replace(R.id.container, AllBookmarksFragment::class.java, null)
 			}
 		}
 	}
@@ -49,6 +49,6 @@ class BookmarksActivity :
 
 	companion object {
 
-		fun newIntent(context: Context) = Intent(context, BookmarksActivity::class.java)
+		fun newIntent(context: Context) = Intent(context, AllBookmarksActivity::class.java)
 	}
 }

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

@@ -14,37 +14,35 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import coil.ImageLoader
-import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
-import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksAdapter
+import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
-import org.koitharu.kotatsu.core.ui.util.reverseAsync
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
+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.databinding.FragmentListSimpleBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
-import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
+import org.koitharu.kotatsu.list.ui.GridSpanResolver
 import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class BookmarksFragment :
+class AllBookmarksFragment :
 	BaseFragment<FragmentListSimpleBinding>(),
 	ListStateHolderListener,
 	OnListItemClickListener<Bookmark>,
@@ -57,18 +55,24 @@ class BookmarksFragment :
 	@Inject
 	lateinit var settings: AppSettings
 
-	private val viewModel by viewModels<BookmarksViewModel>()
+	private val viewModel by viewModels<AllBookmarksViewModel>()
 	private var bookmarksAdapter: BookmarksAdapter? = null
 	private var selectionController: ListSelectionController? = null
 
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentListSimpleBinding {
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	): FragmentListSimpleBinding {
 		return FragmentListSimpleBinding.inflate(inflater, container, false)
 	}
 
-	override fun onViewBindingCreated(binding: FragmentListSimpleBinding, savedInstanceState: Bundle?) {
+	override fun onViewBindingCreated(
+		binding: FragmentListSimpleBinding,
+		savedInstanceState: Bundle?,
+	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		selectionController = ListSelectionController(
-			activity = requireActivity(),
+			appCompatDelegate = checkNotNull(findAppCompatDelegate()),
 			decoration = BookmarksSelectionDecoration(binding.root.context),
 			registryOwner = this,
 			callback = this,
@@ -82,7 +86,7 @@ class BookmarksFragment :
 		val spanSizeLookup = SpanSizeLookup()
 		with(binding.recyclerView) {
 			setHasFixedSize(true)
-			val spanResolver = MangaListSpanResolver(resources)
+			val spanResolver = GridSpanResolver(resources)
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 			adapter = bookmarksAdapter
 			addOnLayoutChangeListener(spanResolver)
@@ -95,8 +99,11 @@ class BookmarksFragment :
 		viewModel.content.observe(viewLifecycleOwner) {
 			bookmarksAdapter?.setItems(it, spanSizeLookup)
 		}
-		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
+		viewModel.onError.observeEvent(
+			viewLifecycleOwner,
+			SnackbarErrorObserver(binding.recyclerView, this),
+		)
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}
 
 	override fun onDestroyView() {
@@ -139,12 +146,20 @@ class BookmarksFragment :
 		requireViewBinding().recyclerView.invalidateItemDecorations()
 	}
 
-	override fun onCreateActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
+	override fun onCreateActionMode(
+		controller: ListSelectionController,
+		mode: ActionMode,
+		menu: Menu,
+	): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_bookmarks, menu)
 		return true
 	}
 
-	override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
+	override fun onActionItemClicked(
+		controller: ListSelectionController,
+		mode: ActionMode,
+		item: MenuItem,
+	): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
 				val ids = selectionController?.snapshot() ?: return false
@@ -167,16 +182,6 @@ class BookmarksFragment :
 		}
 	}
 
-	private fun onActionDone(action: ReversibleAction) {
-		val handle = action.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar = Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		snackbar.show()
-	}
-
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
 
 		init {
@@ -185,7 +190,8 @@ class BookmarksFragment :
 		}
 
 		override fun getSpanSize(position: Int): Int {
-			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount ?: return 1
+			val total = (viewBinding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount
+				?: return 1
 			return when (bookmarksAdapter?.getItemViewType(position)) {
 				ListItemType.PAGE_THUMB.ordinal -> 1
 				else -> total
@@ -200,6 +206,13 @@ class BookmarksFragment :
 
 	companion object {
 
-		fun newInstance() = BookmarksFragment()
+		@Deprecated(
+			"",
+			ReplaceWith(
+				"BookmarksFragment()",
+				"org.koitharu.kotatsu.bookmarks.ui.BookmarksFragment",
+			),
+		)
+		fun newInstance() = AllBookmarksFragment()
 	}
 }

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

@@ -25,7 +25,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import javax.inject.Inject
 
 @HiltViewModel
-class BookmarksViewModel @Inject constructor(
+class AllBookmarksViewModel @Inject constructor(
 	private val repository: BookmarksRepository,
 ) : BaseViewModel() {
 

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

@@ -1,14 +1,14 @@
-package org.koitharu.kotatsu.bookmarks.ui.sheet
+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.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -30,9 +30,7 @@ fun bookmarkLargeAD(
 	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)
+			defaultPlaceholders(context)
 			allowRgb565(true)
 			tag(item)
 			decodeRegion(item.scroll)

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

@@ -3,12 +3,12 @@ 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.defaultPlaceholders
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
@@ -29,9 +29,7 @@ fun bookmarkListAD(
 	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)
+			defaultPlaceholders(context)
 			allowRgb565(true)
 			tag(item)
 			decodeRegion(item.scroll)

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

@@ -1,19 +1,36 @@
 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.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>,
-) : BaseListAdapter<Bookmark>() {
+	headerClickListener: ListHeaderClickListener?,
+) : BaseListAdapter<ListModel>(), FastScroller.SectionIndexer {
 
 	init {
-		addDelegate(ListItemType.PAGE_THUMB, bookmarkListAD(coil, lifecycleOwner, clickListener))
+		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? {
+		return findHeader(position)?.getText(context)
 	}
 }

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.browser
 
-import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -12,31 +11,42 @@ import android.webkit.CookieManager
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.ui.BaseActivity
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
+import org.koitharu.kotatsu.core.util.ext.configureForParser
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
 import com.google.android.material.R as materialR
 
-@SuppressLint("SetJavaScriptEnabled")
+@AndroidEntryPoint
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
 	private lateinit var onBackPressedCallback: WebViewBackPressedCallback
 
+	@Inject
+	lateinit var mangaRepositoryFactory: MangaRepository.Factory
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
 		supportActionBar?.run {
 			setDisplayHomeAsUpEnabled(true)
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			userAgentString = UserAgents.CHROME_MOBILE
+		val userAgent = intent?.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE)?.let { source ->
+			val repository = mangaRepositoryFactory.create(source) as? RemoteMangaRepository
+			repository?.headers?.get(CommonHeaders.USER_AGENT)
 		}
+		viewBinding.webView.configureForParser(userAgent)
 		CookieManager.getInstance().setAcceptThirdPartyCookies(viewBinding.webView, true)
 		viewBinding.webView.webViewClient = BrowserClient(this)
 		viewBinding.webView.webChromeClient = ProgressChromeClient(viewBinding.progressBar)
@@ -57,16 +67,6 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 	}
 
-	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 {
 		super.onCreateOptionsMenu(menu)
 		menuInflater.inflate(R.menu.opt_browser, menu)
@@ -81,11 +81,14 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 
 		R.id.action_browser -> {
-			val intent = Intent(Intent.ACTION_VIEW)
-			intent.data = Uri.parse(viewBinding.webView.url)
-			try {
-				startActivity(Intent.createChooser(intent, item.title))
-			} catch (_: ActivityNotFoundException) {
+			val url = viewBinding.webView.url?.toUriOrNull()
+			if (url != null) {
+				val intent = Intent(Intent.ACTION_VIEW)
+				intent.data = url
+				try {
+					startActivity(Intent.createChooser(intent, item.title))
+				} catch (_: ActivityNotFoundException) {
+				}
 			}
 			true
 		}
@@ -136,11 +139,13 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 	companion object {
 
 		private const val EXTRA_TITLE = "title"
+		private const val EXTRA_SOURCE = "source"
 
-		fun newIntent(context: Context, url: String, title: String?): Intent {
+		fun newIntent(context: Context, url: String, source: MangaSource?, title: String?): Intent {
 			return Intent(context, BrowserActivity::class.java)
 				.setData(Uri.parse(url))
 				.putExtra(EXTRA_TITLE, title)
+				.putExtra(EXTRA_SOURCE, source)
 		}
 	}
 }

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

@@ -1,6 +1,9 @@
 package org.koitharu.kotatsu.browser.cloudflare
 
 import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.Settings
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -13,13 +16,14 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.parsers.model.ContentType
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class CaptchaNotifier(
 	private val context: Context,
 ) : EventListener {
 
 	fun notify(exception: CloudFlareProtectedException) {
-		if (!context.checkNotificationPermission()) {
+		if (!context.checkNotificationPermission(CHANNEL_ID)) {
 			return
 		}
 		val manager = NotificationManagerCompat.from(context)
@@ -32,13 +36,14 @@ class CaptchaNotifier(
 			.build()
 		manager.createNotificationChannel(channel)
 
-		val intent = CloudFlareActivity.newIntent(context, exception.url, exception.headers)
+		val intent = CloudFlareActivity.newIntent(context, exception)
 			.setData(exception.url.toUri())
 		val notification = NotificationCompat.Builder(context, CHANNEL_ID)
 			.setContentTitle(channel.name)
 			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
 			.setDefaults(NotificationCompat.DEFAULT_SOUND)
 			.setSmallIcon(android.R.drawable.stat_notify_error)
+			.setGroup(GROUP_CAPTCHA)
 			.setAutoCancel(true)
 			.setVisibility(
 				if (exception.source?.contentType == ContentType.HENTAI) {
@@ -54,21 +59,47 @@ class CaptchaNotifier(
 				),
 			)
 			.setContentIntent(PendingIntentCompat.getActivity(context, 0, intent, 0, false))
-			.build()
-		manager.notify(TAG, exception.source.hashCode(), notification)
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val actionIntent = PendingIntentCompat.getActivity(
+				context, SETTINGS_ACTION_CODE,
+				Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+					.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+					.putExtra(Settings.EXTRA_CHANNEL_ID, CHANNEL_ID),
+				0, false,
+			)
+			notification.addAction(
+				R.drawable.ic_settings,
+				context.getString(R.string.notifications_settings),
+				actionIntent,
+			)
+		}
+		manager.notify(TAG, exception.source.hashCode(), notification.build())
+	}
+
+	fun dismiss(source: MangaSource) {
+		NotificationManagerCompat.from(context).cancel(TAG, source.hashCode())
 	}
 
 	override fun onError(request: ImageRequest, result: ErrorResult) {
 		super.onError(request, result)
 		val e = result.throwable
-		if (e is CloudFlareProtectedException) {
+		if (e is CloudFlareProtectedException && request.parameters.value<Boolean>(PARAM_IGNORE_CAPTCHA) != true) {
 			notify(e)
 		}
 	}
 
-	private companion object {
+	companion object {
 
+		fun ImageRequest.Builder.ignoreCaptchaErrors() = setParameter(
+			key = PARAM_IGNORE_CAPTCHA,
+			value = true,
+			memoryCacheKey = null,
+		)
+
+		private const val PARAM_IGNORE_CAPTCHA = "ignore_captcha"
 		private const val CHANNEL_ID = "captcha"
 		private const val TAG = CHANNEL_ID
+		private const val GROUP_CAPTCHA = "org.koitharu.kotatsu.CAPTCHA"
+		private const val SETTINGS_ACTION_CODE = 3
 	}
 }

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.browser.cloudflare
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import android.webkit.CookieManager
 import androidx.activity.result.contract.ActivityResultContract
@@ -11,18 +12,26 @@ import androidx.core.net.toUri
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.yield
 import okhttp3.Headers
+import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
-import org.koitharu.kotatsu.core.util.ext.catchingWebViewUnavailability
+import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import org.koitharu.kotatsu.parsers.network.UserAgents
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -34,11 +43,12 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	@Inject
 	lateinit var cookieJar: MutableCookieJar
 
+	private lateinit var cfClient: CloudFlareClient
 	private var onBackPressedCallback: WebViewBackPressedCallback? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
+		if (!setContentViewWebViewSafe { ActivityBrowserBinding.inflate(layoutInflater) }) {
 			return
 		}
 		supportActionBar?.run {
@@ -46,13 +56,9 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			setHomeAsUpIndicator(materialR.drawable.abc_ic_clear_material)
 		}
 		val url = intent?.dataString.orEmpty()
-		with(viewBinding.webView.settings) {
-			javaScriptEnabled = true
-			domStorageEnabled = true
-			databaseEnabled = true
-			userAgentString = intent?.getStringExtra(ARG_UA) ?: UserAgents.CHROME_MOBILE
-		}
-		viewBinding.webView.webViewClient = CloudFlareClient(cookieJar, this, url)
+		cfClient = CloudFlareClient(cookieJar, this, url)
+		viewBinding.webView.configureForParser(intent?.getStringExtra(ARG_UA))
+		viewBinding.webView.webViewClient = cfClient
 		onBackPressedCallback = WebViewBackPressedCallback(viewBinding.webView).also {
 			onBackPressedDispatcher.addCallback(it)
 		}
@@ -69,21 +75,18 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	}
 
 	override fun onDestroy() {
-		viewBinding.webView.run {
-			stopLoading()
-			destroy()
+		runCatching {
+			viewBinding.webView
+		}.onSuccess {
+			it.stopLoading()
+			it.destroy()
 		}
 		super.onDestroy()
 	}
 
-	override fun onSaveInstanceState(outState: Bundle) {
-		super.onSaveInstanceState(outState)
-		viewBinding.webView.saveState(outState)
-	}
-
-	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-		super.onRestoreInstanceState(savedInstanceState)
-		viewBinding.webView.restoreState(savedInstanceState)
+	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+		menuInflater.inflate(R.menu.opt_captcha, menu)
+		return super.onCreateOptionsMenu(menu)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
@@ -104,6 +107,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			true
 		}
 
+		R.id.action_retry -> {
+			restartCheck()
+			true
+		}
+
 		else -> super.onOptionsItemSelected(item)
 	}
 
@@ -126,8 +134,16 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		viewBinding.progressBar.isInvisible = true
 	}
 
+	override fun onLoopDetected() {
+		restartCheck()
+	}
+
 	override fun onCheckPassed() {
 		pendingResult = RESULT_OK
+		val source = intent?.getStringExtra(ARG_SOURCE)
+		if (source != null) {
+			CaptchaNotifier(this).dismiss(MangaSource(source))
+		}
 		finishAfterTransition()
 	}
 
@@ -141,12 +157,33 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
 		setTitle(title)
-		supportActionBar?.subtitle = subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
+		supportActionBar?.subtitle =
+			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
 	}
 
-	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {
-		override fun createIntent(context: Context, input: Pair<String, Headers?>): Intent {
-			return newIntent(context, input.first, input.second)
+	private fun restartCheck() {
+		lifecycleScope.launch {
+			viewBinding.webView.stopLoading()
+			yield()
+			cfClient.reset()
+			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
+			if (targetUrl != null) {
+				clearCfCookies(targetUrl)
+				viewBinding.webView.loadUrl(targetUrl.toString())
+			}
+		}
+	}
+
+	private suspend fun clearCfCookies(url: HttpUrl) = runInterruptible(Dispatchers.Default) {
+		cookieJar.removeCookies(url) { cookie ->
+			val name = cookie.name
+			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf") || name == "csrftoken"
+		}
+	}
+
+	class Contract : ActivityResultContract<CloudFlareProtectedException, TaggedActivityResult>() {
+		override fun createIntent(context: Context, input: CloudFlareProtectedException): Intent {
+			return newIntent(context, input)
 		}
 
 		override fun parseResult(resultCode: Int, intent: Intent?): TaggedActivityResult {
@@ -158,13 +195,23 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 		const val TAG = "CloudFlareActivity"
 		private const val ARG_UA = "ua"
+		private const val ARG_SOURCE = "_source"
 
-		fun newIntent(
+		fun newIntent(context: Context, exception: CloudFlareProtectedException) = newIntent(
+			context = context,
+			url = exception.url,
+			source = exception.source,
+			headers = exception.headers,
+		)
+
+		private fun newIntent(
 			context: Context,
 			url: String,
+			source: MangaSource?,
 			headers: Headers?,
 		) = Intent(context, CloudFlareActivity::class.java).apply {
 			data = url.toUri()
+			putExtra(ARG_SOURCE, source?.name)
 			headers?.get(CommonHeaders.USER_AGENT)?.let {
 				putExtra(ARG_UA, it)
 			}

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

@@ -11,4 +11,6 @@ interface CloudFlareCallback : BrowserCallback {
 	fun onPageLoaded()
 
 	fun onCheckPassed()
+
+	fun onLoopDetected()
 }

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

@@ -7,6 +7,7 @@ import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 
 private const val CF_CLEARANCE = "cf_clearance"
+private const val LOOP_COUNTER = 3
 
 class CloudFlareClient(
 	private val cookieJar: MutableCookieJar,
@@ -15,6 +16,7 @@ class CloudFlareClient(
 ) : BrowserClient(callback) {
 
 	private val oldClearance = getClearance()
+	private var counter = 0
 
 	override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
 		super.onPageStarted(view, url, favicon)
@@ -31,10 +33,20 @@ class CloudFlareClient(
 		callback.onPageLoaded()
 	}
 
+	fun reset() {
+		counter = 0
+	}
+
 	private fun checkClearance() {
 		val clearance = getClearance()
 		if (clearance != null && clearance != oldClearance) {
 			callback.onCheckPassed()
+		} else {
+			counter++
+			if (counter >= LOOP_COUNTER) {
+				reset()
+				callback.onLoopDetected()
+			}
 		}
 	}
 

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

@@ -26,11 +26,9 @@ import kotlinx.coroutines.flow.asSharedFlow
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
-import org.koitharu.kotatsu.core.cache.ContentCache
-import org.koitharu.kotatsu.core.cache.MemoryContentCache
-import org.koitharu.kotatsu.core.cache.StubContentCache
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.network.*
+import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
+import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
@@ -39,10 +37,10 @@ import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.AcraScreenLogger
-import org.koitharu.kotatsu.core.util.IncognitoModeIndicator
-import org.koitharu.kotatsu.core.util.ext.activityManager
 import org.koitharu.kotatsu.core.util.ext.connectivityManager
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageFetcher
+import org.koitharu.kotatsu.details.ui.pager.pages.MangaPageKeyer
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
 import org.koitharu.kotatsu.local.data.LocalStorageChanges
@@ -50,11 +48,11 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
-import org.koitharu.kotatsu.reader.ui.thumbnails.MangaPageFetcher
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
 import org.koitharu.kotatsu.sync.domain.SyncController
 import org.koitharu.kotatsu.widget.WidgetUpdater
+import javax.inject.Provider
 import javax.inject.Singleton
 
 @Module
@@ -87,7 +85,7 @@ interface AppModule {
 		@Singleton
 		fun provideCoil(
 			@ApplicationContext context: Context,
-			@MangaHttpClient okHttpClient: OkHttpClient,
+			@MangaHttpClient okHttpClientProvider: Provider<OkHttpClient>,
 			mangaRepositoryFactory: MangaRepository.Factory,
 			imageProxyInterceptor: ImageProxyInterceptor,
 			pageFetcherFactory: MangaPageFetcher.Factory,
@@ -99,11 +97,14 @@ interface AppModule {
 					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
 					.build()
 			}
+			val okHttpClientLazy = lazy {
+				okHttpClientProvider.get().newBuilder().cache(null).build()
+			}
 			return ImageLoader.Builder(context)
-				.okHttpClient(okHttpClient.newBuilder().cache(null).build())
+				.okHttpClient { okHttpClientLazy.value }
 				.interceptorDispatcher(Dispatchers.Default)
-				.fetcherDispatcher(Dispatchers.IO)
-				.decoderDispatcher(Dispatchers.Default)
+				.fetcherDispatcher(Dispatchers.Default)
+				.decoderDispatcher(Dispatchers.IO)
 				.transformationDispatcher(Dispatchers.Default)
 				.diskCache(diskCacheFactory)
 				.logger(if (BuildConfig.DEBUG) DebugLogger() else null)
@@ -113,7 +114,8 @@ interface AppModule {
 					ComponentRegistry.Builder()
 						.add(SvgDecoder.Factory())
 						.add(CbzFetcher.Factory())
-						.add(FaviconFetcher.Factory(context, okHttpClient, mangaRepositoryFactory))
+						.add(FaviconFetcher.Factory(context, okHttpClientLazy, mangaRepositoryFactory))
+						.add(MangaPageKeyer())
 						.add(pageFetcherFactory)
 						.add(imageProxyInterceptor)
 						.add(coverRestoreInterceptor)
@@ -147,27 +149,13 @@ interface AppModule {
 		fun provideActivityLifecycleCallbacks(
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
-			incognitoModeIndicator: IncognitoModeIndicator,
 			acraScreenLogger: AcraScreenLogger,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
-			incognitoModeIndicator,
 			acraScreenLogger,
 		)
 
-		@Provides
-		@Singleton
-		fun provideContentCache(
-			application: Application,
-		): ContentCache {
-			return if (application.activityManager?.isLowRamDevice == true) {
-				StubContentCache()
-			} else {
-				MemoryContentCache(application)
-			}
-		}
-
 		@Provides
 		@Singleton
 		@LocalStorageChanges

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core
 
 import android.app.Application
 import android.content.Context
+import android.os.Build
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.hilt.work.HiltWorkerFactory
@@ -11,6 +12,7 @@ import androidx.work.WorkManager
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
@@ -18,6 +20,7 @@ import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
+import org.conscrypt.Conscrypt
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.db.MangaDatabase
@@ -26,6 +29,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.settings.work.WorkScheduleManager
+import java.security.Security
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -33,13 +37,13 @@ import javax.inject.Provider
 open class BaseApp : Application(), Configuration.Provider {
 
 	@Inject
-	lateinit var databaseObservers: Set<@JvmSuppressWildcards InvalidationTracker.Observer>
+	lateinit var databaseObserversProvider: Provider<Set<@JvmSuppressWildcards InvalidationTracker.Observer>>
 
 	@Inject
 	lateinit var activityLifecycleCallbacks: Set<@JvmSuppressWildcards ActivityLifecycleCallbacks>
 
 	@Inject
-	lateinit var database: MangaDatabase
+	lateinit var database: Provider<MangaDatabase>
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -56,12 +60,26 @@ open class BaseApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workManagerProvider: Provider<WorkManager>
 
+	override val workManagerConfiguration: Configuration
+		get() = Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
+
 	override fun onCreate() {
 		super.onCreate()
-		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
 		AppCompatDelegate.setDefaultNightMode(settings.theme)
 		AppCompatDelegate.setApplicationLocales(settings.appLocales)
+		// TLS 1.3 support for Android < 10
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			Security.insertProviderAt(Conscrypt.newProvider(), 1)
+		}
 		setupActivityLifecycleCallbacks()
+		processLifecycleScope.launch {
+			val isOriginalApp = withContext(Dispatchers.Default) {
+				appValidator.isOriginalApp
+			}
+			ACRA.errorReporter.putCustomData("isOriginalApp", isOriginalApp.toString())
+		}
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
@@ -69,18 +87,11 @@ open class BaseApp : Application(), Configuration.Provider {
 		WorkServiceStopHelper(workManagerProvider).setup()
 	}
 
-	override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context) {
 		super.attachBaseContext(base)
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
 			reportFormat = StringFormat.JSON
-			excludeMatchingSharedPreferencesKeys = listOf(
-				"sources_\\w+",
-				AppSettings.KEY_APP_PASSWORD,
-				AppSettings.KEY_PROXY_LOGIN,
-				AppSettings.KEY_PROXY_ADDRESS,
-				AppSettings.KEY_PROXY_PASSWORD,
-			)
 			httpSender {
 				uri = getString(R.string.url_error_report)
 				basicAuthLogin = getString(R.string.acra_login)
@@ -97,7 +108,6 @@ open class BaseApp : Application(), Configuration.Provider {
 				ReportField.STACK_TRACE,
 				ReportField.CRASH_CONFIGURATION,
 				ReportField.CUSTOM_DATA,
-				ReportField.SHARED_PREFERENCES,
 			)
 
 			dialog {
@@ -110,16 +120,10 @@ open class BaseApp : Application(), Configuration.Provider {
 		}
 	}
 
-	override fun getWorkManagerConfiguration(): Configuration {
-		return Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
-	}
-
 	@WorkerThread
 	private fun setupDatabaseObservers() {
-		val tracker = database.invalidationTracker
-		databaseObservers.forEach {
+		val tracker = database.get().invalidationTracker
+		databaseObserversProvider.get().forEach {
 			tracker.addObserver(it)
 		}
 	}

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

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.core
+
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.app.PendingIntentCompat
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.report
+
+class ErrorReporterReceiver : BroadcastReceiver() {
+
+	override fun onReceive(context: Context?, intent: Intent?) {
+		val e = intent?.getSerializableExtraCompat<Throwable>(EXTRA_ERROR) ?: return
+		e.report()
+	}
+
+	companion object {
+
+		private const val EXTRA_ERROR = "err"
+		private const val ACTION_REPORT = "${BuildConfig.APPLICATION_ID}.action.REPORT_ERROR"
+
+		fun getPendingIntent(context: Context, e: Throwable): PendingIntent {
+			val intent = Intent(context, ErrorReporterReceiver::class.java)
+			intent.setAction(ACTION_REPORT)
+			intent.setData(Uri.parse("err://${e.hashCode()}"))
+			intent.putExtra(EXTRA_ERROR, e)
+			return checkNotNull(PendingIntentCompat.getBroadcast(context, 0, intent, 0, false))
+		}
+	}
+}

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

@@ -0,0 +1,24 @@
+package org.koitharu.kotatsu.core
+
+import android.content.Context
+import com.google.auto.service.AutoService
+import org.acra.builder.ReportBuilder
+import org.acra.config.CoreConfiguration
+import org.acra.config.ReportingAdministrator
+
+@AutoService(ReportingAdministrator::class)
+class ErrorReportingAdmin : ReportingAdministrator {
+
+	override fun shouldStartCollecting(
+		context: Context,
+		config: CoreConfiguration,
+		reportBuilder: ReportBuilder
+	): Boolean {
+		return reportBuilder.exception?.isDeadOs() != true
+	}
+
+	private fun Throwable.isDeadOs(): Boolean {
+		val className = javaClass.simpleName
+		return className == "DeadSystemException" || className == "DeadSystemRuntimeException" || cause?.isDeadOs() == true
+	}
+}

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

@@ -3,17 +3,20 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONArray
 
 class BackupEntry(
-	val name: String,
+	val name: Name,
 	val data: JSONArray
 ) {
 
-	companion object Names {
+	enum class Name(
+		val key: String,
+	) {
 
-		const val INDEX = "index"
-		const val HISTORY = "history"
-		const val CATEGORIES = "categories"
-		const val FAVOURITES = "favourites"
-		const val SETTINGS = "settings"
-		const val BOOKMARKS = "bookmarks"
+		INDEX("index"),
+		HISTORY("history"),
+		CATEGORIES("categories"),
+		FAVOURITES("favourites"),
+		SETTINGS("settings"),
+		BOOKMARKS("bookmarks"),
+		SOURCES("sources"),
 	}
 }

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

@@ -7,8 +7,10 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.util.Date
 import javax.inject.Inject
 
 private const val PAGE_SIZE = 10
@@ -20,9 +22,9 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpHistory(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.HISTORY, JSONArray())
 		while (true) {
-			val history = db.historyDao.findAll(offset, PAGE_SIZE)
+			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
 				break
 			}
@@ -41,8 +43,8 @@ class BackupRepository @Inject constructor(
 	}
 
 	suspend fun dumpCategories(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
-		val categories = db.favouriteCategoriesDao.findAll()
+		val entry = BackupEntry(BackupEntry.Name.CATEGORIES, JSONArray())
+		val categories = db.getFavouriteCategoriesDao().findAll()
 		for (item in categories) {
 			entry.data.put(JsonSerializer(item).toJson())
 		}
@@ -51,9 +53,9 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpFavourites(): BackupEntry {
 		var offset = 0
-		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAllRaw(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -72,8 +74,8 @@ class BackupRepository @Inject constructor(
 	}
 
 	suspend fun dumpBookmarks(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
-		val all = db.bookmarksDao.findAll()
+		val entry = BackupEntry(BackupEntry.Name.BOOKMARKS, JSONArray())
+		val all = db.getBookmarksDao().findAll()
 		for ((m, b) in all) {
 			val json = JSONObject()
 			val manga = JsonSerializer(m.manga).toJson()
@@ -90,7 +92,7 @@ class BackupRepository @Inject constructor(
 	}
 
 	fun dumpSettings(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.SETTINGS, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.SETTINGS, JSONArray())
 		val settingsDump = settings.getAllValues().toMutableMap()
 		settingsDump.remove(AppSettings.KEY_APP_PASSWORD)
 		settingsDump.remove(AppSettings.KEY_PROXY_PASSWORD)
@@ -101,8 +103,18 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
+	suspend fun dumpSources(): BackupEntry {
+		val entry = BackupEntry(BackupEntry.Name.SOURCES, JSONArray())
+		val all = db.getSourcesDao().findAll()
+		for (source in all) {
+			val json = JsonSerializer(source).toJson()
+			entry.data.put(json)
+		}
+		return entry
+	}
+
 	fun createIndex(): BackupEntry {
-		val entry = BackupEntry(BackupEntry.INDEX, JSONArray())
+		val entry = BackupEntry(BackupEntry.Name.INDEX, JSONArray())
 		val json = JSONObject()
 		json.put("app_id", BuildConfig.APPLICATION_ID)
 		json.put("app_version", BuildConfig.VERSION_CODE)
@@ -111,6 +123,11 @@ class BackupRepository @Inject constructor(
 		return entry
 	}
 
+	fun getBackupDate(entry: BackupEntry?): Date? {
+		val timestamp = entry?.data?.optJSONObject(0)?.getLongOrDefault("created_at", 0) ?: 0
+		return if (timestamp == 0L) null else Date(timestamp)
+	}
+
 	suspend fun restoreHistory(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {
@@ -122,9 +139,9 @@ class BackupRepository @Inject constructor(
 			val history = JsonDeserializer(item).toHistoryEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.historyDao.upsert(history)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getHistoryDao().upsert(history)
 				}
 			}
 		}
@@ -136,7 +153,7 @@ class BackupRepository @Inject constructor(
 		for (item in entry.data.JSONIterator()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
 			result += runCatchingCancellable {
-				db.favouriteCategoriesDao.upsert(category)
+				db.getFavouriteCategoriesDao().upsert(category)
 			}
 		}
 		return result
@@ -153,9 +170,9 @@ class BackupRepository @Inject constructor(
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.favouritesDao.upsert(favourite)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getFavouritesDao().upsert(favourite)
 				}
 			}
 		}
@@ -175,15 +192,26 @@ class BackupRepository @Inject constructor(
 			}
 			result += runCatchingCancellable {
 				db.withTransaction {
-					db.tagsDao.upsert(tags)
-					db.mangaDao.upsert(manga, tags)
-					db.bookmarksDao.upsert(bookmarks)
+					db.getTagsDao().upsert(tags)
+					db.getMangaDao().upsert(manga, tags)
+					db.getBookmarksDao().upsert(bookmarks)
 				}
 			}
 		}
 		return result
 	}
 
+	suspend fun restoreSources(entry: BackupEntry): CompositeResult {
+		val result = CompositeResult()
+		for (item in entry.data.JSONIterator()) {
+			val source = JsonDeserializer(item).toMangaSourceEntity()
+			result += runCatchingCancellable {
+				db.getSourcesDao().upsert(source)
+			}
+		}
+		return result
+	}
+
 	fun restoreSettings(entry: BackupEntry): CompositeResult {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {

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

@@ -1,25 +1,59 @@
 package org.koitharu.kotatsu.core.backup
 
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.json.JSONArray
+import org.koitharu.kotatsu.core.exceptions.BadBackupFormatException
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import java.io.File
+import java.util.EnumSet
+import java.util.zip.ZipException
 import java.util.zip.ZipFile
 
-class BackupZipInput(val file: File) : Closeable {
+class BackupZipInput private constructor(val file: File) : Closeable {
 
 	private val zipFile = ZipFile(file)
 
-	suspend fun getEntry(name: String): BackupEntry? = runInterruptible(Dispatchers.IO) {
-		val entry = zipFile.getEntry(name) ?: return@runInterruptible null
+	suspend fun getEntry(name: BackupEntry.Name): BackupEntry? = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name.key) ?: return@runInterruptible null
 		val json = zipFile.getInputStream(entry).use {
 			JSONArray(it.bufferedReader().readText())
 		}
 		BackupEntry(name, json)
 	}
 
+	suspend fun entries(): Set<BackupEntry.Name> = runInterruptible(Dispatchers.IO) {
+		zipFile.entries().toList().mapNotNullTo(EnumSet.noneOf(BackupEntry.Name::class.java)) { ze ->
+			BackupEntry.Name.entries.find { it.key == ze.name }
+		}
+	}
+
 	override fun close() {
 		zipFile.close()
 	}
+
+	fun cleanupAsync() {
+		processLifecycleScope.launch(Dispatchers.IO, CoroutineStart.ATOMIC) {
+			runCatching {
+				close()
+				file.delete()
+			}
+		}
+	}
+
+	companion object {
+
+		fun from(file: File): BackupZipInput = try {
+			val res = BackupZipInput(file)
+			if (res.zipFile.getEntry("index") == null) {
+				throw BadBackupFormatException(null)
+			}
+			res
+		} catch (e: ZipException) {
+			throw BadBackupFormatException(e)
+		}
+	}
 }

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

@@ -5,10 +5,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.format
 import org.koitharu.kotatsu.core.zip.ZipOutput
 import java.io.File
-import java.util.Date
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.util.Locale
 import java.util.zip.Deflater
 
@@ -17,7 +17,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)
 
 	suspend fun put(entry: BackupEntry) = runInterruptible(Dispatchers.IO) {
-		output.put(entry.name, entry.data.toString(2))
+		output.put(entry.name.key, entry.data.toString(2))
 	}
 
 	suspend fun finish() = runInterruptible(Dispatchers.IO) {
@@ -29,7 +29,7 @@ class BackupZipOutput(val file: File) : Closeable {
 	}
 }
 
-private const val DIR_BACKUPS = "backups"
+const val DIR_BACKUPS = "backups"
 
 suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
 	val dir = context.run {
@@ -39,7 +39,7 @@ suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptibl
 	val filename = buildString {
 		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
 		append('_')
-		append(Date().format("ddMMyyyy"))
+		append(LocalDate.now().format(DateTimeFormatter.ofPattern("ddMMyyyy")))
 		append(".bk.zip")
 	}
 	BackupZipOutput(File(dir, filename))

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONObject
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -53,6 +54,7 @@ class JsonDeserializer(private val json: JSONObject) {
 		page = json.getInt("page"),
 		scroll = json.getDouble("scroll").toFloat(),
 		percent = json.getFloatOrDefault("percent", -1f),
+		chaptersCount = json.getIntOrDefault("chapters", -1),
 		deletedAt = 0L,
 	)
 
@@ -78,6 +80,12 @@ class JsonDeserializer(private val json: JSONObject) {
 		percent = json.getDouble("percent").toFloat(),
 	)
 
+	fun toMangaSourceEntity() = MangaSourceEntity(
+		source = json.getString("source"),
+		isEnabled = json.getBoolean("enabled"),
+		sortKey = json.getInt("sort_key"),
+	)
+
 	fun toMap(): Map<String, Any?> {
 		val map = mutableMapOf<String, Any?>()
 		val keys = json.keys()

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.backup
 import org.json.JSONObject
 import org.koitharu.kotatsu.bookmarks.data.BookmarkEntity
 import org.koitharu.kotatsu.core.db.entity.MangaEntity
+import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteCategoryEntity
 import org.koitharu.kotatsu.favourites.data.FavouriteEntity
@@ -40,6 +41,7 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("page", e.page)
 			put("scroll", e.scroll)
 			put("percent", e.percent)
+			put("chapters", e.chaptersCount)
 		},
 	)
 
@@ -82,6 +84,14 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 		},
 	)
 
+	constructor(e: MangaSourceEntity) : this(
+		JSONObject().apply {
+			put("source", e.source)
+			put("enabled", e.isEnabled)
+			put("sort_key", e.sortKey)
+		},
+	)
+
 	constructor(m: Map<String, *>) : this(
 		JSONObject(m),
 	)

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

@@ -1,44 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-interface ContentCache {
-
-	val isCachingEnabled: Boolean
-
-	suspend fun getDetails(source: MangaSource, url: String): Manga?
-
-	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>)
-
-	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>?
-
-	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>)
-
-	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>?
-
-	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>)
-
-	class Key(
-		val source: MangaSource,
-		val url: String,
-	) {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Key
-
-			if (source != other.source) return false
-			return url == other.url
-		}
-
-		override fun hashCode(): Int {
-			var result = source.hashCode()
-			result = 31 * result + url.hashCode()
-			return result
-		}
-	}
-}

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

@@ -2,24 +2,27 @@ package org.koitharu.kotatsu.core.cache
 
 import androidx.collection.LruCache
 import java.util.concurrent.TimeUnit
+import org.koitharu.kotatsu.core.cache.MemoryContentCache.Key as CacheKey
 
 class ExpiringLruCache<T>(
 	val maxSize: Int,
 	private val lifetime: Long,
 	private val timeUnit: TimeUnit,
-) {
+) : Iterable<CacheKey> {
 
-	private val cache = LruCache<ContentCache.Key, ExpiringValue<T>>(maxSize)
+	private val cache = LruCache<CacheKey, ExpiringValue<T>>(maxSize)
 
-	operator fun get(key: ContentCache.Key): T? {
-		val value = cache.get(key) ?: return null
+	override fun iterator(): Iterator<CacheKey> = cache.snapshot().keys.iterator()
+
+	operator fun get(key: CacheKey): T? {
+		val value = cache[key] ?: return null
 		if (value.isExpired) {
 			cache.remove(key)
 		}
 		return value.get()
 	}
 
-	operator fun set(key: ContentCache.Key, value: T) {
+	operator fun set(key: CacheKey, value: T) {
 		cache.put(key, ExpiringValue(value, lifetime, timeUnit))
 	}
 
@@ -30,4 +33,8 @@ class ExpiringLruCache<T>(
 	fun trimToSize(size: Int) {
 		cache.trimToSize(size)
 	}
+
+	fun remove(key: CacheKey) {
+		cache.remove(key)
+	}
 }

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

@@ -3,45 +3,57 @@ package org.koitharu.kotatsu.core.cache
 import android.app.Application
 import android.content.ComponentCallbacks2
 import android.content.res.Configuration
+import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class MemoryContentCache(application: Application) : ContentCache, ComponentCallbacks2 {
+@Singleton
+class MemoryContentCache @Inject constructor(application: Application) : ComponentCallbacks2 {
+
+	private val isLowRam = application.isLowRamDevice()
 
 	init {
 		application.registerComponentCallbacks(this)
 	}
 
-	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(4, 5, TimeUnit.MINUTES)
-	private val pagesCache = ExpiringLruCache<SafeDeferred<List<MangaPage>>>(4, 10, TimeUnit.MINUTES)
-	private val relatedMangaCache = ExpiringLruCache<SafeDeferred<List<Manga>>>(4, 10, TimeUnit.MINUTES)
+	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(if (isLowRam) 1 else 4, 5, TimeUnit.MINUTES)
+	private val pagesCache =
+		ExpiringLruCache<SafeDeferred<List<MangaPage>>>(if (isLowRam) 1 else 4, 10, TimeUnit.MINUTES)
+	private val relatedMangaCache =
+		ExpiringLruCache<SafeDeferred<List<Manga>>>(if (isLowRam) 1 else 3, 10, TimeUnit.MINUTES)
 
-	override val isCachingEnabled: Boolean = true
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? {
-		return detailsCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	suspend fun getDetails(source: MangaSource, url: String): Manga? {
+		return detailsCache[Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
-		detailsCache[ContentCache.Key(source, url)] = details
+	fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) {
+		detailsCache[Key(source, url)] = details
 	}
 
-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
-		return pagesCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? {
+		return pagesCache[Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
-		pagesCache[ContentCache.Key(source, url)] = pages
+	fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) {
+		pagesCache[Key(source, url)] = pages
 	}
 
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
-		return relatedMangaCache[ContentCache.Key(source, url)]?.awaitOrNull()
+	suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? {
+		return relatedMangaCache[Key(source, url)]?.awaitOrNull()
 	}
 
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
-		relatedMangaCache[ContentCache.Key(source, url)] = related
+	fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) {
+		relatedMangaCache[Key(source, url)] = related
+	}
+
+	fun clear(source: MangaSource) {
+		clearCache(detailsCache, source)
+		clearCache(pagesCache, source)
+		clearCache(relatedMangaCache, source)
 	}
 
 	override fun onConfigurationChanged(newConfig: Configuration) = Unit
@@ -67,4 +79,17 @@ class MemoryContentCache(application: Application) : ContentCache, ComponentCall
 			else -> cache.trimToSize(cache.maxSize / 2)
 		}
 	}
+
+	private fun clearCache(cache: ExpiringLruCache<*>, source: MangaSource) {
+		cache.forEach { key ->
+			if (key.source == source) {
+				cache.remove(key)
+			}
+		}
+	}
+
+	data class Key(
+		val source: MangaSource,
+		val url: String,
+	)
 }

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

@@ -1,22 +0,0 @@
-package org.koitharu.kotatsu.core.cache
-
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.model.MangaSource
-
-class StubContentCache : ContentCache {
-
-	override val isCachingEnabled: Boolean = false
-
-	override suspend fun getDetails(source: MangaSource, url: String): Manga? = null
-
-	override fun putDetails(source: MangaSource, url: String, details: SafeDeferred<Manga>) = Unit
-
-	override suspend fun getPages(source: MangaSource, url: String): List<MangaPage>? = null
-
-	override fun putPages(source: MangaSource, url: String, pages: SafeDeferred<List<MangaPage>>) = Unit
-
-	override suspend fun getRelatedManga(source: MangaSource, url: String): List<Manga>? = null
-
-	override fun putRelatedManga(source: MangaSource, url: String, related: SafeDeferred<List<Manga>>) = Unit
-}

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

@@ -6,6 +6,7 @@ import androidx.room.InvalidationTracker
 import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -28,6 +29,9 @@ import org.koitharu.kotatsu.core.db.migrations.Migration13To14
 import org.koitharu.kotatsu.core.db.migrations.Migration14To15
 import org.koitharu.kotatsu.core.db.migrations.Migration15To16
 import org.koitharu.kotatsu.core.db.migrations.Migration16To17
+import org.koitharu.kotatsu.core.db.migrations.Migration17To18
+import org.koitharu.kotatsu.core.db.migrations.Migration18To19
+import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
@@ -46,48 +50,52 @@ import org.koitharu.kotatsu.history.data.HistoryDao
 import org.koitharu.kotatsu.history.data.HistoryEntity
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingDao
 import org.koitharu.kotatsu.scrobbling.common.data.ScrobblingEntity
+import org.koitharu.kotatsu.stats.data.StatsDao
+import org.koitharu.kotatsu.stats.data.StatsEntity
 import org.koitharu.kotatsu.suggestions.data.SuggestionDao
 import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 17
+const val DATABASE_VERSION = 20
 
 @Database(
 	entities = [
 		MangaEntity::class, TagEntity::class, HistoryEntity::class, MangaTagsEntity::class,
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class, BookmarkEntity::class,
-		ScrobblingEntity::class, MangaSourceEntity::class,
+		ScrobblingEntity::class, MangaSourceEntity::class, StatsEntity::class,
 	],
 	version = DATABASE_VERSION,
 )
 abstract class MangaDatabase : RoomDatabase() {
 
-	abstract val historyDao: HistoryDao
+	abstract fun getHistoryDao(): HistoryDao
 
-	abstract val tagsDao: TagsDao
+	abstract fun getTagsDao(): TagsDao
 
-	abstract val mangaDao: MangaDao
+	abstract fun getMangaDao(): MangaDao
 
-	abstract val favouritesDao: FavouritesDao
+	abstract fun getFavouritesDao(): FavouritesDao
 
-	abstract val preferencesDao: PreferencesDao
+	abstract fun getPreferencesDao(): PreferencesDao
 
-	abstract val favouriteCategoriesDao: FavouriteCategoriesDao
+	abstract fun getFavouriteCategoriesDao(): FavouriteCategoriesDao
 
-	abstract val tracksDao: TracksDao
+	abstract fun getTracksDao(): TracksDao
 
-	abstract val trackLogsDao: TrackLogsDao
+	abstract fun getTrackLogsDao(): TrackLogsDao
 
-	abstract val suggestionDao: SuggestionDao
+	abstract fun getSuggestionDao(): SuggestionDao
 
-	abstract val bookmarksDao: BookmarksDao
+	abstract fun getBookmarksDao(): BookmarksDao
 
-	abstract val scrobblingDao: ScrobblingDao
+	abstract fun getScrobblingDao(): ScrobblingDao
 
-	abstract val sourcesDao: MangaSourcesDao
+	abstract fun getSourcesDao(): MangaSourcesDao
+
+	abstract fun getStatsDao(): StatsDao
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
@@ -107,6 +115,9 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration14To15(),
 	Migration15To16(),
 	Migration16To17(context),
+	Migration17To18(),
+	Migration18To19(),
+	Migration19To20(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room
@@ -118,7 +129,7 @@ fun MangaDatabase(context: Context): MangaDatabase = Room
 fun InvalidationTracker.removeObserverAsync(observer: InvalidationTracker.Observer) {
 	val scope = processLifecycleScope
 	if (scope.isActive) {
-		processLifecycleScope.launch(Dispatchers.Default) {
+		processLifecycleScope.launch(Dispatchers.Default, CoroutineStart.ATOMIC) {
 			removeObserver(observer)
 		}
 	}

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

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

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -23,6 +24,13 @@ abstract class MangaDao {
 	@Query("SELECT * FROM manga WHERE public_url = :publicUrl")
 	abstract suspend fun findByPublicUrl(publicUrl: String): MangaWithTags?
 
+	@Transaction
+	@Query("SELECT * FROM manga WHERE source = :source")
+	abstract suspend fun findAllBySource(source: String): List<MangaWithTags>
+
+	@Query("SELECT author FROM manga WHERE author LIKE :query GROUP BY author ORDER BY COUNT(author) DESC LIMIT :limit")
+	abstract suspend fun findAuthors(query: String, limit: Int): List<String>
+
 	@Transaction
 	@Query("SELECT * FROM manga WHERE (title LIKE :query OR alt_title LIKE :query) AND manga_id IN (SELECT manga_id FROM favourites UNION SELECT manga_id FROM history) LIMIT :limit")
 	abstract suspend fun searchByTitle(query: String, limit: Int): List<MangaWithTags>
@@ -32,7 +40,7 @@ abstract class MangaDao {
 	abstract suspend fun searchByTitle(query: String, source: String, limit: Int): List<MangaWithTags>
 
 	@Upsert
-	abstract suspend fun upsert(manga: MangaEntity)
+	protected abstract suspend fun upsert(manga: MangaEntity)
 
 	@Update(onConflict = OnConflictStrategy.IGNORE)
 	abstract suspend fun update(manga: MangaEntity): Int
@@ -43,6 +51,10 @@ abstract class MangaDao {
 	@Query("DELETE FROM manga_tags WHERE manga_id = :mangaId")
 	abstract suspend fun clearTagRelation(mangaId: Long)
 
+	@Transaction
+	@Delete
+	abstract suspend fun delete(subjects: Collection<MangaEntity>)
+
 	@Transaction
 	open suspend fun upsert(manga: MangaEntity, tags: Iterable<TagEntity>? = null) {
 		upsert(manga)

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

@@ -4,10 +4,15 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.RawQuery
 import androidx.room.Transaction
 import androidx.room.Upsert
+import androidx.sqlite.db.SimpleSQLiteQuery
+import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
+import org.intellij.lang.annotations.Language
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
 @Dao
 abstract class MangaSourcesDao {
@@ -15,15 +20,15 @@ abstract class MangaSourcesDao {
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
-
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
+	@Query("SELECT source FROM sources WHERE enabled = 1")
+	abstract suspend fun findAllEnabledNames(): List<String>
 
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
+	@Query("SELECT enabled FROM sources WHERE source = :source")
+	abstract fun observeIsEnabled(source: String): Flow<Boolean>
+
 	@Query("SELECT IFNULL(MAX(sort_key),0) FROM sources")
 	abstract suspend fun getMaxSortKey(): Int
 
@@ -40,6 +45,22 @@ abstract class MangaSourcesDao {
 	@Upsert
 	abstract suspend fun upsert(entry: MangaSourceEntity)
 
+	fun observeEnabled(order: SourcesSortOrder): Flow<List<MangaSourceEntity>> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		return observeImpl(query)
+	}
+
+	suspend fun findAllEnabled(order: SourcesSortOrder): List<MangaSourceEntity> {
+		val orderBy = getOrderBy(order)
+
+		@Language("RoomSql")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		return findAllImpl(query)
+	}
+
 	@Transaction
 	open suspend fun setEnabled(source: String, isEnabled: Boolean) {
 		if (updateIsEnabled(source, isEnabled) == 0) {
@@ -54,4 +75,16 @@ abstract class MangaSourcesDao {
 
 	@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
 	protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
+
+	@RawQuery(observedEntities = [MangaSourceEntity::class])
+	protected abstract fun observeImpl(query: SupportSQLiteQuery): Flow<List<MangaSourceEntity>>
+
+	@RawQuery
+	protected abstract suspend fun findAllImpl(query: SupportSQLiteQuery): List<MangaSourceEntity>
+
+	private fun getOrderBy(order: SourcesSortOrder) = when (order) {
+		SourcesSortOrder.ALPHABETIC -> "source ASC"
+		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
+		SourcesSortOrder.MANUAL -> "sort_key ASC"
+	}
 }

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

@@ -31,6 +31,16 @@ abstract class TagsDao {
 	)
 	abstract suspend fun findPopularTags(source: String, limit: Int): List<TagEntity>
 
+	@Query(
+		"""SELECT tags.* FROM tags
+		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE tags.source = :source  
+		GROUP BY tags.title
+		ORDER BY COUNT(manga_id) ASC 
+		LIMIT :limit""",
+	)
+	abstract suspend fun findRareTags(source: String, limit: Int): List<TagEntity>
+
 	@Query(
 		"""SELECT tags.* FROM tags
 		LEFT JOIN manga_tags ON tags.tag_id = manga_tags.tag_id 
@@ -51,6 +61,28 @@ abstract class TagsDao {
 	)
 	abstract suspend fun findTags(query: String, limit: Int): List<TagEntity>
 
+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id = :tagId)
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(tagId: Long): List<TagEntity>
+
+	@Query(
+		"""
+		SELECT tags.* FROM manga_tags 
+		LEFT JOIN tags ON tags.tag_id = manga_tags.tag_id 
+		WHERE manga_tags.manga_id IN (SELECT manga_id FROM manga_tags WHERE tag_id IN (:ids))
+		GROUP BY tags.tag_id 
+		ORDER BY COUNT(manga_id) DESC;
+	""",
+	)
+	abstract suspend fun findRelatedTags(ids: Set<Long>): List<TagEntity>
+
 	@Upsert
 	abstract suspend fun upsert(tags: Iterable<TagEntity>)
 }

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

@@ -1,6 +1,10 @@
 package org.koitharu.kotatsu.core.db.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogWithManga
@@ -12,18 +16,24 @@ interface TrackLogsDao {
 	@Query("SELECT * FROM track_logs ORDER BY created_at DESC LIMIT :limit OFFSET 0")
 	fun observeAll(limit: Int): Flow<List<TrackLogWithManga>>
 
+	@Query("SELECT COUNT(*) FROM track_logs WHERE unread = 1")
+	fun observeUnreadCount(): Flow<Int>
+
 	@Query("DELETE FROM track_logs")
 	suspend fun clear()
 
+	@Query("UPDATE track_logs SET unread = 0 WHERE id = :id")
+	suspend fun markAsRead(id: Long)
+
 	@Insert(onConflict = OnConflictStrategy.REPLACE)
 	suspend fun insert(entity: TrackLogEntity): Long
 
-	@Query("DELETE FROM track_logs WHERE manga_id = :mangaId")
-	suspend fun removeAll(mangaId: Long)
-
 	@Query("DELETE FROM track_logs WHERE manga_id NOT IN (SELECT manga_id FROM tracks)")
 	suspend fun gc()
 
+	@Query("DELETE FROM track_logs WHERE id IN (SELECT id FROM track_logs ORDER BY created_at DESC LIMIT 0 OFFSET :size)")
+	suspend fun trim(size: Int)
+
 	@Query("SELECT COUNT(*) FROM track_logs")
 	suspend fun count(): Int
 }

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

@@ -19,6 +19,8 @@ fun TagEntity.toMangaTag() = MangaTag(
 
 fun Collection<TagEntity>.toMangaTags() = mapToSet(TagEntity::toMangaTag)
 
+fun Collection<TagEntity>.toMangaTagsList() = map(TagEntity::toMangaTag)
+
 fun MangaEntity.toManga(tags: Set<MangaTag>) = Manga(
 	id = this.id,
 	title = this.title,

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

@@ -24,4 +24,5 @@ data class MangaPrefsEntity(
 	@ColumnInfo(name = "cf_brightness") val cfBrightness: Float,
 	@ColumnInfo(name = "cf_contrast") val cfContrast: Float,
 	@ColumnInfo(name = "cf_invert") val cfInvert: Boolean,
+	@ColumnInfo(name = "cf_grayscale") val cfGrayscale: Boolean,
 )

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

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

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

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

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration10To11 : Migration(10, 11) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL(
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL(
 			"""
 			CREATE TABLE IF NOT EXISTS `bookmarks` (
 				`manga_id` INTEGER NOT NULL,
@@ -20,7 +20,7 @@ class Migration10To11 : Migration(10, 11) {
 				FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )
 			""".trimIndent()
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_manga_id` ON `bookmarks` (`manga_id`)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS `index_bookmarks_page_id` ON `bookmarks` (`page_id`)")
 	}
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration11To12 : Migration(11, 12) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL(
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL(
 			"""
 			CREATE TABLE IF NOT EXISTS `scrobblings` (
 				`scrobbler` INTEGER NOT NULL,
@@ -21,7 +21,7 @@ class Migration11To12 : Migration(11, 12) {
 			)
 			""".trimIndent()
 		)
-		database.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
-		database.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		db.execSQL("ALTER TABLE history ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
+		db.execSQL("ALTER TABLE bookmarks ADD COLUMN `percent` REAL NOT NULL DEFAULT -1")
 	}
 }

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration12To13 : Migration(12, 13) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `show_in_lib` INTEGER NOT NULL DEFAULT 1")
+		db.execSQL("ALTER TABLE favourites ADD COLUMN `sort_key` INTEGER NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,11 +5,11 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration13To14 : Migration(13, 14) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE favourites ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE history ADD COLUMN `deleted_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_brightness` REAL NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_contrast` REAL NOT NULL DEFAULT 0")
 	}
 }

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

@@ -5,5 +5,5 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration14To15 : Migration(14, 15) {
 
-	override fun migrate(database: SupportSQLiteDatabase) = Unit
+	override fun migrate(db: SupportSQLiteDatabase) = Unit
 }

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration15To16 : Migration(15, 16) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE preferences ADD COLUMN `cf_invert` INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_invert` INTEGER NOT NULL DEFAULT 0")
 	}
 }

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

@@ -10,9 +10,9 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 
 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
-		database.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
+		db.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
 		val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
 		val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
 		val sources = MangaSource.entries
@@ -30,7 +30,7 @@ class Migration16To17(context: Context) : Migration(16, 17) {
 					continue
 				}
 			}
-			database.execSQL(
+			db.execSQL(
 				"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
 				arrayOf(name, (!isHidden).toInt(), sortKey),
 			)

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

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration17To18 : Migration(17, 18) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE preferences ADD COLUMN `cf_grayscale` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration18To19 : Migration(18, 19) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE history ADD COLUMN `chapters` INTEGER NOT NULL DEFAULT -1")
+		db.execSQL("CREATE TABLE IF NOT EXISTS `stats` (`manga_id` INTEGER NOT NULL, `started_at` INTEGER NOT NULL, `duration` INTEGER NOT NULL, `pages` INTEGER NOT NULL, PRIMARY KEY(`manga_id`, `started_at`), FOREIGN KEY(`manga_id`) REFERENCES `history`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	}
+}

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

@@ -0,0 +1,18 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration19To20 : Migration(19, 20) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE tracks_bk (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id))")
+		db.execSQL("INSERT INTO tracks_bk SELECT manga_id, chapters_total, last_chapter_id, chapters_new, last_check, last_notified_id FROM tracks")
+		db.execSQL("DROP TABLE tracks")
+		db.execSQL("CREATE TABLE tracks (`manga_id` INTEGER NOT NULL, `last_chapter_id` INTEGER NOT NULL, `chapters_new` INTEGER NOT NULL, `last_check_time` INTEGER NOT NULL, `last_chapter_date` INTEGER NOT NULL, `last_result` INTEGER NOT NULL, PRIMARY KEY(`manga_id`), FOREIGN KEY(`manga_id`) REFERENCES `manga`(`manga_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
+		db.execSQL("INSERT INTO tracks SELECT manga_id, last_chapter_id, chapters_new, last_check AS last_check_time, 0 AS last_chapter_date, 0 AS last_result FROM tracks_bk")
+		db.execSQL("DROP TABLE tracks_bk")
+
+		db.execSQL("ALTER TABLE track_logs ADD COLUMN `unread` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -7,48 +7,48 @@ class Migration1To2 : Migration(1, 2) {
 	/**
 	 * Adding foreign keys
 	 */
-	override fun migrate(database: SupportSQLiteDatabase) {
+	override fun migrate(db: SupportSQLiteDatabase) {
 		/* manga_tags */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS manga_tags_tmp (manga_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id, tag_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE, " +
 					"FOREIGN KEY(tag_id) REFERENCES tags(tag_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_manga_id ON manga_tags_tmp (manga_id)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_tag_id ON manga_tags_tmp (tag_id)")
-		database.execSQL("INSERT INTO manga_tags_tmp (manga_id, tag_id) SELECT manga_id, tag_id FROM manga_tags")
-		database.execSQL("DROP TABLE manga_tags")
-		database.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_manga_id ON manga_tags_tmp (manga_id)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_manga_tags_tag_id ON manga_tags_tmp (tag_id)")
+		db.execSQL("INSERT INTO manga_tags_tmp (manga_id, tag_id) SELECT manga_id, tag_id FROM manga_tags")
+		db.execSQL("DROP TABLE manga_tags")
+		db.execSQL("ALTER TABLE manga_tags_tmp RENAME TO manga_tags")
 		/* favourites */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS favourites_tmp (manga_id INTEGER NOT NULL, category_id INTEGER NOT NULL, created_at INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id, category_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE , " +
 					"FOREIGN KEY(category_id) REFERENCES favourite_categories(category_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_manga_id ON favourites_tmp (manga_id)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_category_id ON favourites_tmp (category_id)")
-		database.execSQL("INSERT INTO favourites_tmp (manga_id, category_id, created_at) SELECT manga_id, category_id, created_at FROM favourites")
-		database.execSQL("DROP TABLE favourites")
-		database.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_manga_id ON favourites_tmp (manga_id)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_favourites_category_id ON favourites_tmp (category_id)")
+		db.execSQL("INSERT INTO favourites_tmp (manga_id, category_id, created_at) SELECT manga_id, category_id, created_at FROM favourites")
+		db.execSQL("DROP TABLE favourites")
+		db.execSQL("ALTER TABLE favourites_tmp RENAME TO favourites")
 		/* history */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS history_tmp (manga_id INTEGER NOT NULL, created_at INTEGER NOT NULL, updated_at INTEGER NOT NULL, chapter_id INTEGER NOT NULL, page INTEGER NOT NULL, " +
 					"PRIMARY KEY(manga_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("INSERT INTO history_tmp (manga_id, created_at, updated_at, chapter_id, page) SELECT manga_id, created_at, updated_at, chapter_id, page FROM history")
-		database.execSQL("DROP TABLE history")
-		database.execSQL("ALTER TABLE history_tmp RENAME TO history")
+		db.execSQL("INSERT INTO history_tmp (manga_id, created_at, updated_at, chapter_id, page) SELECT manga_id, created_at, updated_at, chapter_id, page FROM history")
+		db.execSQL("DROP TABLE history")
+		db.execSQL("ALTER TABLE history_tmp RENAME TO history")
 		/* preferences */
-		database.execSQL(
+		db.execSQL(
 			"CREATE TABLE IF NOT EXISTS preferences_tmp (manga_id INTEGER NOT NULL, mode INTEGER NOT NULL," +
 					" PRIMARY KEY(manga_id), " +
 					"FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )"
 		)
-		database.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
-		database.execSQL("DROP TABLE preferences")
-		database.execSQL("ALTER TABLE preferences_tmp RENAME TO preferences")
+		db.execSQL("INSERT INTO preferences_tmp (manga_id, mode) SELECT manga_id, mode FROM preferences")
+		db.execSQL("DROP TABLE preferences")
+		db.execSQL("ALTER TABLE preferences_tmp RENAME TO preferences")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration2To3 : Migration(2, 3) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE history ADD COLUMN scroll REAL NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration3To4 : Migration(3, 4) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS tracks (manga_id INTEGER NOT NULL, chapters_total INTEGER NOT NULL, last_chapter_id INTEGER NOT NULL, chapters_new INTEGER NOT NULL, last_check INTEGER NOT NULL, last_notified_id INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration4To5 : Migration(4, 5) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN sort_key INTEGER NOT NULL DEFAULT 0")
 	}
-}
+}

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration5To6 : Migration(5, 6) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("CREATE TABLE IF NOT EXISTS track_logs (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, manga_id INTEGER NOT NULL, chapters TEXT NOT NULL, created_at INTEGER NOT NULL, FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE)")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_track_logs_manga_id ON track_logs (manga_id)")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration6To7 : Migration(6, 7) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE manga ADD COLUMN public_url TEXT NOT NULL DEFAULT ''")
 	}
-}
+}

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

@@ -5,9 +5,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration7To8 : Migration(7, 8) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
-		database.execSQL("CREATE TABLE IF NOT EXISTS suggestions (manga_id INTEGER NOT NULL, relevance REAL NOT NULL, created_at INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
-		database.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE manga ADD COLUMN nsfw INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("CREATE TABLE IF NOT EXISTS suggestions (manga_id INTEGER NOT NULL, relevance REAL NOT NULL, created_at INTEGER NOT NULL, PRIMARY KEY(manga_id), FOREIGN KEY(manga_id) REFERENCES manga(manga_id) ON UPDATE NO ACTION ON DELETE CASCADE )")
+		db.execSQL("CREATE INDEX IF NOT EXISTS index_suggestions_manga_id ON suggestions (manga_id)")
 	}
-}
+}

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

@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 
 class Migration8To9 : Migration(8, 9) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `order` TEXT NOT NULL DEFAULT ${SortOrder.NEWEST.name}")
 	}
-}
+}

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

@@ -5,7 +5,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 class Migration9To10 : Migration(9, 10) {
 
-	override fun migrate(database: SupportSQLiteDatabase) {
-		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
 	}
-}
+}

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

@@ -0,0 +1,5 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import java.io.IOException
+
+class BadBackupFormatException(cause: Throwable?) : IOException(cause)

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

@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okhttp3.Headers
+import okio.IOException
+import org.koitharu.kotatsu.parsers.model.MangaSource
+
+class CloudFlareBlockedException(
+	val url: String,
+	val source: MangaSource?,
+) : IOException("Blocked by CloudFlare")

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

@@ -1,8 +0,0 @@
-package org.koitharu.kotatsu.core.exceptions
-
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
-
-class CompositeException(val errors: Collection<Throwable>) : Exception() {
-
-	override val message: String = errors.mapNotNullToSet { it.message }.joinToString()
-}

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

@@ -0,0 +1,7 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import okio.IOException
+
+class NoDataReceivedException(
+	private val url: String,
+) : IOException("No data has been received from $url")

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

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

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

@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.core.exceptions
+
+import org.koitharu.kotatsu.parsers.model.Manga
+
+class UnsupportedSourceException(
+	message: String?,
+	val manga: Manga?,
+) : IllegalArgumentException(message)

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

@@ -21,7 +21,7 @@ abstract class ErrorObserver(
 	private val onResolved: Consumer<Boolean>?,
 ) : FlowCollector<Throwable> {
 
-	protected val activity = host.context.findActivity()
+	protected open val activity = host.context.findActivity()
 
 	private val lifecycleScope: LifecycleCoroutineScope
 		get() = checkNotNull(fragment?.viewLifecycleScope ?: (activity as? LifecycleOwner)?.lifecycle?.coroutineScope)
@@ -36,7 +36,7 @@ abstract class ErrorObserver(
 	private fun isAlive(): Boolean {
 		return when {
 			fragment != null -> fragment.view != null
-			activity != null -> !activity.isDestroyed
+			activity != null -> activity?.isDestroyed == false
 			else -> true
 		}
 	}