Avoid replacing online manga wthin local in database

Currently translated at 100.0% (524 of 524 strings)

Co-authored-by: Abay Emes <abayemes@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/kk/
Translation: Kotatsu/Strings

app/build.gradle

@@ -16,11 +16,12 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 588
-		versionName = '6.2.1'
+		versionCode = 597
+		versionName = '6.3.0'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
+//			arg("room.generateKotlin", "true") TODO: enable later
 			arg("room.schemaLocation", "$projectDir/schemas")
 		}
 		androidResources {
@@ -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,24 +82,25 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:0054d06e6e') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:41eea1c420') {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.10'
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.12.0'
-	implementation 'androidx.activity:activity-ktx:1.8.0'
-	implementation 'androidx.fragment:fragment-ktx:1.6.1'
+	implementation 'androidx.activity:activity-ktx:1.8.1'
+	implementation 'androidx.fragment:fragment-ktx:1.6.2'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-service:2.6.2'
 	implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.recyclerview:recyclerview:1.3.1'
+	implementation 'androidx.recyclerview:recyclerview:1.3.2'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
@@ -114,12 +116,12 @@ 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.0'
+	implementation 'androidx.room:room-ktx:2.6.0'
+	ksp 'androidx.room:room-compiler:2.6.0'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
-	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.11.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0'
 	implementation 'com.squareup.okio:okio:3.6.0'
 
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2'
@@ -127,22 +129,22 @@ dependencies {
 
 	implementation 'com.google.dagger:hilt-android:2.48.1'
 	kapt 'com.google.dagger:hilt-compiler:2.48.1'
-	implementation 'androidx.hilt:hilt-work:1.0.0'
-	kapt 'androidx.hilt:hilt-compiler:1.0.0'
+	implementation 'androidx.hilt:hilt-work:1.1.0'
+	kapt 'androidx.hilt:hilt-compiler:1.1.0'
 
-	implementation 'io.coil-kt:coil-base:2.4.0'
-	implementation 'io.coil-kt:coil-svg:2.4.0'
+	implementation 'io.coil-kt:coil-base:2.5.0'
+	implementation 'io.coil-kt:coil-svg:2.5.0'
 	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:cf089a264d'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
-	implementation 'ch.acra:acra-http:5.11.2'
-	implementation 'ch.acra:acra-dialog:5.11.2'
+	implementation 'ch.acra:acra-http:5.11.3'
+	implementation 'ch.acra:acra-dialog:5.11.3'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
 	testImplementation 'junit:junit:4.13.2'
-	testImplementation 'org.json:json:20230618'
+	testImplementation 'org.json:json:20231013'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
 	androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -152,7 +154,7 @@ dependencies {
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
-	androidTestImplementation 'androidx.room:room-testing:2.5.2'
+	androidTestImplementation 'androidx.room:room-testing:2.6.0'
 	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
 
 	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.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/settings/backup/AppBackupAgentTest.kt

@@ -82,7 +82,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/main/AndroidManifest.xml

@@ -83,6 +83,16 @@
 				<data android:host="kotatsu.app" />
 				<data android:path="/manga" />
 			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+
+				<data android:scheme="kotatsu" />
+				<data android:host="manga" />
+				<data android:host="kotatsu.app" />
+			</intent-filter>
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.reader.ui.ReaderActivity"
@@ -211,6 +221,9 @@
 			</intent-filter>
 
 		</activity>
+		<activity
+			android:name="org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity"
+			android:label="@string/sources_catalog" />
 
 		<service
 			android:name="androidx.work.impl.foreground.SystemForegroundService"
@@ -327,6 +340,13 @@
 				<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
 			</intent-filter>
 		</receiver>
+		<receiver
+			android:name="org.koitharu.kotatsu.core.ErrorReporterReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="${applicationId}.action.REPORT_ERROR" />
+			</intent-filter>
+		</receiver>
 
 		<meta-data
 			android:name="android.webkit.WebView.EnableSafeBrowsing"

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

@@ -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, BookmarksFragment::class.java, null)
 			}
 		}
 	}

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

@@ -48,8 +48,8 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		if (!catchingWebViewUnavailability {
 				setContentView(
 					ActivityBrowserBinding.inflate(
-						layoutInflater
-					)
+						layoutInflater,
+					),
 				)
 			}) {
 			return
@@ -82,9 +82,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 	}
 
 	override fun onDestroy() {
-		viewBinding.webView.run {
-			stopLoading()
-			destroy()
+		runCatching {
+			viewBinding.webView
+		}.onSuccess {
+			it.stopLoading()
+			it.destroy()
 		}
 		super.onDestroy()
 	}

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/backup/BackupRepository.kt

@@ -22,7 +22,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.HISTORY, JSONArray())
 		while (true) {
-			val history = db.historyDao.findAll(offset, PAGE_SIZE)
+			val history = db.getHistoryDao().findAll(offset, PAGE_SIZE)
 			if (history.isEmpty()) {
 				break
 			}
@@ -42,7 +42,7 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpCategories(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.CATEGORIES, JSONArray())
-		val categories = db.favouriteCategoriesDao.findAll()
+		val categories = db.getFavouriteCategoriesDao().findAll()
 		for (item in categories) {
 			entry.data.put(JsonSerializer(item).toJson())
 		}
@@ -53,7 +53,7 @@ class BackupRepository @Inject constructor(
 		var offset = 0
 		val entry = BackupEntry(BackupEntry.FAVOURITES, JSONArray())
 		while (true) {
-			val favourites = db.favouritesDao.findAll(offset, PAGE_SIZE)
+			val favourites = db.getFavouritesDao().findAll(offset, PAGE_SIZE)
 			if (favourites.isEmpty()) {
 				break
 			}
@@ -73,7 +73,7 @@ class BackupRepository @Inject constructor(
 
 	suspend fun dumpBookmarks(): BackupEntry {
 		val entry = BackupEntry(BackupEntry.BOOKMARKS, JSONArray())
-		val all = db.bookmarksDao.findAll()
+		val all = db.getBookmarksDao().findAll()
 		for ((m, b) in all) {
 			val json = JSONObject()
 			val manga = JsonSerializer(m.manga).toJson()
@@ -122,9 +122,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 +136,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 +153,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,9 +175,9 @@ 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)
 				}
 			}
 		}

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

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

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

@@ -66,29 +66,29 @@ const val DATABASE_VERSION = 17
 )
 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
 }
 
 fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(

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,11 +20,11 @@ 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 = 0 ORDER BY sort_key")
+	abstract suspend fun findAllDisabled(): List<MangaSourceEntity>
 
-	@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
-	abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
+	@Query("SELECT * FROM sources WHERE enabled = 0")
+	abstract fun observeDisabled(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT * FROM sources ORDER BY sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
@@ -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/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/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/model/MangaSource.kt

@@ -1,5 +1,8 @@
 package org.koitharu.kotatsu.core.model
 
+import android.content.Context
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toTitleCase
@@ -18,3 +21,18 @@ fun MangaSource(name: String): MangaSource {
 }
 
 fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
+
+@get:StringRes
+val ContentType.titleResId
+	get() = when (this) {
+		ContentType.MANGA -> R.string.content_type_manga
+		ContentType.HENTAI -> R.string.content_type_hentai
+		ContentType.COMICS -> R.string.content_type_comics
+		ContentType.OTHER -> R.string.content_type_other
+	}
+
+fun MangaSource.getSummary(context: Context): String {
+	val type = context.getString(contentType.titleResId)
+	val locale = getLocaleTitle() ?: context.getString(R.string.various_languages)
+	return context.getString(R.string.source_summary_pattern, type, locale)
+}

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

@@ -14,8 +14,8 @@ class CloudFlareInterceptor : Interceptor {
 	override fun intercept(chain: Interceptor.Chain): Response {
 		val response = chain.proceed(chain.request())
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
-			val content = response.body?.source()?.peek()?.use {
-				Jsoup.parse(it.inputStream(), Charsets.UTF_8.name(), response.request.url.toString())
+			val content = response.body?.let { response.peekBody(Long.MAX_VALUE) }?.byteStream()?.use {
+				Jsoup.parse(it, Charsets.UTF_8.name(), response.request.url.toString())
 			} ?: return response
 			if (content.getElementById("challenge-error-title") != null) {
 				val request = response.request

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

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.core.db.entity.toEntities
 import org.koitharu.kotatsu.core.db.entity.toEntity
 import org.koitharu.kotatsu.core.db.entity.toManga
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
+import org.koitharu.kotatsu.core.model.isLocal
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,16 +29,16 @@ class MangaDataRepository @Inject constructor(
 	suspend fun saveReaderMode(manga: Manga, mode: ReaderMode) {
 		db.withTransaction {
 			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
-			db.preferencesDao.upsert(entity.copy(mode = mode.id))
+			val entity = db.getPreferencesDao().find(manga.id) ?: newEntity(manga.id)
+			db.getPreferencesDao().upsert(entity.copy(mode = mode.id))
 		}
 	}
 
 	suspend fun saveColorFilter(manga: Manga, colorFilter: ReaderColorFilter?) {
 		db.withTransaction {
 			storeManga(manga)
-			val entity = db.preferencesDao.find(manga.id) ?: newEntity(manga.id)
-			db.preferencesDao.upsert(
+			val entity = db.getPreferencesDao().find(manga.id) ?: newEntity(manga.id)
+			db.getPreferencesDao().upsert(
 				entity.copy(
 					cfBrightness = colorFilter?.brightness ?: 0f,
 					cfContrast = colorFilter?.contrast ?: 0f,
@@ -48,25 +49,25 @@ class MangaDataRepository @Inject constructor(
 	}
 
 	suspend fun getReaderMode(mangaId: Long): ReaderMode? {
-		return db.preferencesDao.find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
+		return db.getPreferencesDao().find(mangaId)?.let { ReaderMode.valueOf(it.mode) }
 	}
 
 	suspend fun getColorFilter(mangaId: Long): ReaderColorFilter? {
-		return db.preferencesDao.find(mangaId)?.getColorFilterOrNull()
+		return db.getPreferencesDao().find(mangaId)?.getColorFilterOrNull()
 	}
 
 	fun observeColorFilter(mangaId: Long): Flow<ReaderColorFilter?> {
-		return db.preferencesDao.observe(mangaId)
+		return db.getPreferencesDao().observe(mangaId)
 			.map { it?.getColorFilterOrNull() }
 			.distinctUntilChanged()
 	}
 
 	suspend fun findMangaById(mangaId: Long): Manga? {
-		return db.mangaDao.find(mangaId)?.toManga()
+		return db.getMangaDao().find(mangaId)?.toManga()
 	}
 
 	suspend fun findMangaByPublicUrl(publicUrl: String): Manga? {
-		return db.mangaDao.findByPublicUrl(publicUrl)?.toManga()
+		return db.getMangaDao().findByPublicUrl(publicUrl)?.toManga()
 	}
 
 	suspend fun resolveIntent(intent: MangaIntent): Manga? = when {
@@ -77,15 +78,23 @@ class MangaDataRepository @Inject constructor(
 	}
 
 	suspend fun storeManga(manga: Manga) {
-		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			db.tagsDao.upsert(tags)
-			db.mangaDao.upsert(manga.toEntity(), tags)
+			// avoid storing local manga if remote one is already stored
+			val existing = if (manga.isLocal) {
+				db.getMangaDao().find(manga.id)?.manga
+			} else {
+				null
+			}
+			if (existing == null || existing.source == manga.source.name) {
+				val tags = manga.tags.toEntities()
+				db.getTagsDao().upsert(tags)
+				db.getMangaDao().upsert(manga.toEntity(), tags)
+			}
 		}
 	}
 
 	suspend fun findTags(source: MangaSource): Set<MangaTag> {
-		return db.tagsDao.findTags(source.name).toMangaTags()
+		return db.getTagsDao().findTags(source.name).toMangaTags()
 	}
 
 	private fun MangaPrefsEntity.getColorFilterOrNull(): ReaderColorFilter? {

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

@@ -23,14 +23,14 @@ class MangaLinkResolver @Inject constructor(
 ) {
 
 	suspend fun resolve(uri: Uri): Manga {
-		return if (uri.host == "kotatsu.app") {
+		return if (uri.scheme == "kotatsu" || uri.host == "kotatsu.app") {
 			resolveAppLink(uri)
 		} else {
 			resolveExternalLink(uri)
-		} ?: throw NotFoundException("Manga not found", uri.toString())
+		} ?: throw NotFoundException("Cannot resolve link", uri.toString())
 	}
 
-	suspend fun resolveAppLink(uri: Uri): Manga? {
+	private suspend fun resolveAppLink(uri: Uri): Manga? {
 		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
 		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
 		val source = MangaSource(sourceName)
@@ -42,7 +42,7 @@ class MangaLinkResolver @Inject constructor(
 		)
 	}
 
-	suspend fun resolveExternalLink(uri: Uri): Manga? {
+	private suspend fun resolveExternalLink(uri: Uri): Manga? {
 		dataRepository.findMangaByPublicUrl(uri.toString())?.let {
 			return it
 		}

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

@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
 import org.koitharu.kotatsu.core.util.ext.takeIfReadable
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.find
@@ -209,6 +210,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			return policy.isNetworkAllowed(connectivityManager)
 		}
 
+	var sourcesSortOrder: SourcesSortOrder
+		get() = prefs.getEnumValue(KEY_SOURCES_ORDER, SourcesSortOrder.MANUAL)
+		set(value) = prefs.edit { putEnumValue(KEY_SOURCES_ORDER, value) }
+
 	var isSourcesGridMode: Boolean
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, false)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
@@ -354,6 +359,16 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val is32BitColorsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_32BIT_COLOR, false)
 
+	val isPeriodicalBackupEnabled: Boolean
+		get() = prefs.getBoolean(KEY_BACKUP_PERIODICAL_ENABLED, false)
+
+	val periodicalBackupFrequency: Long
+		get() = prefs.getString(KEY_BACKUP_PERIODICAL_FREQUENCY, null)?.toLongOrNull() ?: 7L
+
+	var periodicalBackupOutput: Uri?
+		get() = prefs.getString(KEY_BACKUP_PERIODICAL_OUTPUT, null)?.toUriOrNull()
+		set(value) = prefs.edit { putString(KEY_BACKUP_PERIODICAL_OUTPUT, value?.toString()) }
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -458,6 +473,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
+		const val KEY_BACKUP_PERIODICAL_ENABLED = "backup_periodic"
+		const val KEY_BACKUP_PERIODICAL_FREQUENCY = "backup_periodic_freq"
+		const val KEY_BACKUP_PERIODICAL_OUTPUT = "backup_periodic_output"
+		const val KEY_BACKUP_PERIODICAL_LAST = "backup_periodic_last"
 		const val KEY_HISTORY_GROUPING = "history_grouping"
 		const val KEY_READING_INDICATORS = "reading_indicators"
 		const val KEY_REVERSE_CHAPTERS = "reverse_chapters"
@@ -514,6 +533,8 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_RELATED_MANGA = "related_manga"
 		const val KEY_NAV_MAIN = "nav_main"
 		const val KEY_32BIT_COLOR = "enhanced_colors"
+		const val KEY_SOURCES_ORDER = "sources_sort_order"
+		const val KEY_SOURCES_CATALOG = "sources_catalog"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

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

@@ -6,7 +6,6 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.CallSuper
@@ -96,10 +95,10 @@ abstract class BaseActivity<B : ViewBinding> :
 		insetsDelegate.onViewCreated(binding.root)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem) = if (item.itemId == android.R.id.home) {
-		onBackPressed()
-		true
-	} else super.onOptionsItemSelected(item)
+	override fun onSupportNavigateUp(): Boolean {
+		dispatchNavigateUp()
+		return true
+	}
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 		if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
@@ -150,6 +149,17 @@ abstract class BaseActivity<B : ViewBinding> :
 		window.statusBarColor = defaultStatusBarColor
 	}
 
+	protected open fun dispatchNavigateUp() {
+		val upIntent = parentActivityIntent
+		if (upIntent != null) {
+			if (!navigateUpTo(upIntent)) {
+				startActivity(upIntent)
+			}
+		} else {
+			finishAfterTransition()
+		}
+	}
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}

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

@@ -4,11 +4,11 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.core.text.htmlEncode
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -37,7 +37,7 @@ class ErrorDetailsDialog : AlertDialogFragment<DialogErrorDetailsBinding>() {
 	override fun onViewBindingCreated(binding: DialogErrorDetailsBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		with(binding.textViewMessage) {
-			movementMethod = LinkMovementMethod.getInstance()
+			movementMethod = LinkMovementMethodCompat.getInstance()
 			text = context.getString(
 				R.string.manga_error_description_pattern,
 				exception.message?.htmlEncode().orEmpty(),

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

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.ui.list
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
+
+class RecyclerScrollKeeper(
+	private val rv: RecyclerView,
+) : AdapterDataObserver() {
+
+	private val scrollUpRunnable = Runnable {
+		(rv.layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(0, 0)
+	}
+
+	fun attach() {
+		rv.adapter?.registerAdapterDataObserver(this)
+	}
+
+	override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+		super.onItemRangeInserted(positionStart, itemCount)
+		if (positionStart == 0 && isScrolledToTop()) {
+			postScrollUp()
+		}
+	}
+
+	override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+		super.onItemRangeMoved(fromPosition, toPosition, itemCount)
+		if (toPosition == 0 && isScrolledToTop()) {
+			postScrollUp()
+		}
+	}
+
+	private fun postScrollUp() {
+		rv.postDelayed(scrollUpRunnable, 500L)
+	}
+
+	private fun isScrolledToTop(): Boolean {
+		return (rv.layoutManager as? LinearLayoutManager)?.findFirstVisibleItemPosition() == 0
+	}
+}

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

@@ -0,0 +1,74 @@
+package org.koitharu.kotatsu.core.ui.widgets
+
+import android.content.Context
+import android.util.ArrayMap
+import android.util.AttributeSet
+import com.google.android.material.slider.Slider
+import kotlin.math.cbrt
+import kotlin.math.pow
+
+class CubicSlider @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+) : Slider(context, attrs) {
+
+	private val changeListeners = ArrayMap<OnChangeListener, OnChangeListenerMapper>(1)
+
+	override fun setValue(value: Float) {
+		super.setValue(value.unmap())
+	}
+
+	override fun getValue(): Float {
+		return super.getValue().map()
+	}
+
+	override fun getValueFrom(): Float {
+		return super.getValueFrom().map()
+	}
+
+	override fun setValueFrom(valueFrom: Float) {
+		super.setValueFrom(valueFrom.unmap())
+	}
+
+	override fun getValueTo(): Float {
+		return super.getValueTo().map()
+	}
+
+	override fun setValueTo(valueTo: Float) {
+		super.setValueTo(valueTo.unmap())
+	}
+
+	override fun addOnChangeListener(listener: OnChangeListener) {
+		val mapper = OnChangeListenerMapper(listener)
+		super.addOnChangeListener(mapper)
+		changeListeners[listener] = mapper
+	}
+
+	override fun removeOnChangeListener(listener: OnChangeListener) {
+		changeListeners.remove(listener)?.let {
+			super.removeOnChangeListener(it)
+		}
+	}
+
+	override fun clearOnChangeListeners() {
+		super.clearOnChangeListeners()
+		changeListeners.clear()
+	}
+
+	private fun Float.map(): Float {
+		return this.pow(3)
+	}
+
+	private fun Float.unmap(): Float {
+		return cbrt(this)
+	}
+
+	private inner class OnChangeListenerMapper(
+		private val delegate: OnChangeListener,
+	) : OnChangeListener {
+
+		override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
+			delegate.onValueChange(slider, value.map(), fromUser)
+		}
+	}
+}

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

@@ -26,7 +26,7 @@ class CompositeMutex<T : Any> : Set<T> {
 	}
 
 	override fun isEmpty(): Boolean {
-		return state.isEmpty
+		return state.isEmpty()
 	}
 
 	override fun iterator(): Iterator<T> {

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

@@ -19,7 +19,7 @@ class CompositeMutex2<T : Any> : Set<T> {
 	}
 
 	override fun isEmpty(): Boolean {
-		return delegates.isEmpty
+		return delegates.isEmpty()
 	}
 
 	override fun iterator(): Iterator<T> {

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.util
+
+import androidx.core.os.LocaleListCompat
+import org.koitharu.kotatsu.core.util.ext.map
+import java.util.Locale
+
+class LocaleComparator : Comparator<Locale?> {
+
+	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
+		.map { it.language }
+		.distinct()
+
+	override fun compare(a: Locale?, b: Locale?): Int {
+		return if (a === b) {
+			0
+		} else {
+			val indexA = if (a == null) -1 else deviceLocales.indexOf(a.language)
+			val indexB = if (b == null) -1 else deviceLocales.indexOf(b.language)
+			if (indexA < 0 && indexB < 0) {
+				compareValues(a?.language, b?.language)
+			} else {
+				-2 - (indexA - indexB)
+			}
+		}
+	}
+}

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

@@ -6,13 +6,16 @@ import android.content.res.Configuration
 import android.database.ContentObserver
 import android.os.Handler
 import android.provider.Settings
+import dagger.hilt.android.scopes.ActivityScoped
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.onStart
+import javax.inject.Inject
 
-class ScreenOrientationHelper(private val activity: Activity) {
+@ActivityScoped
+class ScreenOrientationHelper @Inject constructor(private val activity: Activity) {
 
 	val isAutoRotationEnabled: Boolean
 		get() = Settings.System.getInt(
@@ -31,9 +34,15 @@ class ScreenOrientationHelper(private val activity: Activity) {
 			}
 		}
 
-	fun toggleOrientation() {
-		isLandscape = !isLandscape
-	}
+	var isLocked: Boolean
+		get() = activity.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED
+		set(value) {
+			activity.requestedOrientation = if (value) {
+				ActivityInfo.SCREEN_ORIENTATION_LOCKED
+			} else {
+				ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+			}
+		}
 
 	fun observeAutoOrientation() = callbackFlow {
 		val observer = object : ContentObserver(Handler(activity.mainLooper)) {

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

@@ -83,7 +83,7 @@ fun <I> ActivityResultLauncher<I>.tryLaunch(
 	e.printStackTraceDebug()
 }.isSuccess
 
-fun SharedPreferences.observe() = callbackFlow<String?> {
+fun SharedPreferences.observe(): Flow<String?> = callbackFlow {
 	val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
 		trySendBlocking(key)
 	}

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

@@ -23,7 +23,7 @@ fun ImageView.newImageRequest(lifecycleOwner: LifecycleOwner, data: Any?): Image
 			return null
 		}
 	}
-	disposeImageRequest()
+	// disposeImageRequest()
 	return ImageRequest.Builder(context)
 		.data(data)
 		.lifecycle(lifecycleOwner)

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

@@ -8,6 +8,7 @@ import okhttp3.Response
 import okhttp3.internal.closeQuietly
 import okio.IOException
 import org.json.JSONObject
+import org.jsoup.HttpStatusException
 import java.net.HttpURLConnection
 
 private val TYPE_JSON = "application/json".toMediaType()
@@ -34,9 +35,8 @@ val HttpUrl.isHttpOrHttps: Boolean
 
 fun Response.ensureSuccess() = apply {
 	if (!isSuccessful || code == HttpURLConnection.HTTP_NO_CONTENT) {
-		val message = "Invalid response: $code $message at ${request.url}"
 		closeQuietly()
-		throw IllegalStateException(message)
+		throw HttpStatusException(message, code, request.url.toString())
 	}
 }
 

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

@@ -12,6 +12,7 @@ import androidx.core.view.children
 import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.progressindicator.BaseProgressIndicator
 import com.google.android.material.slider.Slider
@@ -68,6 +69,10 @@ inline fun ViewPager2.doOnPageChanged(crossinline callback: (Int) -> Unit) {
 val ViewPager2.recyclerView: RecyclerView?
 	get() = children.firstNotNullOfOrNull { it as? RecyclerView }
 
+fun ViewPager2.findCurrentViewHolder(): ViewHolder? {
+	return recyclerView?.findViewHolderForAdapterPosition(currentItem)
+}
+
 fun View.resetTransformations() {
 	alpha = 1f
 	translationX = 0f

app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DetailsInteractor.kt

@@ -87,5 +87,5 @@ class DetailsInteractor @Inject constructor(
 		}
 	}
 
-	suspend fun findLocal(seed: Manga) = localMangaRepository.getRemoteManga(seed)
+	suspend fun findRemote(seed: Manga) = localMangaRepository.getRemoteManga(seed)
 }

app/src/main/kotlin/org/koitharu/kotatsu/details/domain/DetailsLoadUseCase.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -32,6 +33,7 @@ class DetailsLoadUseCase @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val recoverUseCase: RecoverMangaUseCase,
 	private val imageGetter: Html.ImageGetter,
+	private val networkState: NetworkState,
 ) {
 
 	operator fun invoke(intent: MangaIntent): Flow<MangaDetails> = channelFlow {
@@ -46,6 +48,13 @@ class DetailsLoadUseCase @Inject constructor(
 			null
 		}
 		send(MangaDetails(manga, null, null, false))
+		if (!networkState.value) {
+			// try load offline instead
+			local?.await()?.manga?.let { localManga ->
+				send(MangaDetails(localManga, null, localManga.description?.parseAsHtml(withImages = false), true))
+				return@channelFlow
+			}
+		}
 		val details = getDetails(manga)
 		send(MangaDetails(details, local?.peek(), details.description?.parseAsHtml(withImages = false), false))
 		send(MangaDetails(details, local?.await(), details.description?.parseAsHtml(withImages = true), true))

app/src/main/kotlin/org/koitharu/kotatsu/details/domain/ProgressUpdateUseCase.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.details.domain
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.model.findChapter
 import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.history.data.PROGRESS_NONE
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
@@ -13,15 +14,19 @@ class ProgressUpdateUseCase @Inject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val database: MangaDatabase,
 	private val localMangaRepository: LocalMangaRepository,
+	private val networkState: NetworkState,
 ) {
 
 	suspend operator fun invoke(manga: Manga): Float {
-		val history = database.historyDao.find(manga.id) ?: return PROGRESS_NONE
+		val history = database.getHistoryDao().find(manga.id) ?: return PROGRESS_NONE
 		val seed = if (manga.isLocal) {
 			localMangaRepository.getRemoteManga(manga) ?: manga
 		} else {
 			manga
 		}
+		if (!seed.isLocal && !networkState.value) {
+			return PROGRESS_NONE
+		}
 		val repo = mangaRepositoryFactory.create(seed.source)
 		val details = if (manga.source != seed.source || seed.chapters.isNullOrEmpty()) {
 			repo.getDetails(seed)
@@ -43,7 +48,7 @@ class ProgressUpdateUseCase @Inject constructor(
 		val ppc = 1f / chaptersCount
 		val result = ppc * chapterIndex + ppc * pagePercent
 		if (result != history.percent) {
-			database.historyDao.update(
+			database.getHistoryDao().update(
 				history.copy(
 					chapterId = chapter.id,
 					percent = result,

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.details.ui
 
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.View
@@ -13,6 +12,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.text.buildSpannedString
 import androidx.core.text.color
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -107,7 +107,7 @@ class DetailsFragment :
 		binding.infoLayout.textViewSource.setOnClickListener(this)
 		binding.textViewDescription.addOnLayoutChangeListener(this)
 		binding.textViewDescription.viewTreeObserver.addOnDrawListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		binding.chipsTags.onChipClickListener = this
 		binding.recyclerViewRelated.addItemDecoration(
 			SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)),

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsMenuProvider.kt

@@ -19,7 +19,7 @@ import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
@@ -63,7 +63,7 @@ class DetailsMenuProvider(
 
 			R.id.action_favourite -> {
 				viewModel.manga.value?.let {
-					FavouriteSheet.show(activity.supportFragmentManager, it)
+					FavoriteSheet.show(activity.supportFragmentManager, it)
 				}
 			}
 

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt

@@ -149,15 +149,13 @@ class DetailsViewModel @Inject constructor(
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
 
-	val relatedManga: StateFlow<List<MangaItemModel>> = manga
-		.mapLatest {
-			if (it != null && settings.isRelatedMangaEnabled) {
-				relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
-			} else {
-				emptyList()
-			}
+	val relatedManga: StateFlow<List<MangaItemModel>> = manga.mapLatest {
+		if (it != null && settings.isRelatedMangaEnabled) {
+			relatedMangaUseCase.invoke(it)?.toUi(ListMode.GRID, extraProvider).orEmpty()
+		} else {
+			emptyList()
 		}
-		.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
+	}.stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
 	val branches: StateFlow<List<MangaBranch>> = combine(
 		details,
@@ -217,7 +215,7 @@ class DetailsViewModel @Inject constructor(
 		}
 		launchJob(Dispatchers.Default) {
 			val manga = details.firstOrNull { it != null && it.isLocal } ?: return@launchJob
-			remoteManga.value = interactor.findLocal(manga.toManga())
+			remoteManga.value = interactor.findRemote(manga.toManga())
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/scrobbling/ScrobblingInfoSheet.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.details.ui.scrobbling
 
 import android.content.Intent
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -12,6 +11,7 @@ import android.widget.RatingBar
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.net.toUri
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
 import coil.ImageLoader
@@ -71,7 +71,7 @@ class ScrobblingInfoSheet :
 		binding.ratingBar.onRatingBarChangeListener = this
 		binding.buttonMenu.setOnClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 
 		menu = PopupMenu(binding.root.context, binding.buttonMenu).apply {
 			inflate(R.menu.opt_scrobbling)

app/src/main/kotlin/org/koitharu/kotatsu/download/domain/DownloadState.kt

@@ -18,8 +18,7 @@ data class DownloadState(
 	val currentPage: Int = 0,
 	val eta: Long = -1L,
 	val localManga: LocalManga? = null,
-	val downloadedChapters: LongArray = LongArray(0),
-	val scheduledChapters: LongArray = LongArray(0),
+	val downloadedChapters: Int = 0,
 	val timestamp: Long = System.currentTimeMillis(),
 ) {
 
@@ -42,68 +41,17 @@ data class DownloadState(
 		.putLong(DATA_ETA, eta)
 		.putLong(DATA_TIMESTAMP, timestamp)
 		.putString(DATA_ERROR, error)
-		.putLongArray(DATA_CHAPTERS, downloadedChapters)
-		.putLongArray(DATA_CHAPTERS_SRC, scheduledChapters)
+		.putInt(DATA_CHAPTERS, downloadedChapters)
 		.putBoolean(DATA_INDETERMINATE, isIndeterminate)
 		.putBoolean(DATA_PAUSED, isPaused)
 		.build()
 
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (javaClass != other?.javaClass) return false
-
-		other as DownloadState
-
-		if (manga != other.manga) return false
-		if (isIndeterminate != other.isIndeterminate) return false
-		if (isPaused != other.isPaused) return false
-		if (isStopped != other.isStopped) return false
-		if (error != other.error) return false
-		if (totalChapters != other.totalChapters) return false
-		if (currentChapter != other.currentChapter) return false
-		if (totalPages != other.totalPages) return false
-		if (currentPage != other.currentPage) return false
-		if (eta != other.eta) return false
-		if (localManga != other.localManga) return false
-		if (!downloadedChapters.contentEquals(other.downloadedChapters)) return false
-		if (!scheduledChapters.contentEquals(other.scheduledChapters)) return false
-		if (timestamp != other.timestamp) return false
-		if (max != other.max) return false
-		if (progress != other.progress) return false
-		if (percent != other.percent) return false
-
-		return true
-	}
-
-	override fun hashCode(): Int {
-		var result = manga.hashCode()
-		result = 31 * result + isIndeterminate.hashCode()
-		result = 31 * result + isPaused.hashCode()
-		result = 31 * result + isStopped.hashCode()
-		result = 31 * result + (error?.hashCode() ?: 0)
-		result = 31 * result + totalChapters
-		result = 31 * result + currentChapter
-		result = 31 * result + totalPages
-		result = 31 * result + currentPage
-		result = 31 * result + eta.hashCode()
-		result = 31 * result + (localManga?.hashCode() ?: 0)
-		result = 31 * result + downloadedChapters.contentHashCode()
-		result = 31 * result + scheduledChapters.contentHashCode()
-		result = 31 * result + timestamp.hashCode()
-		result = 31 * result + max
-		result = 31 * result + progress
-		result = 31 * result + percent.hashCode()
-		return result
-	}
-
-
 	companion object {
 
 		private const val DATA_MANGA_ID = "manga_id"
 		private const val DATA_MAX = "max"
 		private const val DATA_PROGRESS = "progress"
-		private const val DATA_CHAPTERS = "chapter"
-		private const val DATA_CHAPTERS_SRC = "chapters_src"
+		private const val DATA_CHAPTERS = "chapter_cnt"
 		private const val DATA_ETA = "eta"
 		private const val DATA_TIMESTAMP = "timestamp"
 		private const val DATA_ERROR = "error"
@@ -126,8 +74,6 @@ data class DownloadState(
 
 		fun getTimestamp(data: Data): Date = Date(data.getLong(DATA_TIMESTAMP, 0L))
 
-		fun getDownloadedChapters(data: Data): LongArray = data.getLongArray(DATA_CHAPTERS) ?: LongArray(0)
-
-		fun getScheduledChapters(data: Data): LongArray = data.getLongArray(DATA_CHAPTERS_SRC) ?: LongArray(0)
+		fun getDownloadedChapters(data: Data): Int = data.getInt(DATA_CHAPTERS, 0)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemAD.kt

@@ -2,28 +2,22 @@ package org.koitharu.kotatsu.download.ui.list
 
 import android.transition.TransitionManager
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.RecyclerView
 import androidx.work.WorkInfo
 import coil.ImageLoader
+import coil.request.SuccessResult
+import coil.util.CoilUtils
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
-import org.koitharu.kotatsu.core.util.ext.drawableEnd
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.newImageRequest
 import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ItemDownloadBinding
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
-import org.koitharu.kotatsu.download.ui.list.chapters.downloadChapterAD
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
-import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.util.format
 
@@ -36,9 +30,7 @@ fun downloadItemAD(
 ) {
 
 	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
-	val expandIcon = ContextCompat.getDrawable(context, R.drawable.ic_expand_collapse)
-	val chaptersAdapter = BaseListAdapter<DownloadChapter>()
-		.addDelegate(ListItemType.CHAPTER, downloadChapterAD())
+	// val expandIcon = ContextCompat.getDrawable(context, R.drawable.ic_expand_collapse)
 
 	val clickListener = object : View.OnClickListener, View.OnLongClickListener {
 		override fun onClick(v: View) {
@@ -59,27 +51,26 @@ fun downloadItemAD(
 	binding.buttonResume.setOnClickListener(clickListener)
 	itemView.setOnClickListener(clickListener)
 	itemView.setOnLongClickListener(clickListener)
-	binding.recyclerViewChapters.addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
-	binding.recyclerViewChapters.adapter = chaptersAdapter
 
 	bind { payloads ->
 		if (ListModelDiffCallback.PAYLOAD_CHECKED_CHANGED in payloads && context.isAnimationsEnabled) {
 			TransitionManager.beginDelayedTransition(binding.constraintLayout)
 		}
 		binding.textViewTitle.text = item.manga.title
-		binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
-			placeholder(R.drawable.ic_placeholder)
-			fallback(R.drawable.ic_placeholder)
-			error(R.drawable.ic_error_placeholder)
-			allowRgb565(true)
-			transformations(TrimTransformation())
-			source(item.manga.source)
-			enqueueWith(coil)
+		if ((CoilUtils.result(binding.imageViewCover) as? SuccessResult)?.memoryCacheKey != item.coverCacheKey) {
+			binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.apply {
+				placeholder(R.drawable.ic_placeholder)
+				fallback(R.drawable.ic_placeholder)
+				error(R.drawable.ic_error_placeholder)
+				allowRgb565(true)
+				transformations(TrimTransformation())
+				memoryCacheKey(item.coverCacheKey)
+				source(item.manga.source)
+				enqueueWith(coil)
+			}
 		}
-		binding.textViewTitle.isChecked = item.isExpanded
-		binding.textViewTitle.drawableEnd = if (item.isExpandable) expandIcon else null
-		binding.cardDetails.isVisible = item.isExpanded
-		chaptersAdapter.items = item.chapters
+		// binding.textViewTitle.isChecked = item.isExpanded
+		// binding.textViewTitle.drawableEnd = if (item.isExpandable) expandIcon else null
 		when (item.workState) {
 			WorkInfo.State.ENQUEUED,
 			WorkInfo.State.BLOCKED -> {
@@ -117,11 +108,11 @@ fun downloadItemAD(
 				binding.progressBar.isVisible = false
 				binding.progressBar.isEnabled = true
 				binding.textViewPercent.isVisible = false
-				if (item.totalChapters > 0) {
+				if (item.chaptersDownloaded > 0) {
 					binding.textViewDetails.text = context.resources.getQuantityString(
 						R.plurals.chapters,
-						item.totalChapters,
-						item.totalChapters,
+						item.chaptersDownloaded,
+						item.chaptersDownloaded,
 					)
 					binding.textViewDetails.isVisible = true
 				} else {

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadItemModel.kt

@@ -2,7 +2,7 @@ package org.koitharu.kotatsu.download.ui.list
 
 import android.text.format.DateUtils
 import androidx.work.WorkInfo
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
+import coil.memory.MemoryCache
 import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -17,14 +17,15 @@ data class DownloadItemModel(
 	val manga: Manga,
 	val error: String?,
 	val max: Int,
-	val totalChapters: Int,
 	val progress: Int,
 	val eta: Long,
 	val timestamp: Date,
-	val chapters: List<DownloadChapter>,
+	val chaptersDownloaded: Int,
 	val isExpanded: Boolean,
 ) : ListModel, Comparable<DownloadItemModel> {
 
+	val coverCacheKey = MemoryCache.Key(manga.coverUrl, mapOf("dl" to "1"))
+
 	val percent: Float
 		get() = if (max > 0) progress / max.toFloat() else 0f
 
@@ -38,7 +39,7 @@ data class DownloadItemModel(
 		get() = workState == WorkInfo.State.RUNNING && isPaused
 
 	val isExpandable: Boolean
-		get() = chapters.isNotEmpty()
+		get() = false // TODO
 
 	fun getEtaString(): CharSequence? = if (hasEta) {
 		DateUtils.getRelativeTimeSpanString(

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsActivity.kt

@@ -15,6 +15,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.BaseActivity
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
 import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -53,6 +54,7 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>(),
 			addItemDecoration(decoration)
 			adapter = downloadsAdapter
 			selectionController.attachToRecyclerView(this)
+			RecyclerScrollKeeper(this).attach()
 		}
 		addMenuProvider(DownloadsMenuProvider(this, viewModel))
 		viewModel.items.observe(this) {

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt

@@ -28,7 +28,6 @@ import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.daysDiff
 import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.ui.list.chapters.DownloadChapter
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListHeader
@@ -239,8 +238,6 @@ class DownloadsViewModel @Inject constructor(
 		val mangaId = DownloadState.getMangaId(workData)
 		if (mangaId == 0L) return null
 		val manga = getManga(mangaId) ?: return null
-		val downloadedChapters = DownloadState.getDownloadedChapters(workData)
-		val scheduledChapters = DownloadState.getScheduledChapters(workData).toSet()
 		return DownloadItemModel(
 			id = id,
 			workState = state,
@@ -252,19 +249,8 @@ class DownloadsViewModel @Inject constructor(
 			progress = DownloadState.getProgress(workData),
 			eta = DownloadState.getEta(workData),
 			timestamp = DownloadState.getTimestamp(workData),
-			totalChapters = downloadedChapters.size,
+			chaptersDownloaded = DownloadState.getDownloadedChapters(workData),
 			isExpanded = isExpanded,
-			chapters = manga.chapters?.mapNotNull {
-				if (it.id in scheduledChapters) {
-					DownloadChapter(
-						number = it.number,
-						name = it.name,
-						isDownloaded = it.id in downloadedChapters,
-					)
-				} else {
-					null
-				}
-			}.orEmpty(),
 		)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt

@@ -38,6 +38,7 @@ import okio.buffer
 import okio.sink
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.TooManyRequestExceptions
+import org.koitharu.kotatsu.core.model.ids
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
@@ -46,7 +47,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.Throttler
 import org.koitharu.kotatsu.core.util.ext.awaitFinishedWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.awaitUpdateWork
-import org.koitharu.kotatsu.core.util.ext.awaitWorkInfoById
 import org.koitharu.kotatsu.core.util.ext.awaitWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.deleteWork
@@ -105,11 +105,12 @@ class DownloadWorker @AssistedInject constructor(
 		setForeground(getForegroundInfo())
 		val mangaId = inputData.getLong(MANGA_ID, 0L)
 		val manga = mangaDataRepository.findMangaById(mangaId) ?: return Result.failure()
-		val chaptersIds = inputData.getLongArray(CHAPTERS_IDS)?.takeUnless { it.isEmpty() }
-		val downloadedIds = getDoneChapters()
 		lastPublishedState = DownloadState(manga, isIndeterminate = true)
+		publishState(DownloadState(manga, isIndeterminate = true))
+		val chaptersIds = inputData.getLongArray(CHAPTERS_IDS)?.takeUnless { it.isEmpty() }
+		val downloadedIds = getDoneChapters(manga)
 		return try {
-			downloadMangaImpl(chaptersIds, downloadedIds)
+			downloadMangaImpl(manga, chaptersIds, downloadedIds)
 			Result.success(currentState.toWorkData())
 		} catch (e: CancellationException) {
 			withContext(NonCancellable) {
@@ -147,10 +148,11 @@ class DownloadWorker @AssistedInject constructor(
 	}
 
 	private suspend fun downloadMangaImpl(
+		subject: Manga,
 		includedIds: LongArray?,
-		excludedIds: LongArray,
+		excludedIds: Set<Long>,
 	) {
-		var manga = currentState.manga
+		var manga = subject
 		val chaptersToSkip = excludedIds.toMutableSet()
 		withMangaLock(manga) {
 			ContextCompat.registerReceiver(
@@ -178,16 +180,9 @@ class DownloadWorker @AssistedInject constructor(
 					}
 				}
 				val chapters = getChapters(mangaDetails, includedIds)
-				publishState(
-					currentState.copy(scheduledChapters = LongArray(chapters.size) { i -> chapters[i].id }),
-				)
 				for ((chapterIndex, chapter) in chapters.withIndex()) {
 					if (chaptersToSkip.remove(chapter.id)) {
-						publishState(
-							currentState.copy(
-								downloadedChapters = currentState.downloadedChapters + chapter.id,
-							),
-						)
+						publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
 						continue
 					}
 					val pages = runFailsafe(pausingHandle) {
@@ -225,11 +220,7 @@ class DownloadWorker @AssistedInject constructor(
 							localStorageChanges.emit(LocalMangaInput.of(output.rootFile).getManga())
 						}.onFailure(Throwable::printStackTraceDebug)
 					}
-					publishState(
-						currentState.copy(
-							downloadedChapters = currentState.downloadedChapters + chapter.id,
-						),
-					)
+					publishState(currentState.copy(downloadedChapters = currentState.downloadedChapters + 1))
 				}
 				publishState(currentState.copy(isIndeterminate = true, eta = -1L))
 				output.mergeWithExisting()
@@ -336,11 +327,9 @@ class DownloadWorker @AssistedInject constructor(
 		setProgress(state.toWorkData())
 	}
 
-	private suspend fun getDoneChapters(): LongArray {
-		val work = WorkManager.getInstance(applicationContext).awaitWorkInfoById(id)
-			?: return LongArray(0)
-		return DownloadState.getDownloadedChapters(work.progress)
-	}
+	private suspend fun getDoneChapters(manga: Manga) = runCatchingCancellable {
+		localMangaRepository.getDetails(manga).chapters?.ids()
+	}.getOrNull().orEmpty()
 
 	private fun getChapters(
 		manga: Manga,

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt

@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.Collections
 import java.util.EnumSet
 import javax.inject.Inject
@@ -30,7 +31,7 @@ class MangaSourcesRepository @Inject constructor(
 ) {
 
 	private val dao: MangaSourcesDao
-		get() = db.sourcesDao
+		get() = db.getSourcesDao()
 
 	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
 		remove(MangaSource.LOCAL)
@@ -43,15 +44,44 @@ class MangaSourcesRepository @Inject constructor(
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
-		return dao.findAllEnabled().toSources(settings.isNsfwContentDisabled)
+		val order = settings.sourcesSortOrder
+		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
-	fun observeEnabledSources(): Flow<List<MangaSource>> = observeIsNsfwDisabled().flatMapLatest { skipNsfw ->
-		dao.observeEnabled().map {
-			it.toSources(skipNsfw)
-		}
+	suspend fun getDisabledSources(): List<MangaSource> {
+		return dao.findAllDisabled().toSources(settings.isNsfwContentDisabled, null)
 	}
 
+	fun observeEnabledSourcesCount(): Flow<Int> {
+		return combine(
+			observeIsNsfwDisabled(),
+			dao.observeEnabled(SourcesSortOrder.MANUAL),
+		) { skipNsfw, sources ->
+			sources.count { skipNsfw || !MangaSource(it.source).isNsfw() }
+		}.distinctUntilChanged()
+	}
+
+	fun observeAvailableSourcesCount(): Flow<Int> {
+		return combine(
+			observeIsNsfwDisabled(),
+			dao.observeEnabled(SourcesSortOrder.MANUAL),
+		) { skipNsfw, enabledSources ->
+			val enabled = enabledSources.mapToSet { it.source }
+			allMangaSources.count { x ->
+				x.name !in enabled && (!skipNsfw || !x.isNsfw())
+			}
+		}.distinctUntilChanged()
+	}
+
+	fun observeEnabledSources(): Flow<List<MangaSource>> = combine(
+		observeIsNsfwDisabled(),
+		observeSortOrder(),
+	) { skipNsfw, order ->
+		dao.observeEnabled(order).map {
+			it.toSources(skipNsfw, order)
+		}
+	}.flatMapLatest { it }
+
 	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
 		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
 		for (entity in entities) {
@@ -146,7 +176,10 @@ class MangaSourcesRepository @Inject constructor(
 		return result
 	}
 
-	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
+	private fun List<MangaSourceEntity>.toSources(
+		skipNsfwSources: Boolean,
+		sortOrder: SourcesSortOrder?,
+	): List<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {
 			val source = MangaSource(entity.source)
@@ -157,6 +190,9 @@ class MangaSourcesRepository @Inject constructor(
 				result.add(source)
 			}
 		}
+		if (sortOrder == SourcesSortOrder.ALPHABETIC) {
+			result.sortBy { it.title }
+		}
 		return result
 	}
 
@@ -167,4 +203,8 @@ class MangaSourcesRepository @Inject constructor(
 	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
 		isNewSourcesTipEnabled
 	}
+
+	private fun observeSortOrder() = settings.observeAsFlow(AppSettings.KEY_SOURCES_ORDER) {
+		sourcesSortOrder
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/SourcesSortOrder.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.explore.data
+
+import androidx.annotation.StringRes
+import org.koitharu.kotatsu.R
+
+enum class SourcesSortOrder(
+	@StringRes val titleResId: Int,
+) {
+	ALPHABETIC(R.string.by_name),
+	POPULARITY(R.string.popular),
+	MANUAL(R.string.manual),
+}

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreFragment.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.explore.ui
 
 import android.content.DialogInterface
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -46,6 +47,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
 import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
+import org.koitharu.kotatsu.settings.sources.catalog.SourcesCatalogActivity
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsActivity
 import javax.inject.Inject
 
@@ -83,7 +85,7 @@ class ExploreFragment :
 			SpanSizeResolver(this, resources.getDimensionPixelSize(R.dimen.explore_grid_width)).attach()
 			addItemDecoration(TypedListSpacingDecoration(context, false))
 		}
-		addMenuProvider(ExploreMenuProvider(binding.root.context, viewModel))
+		addMenuProvider(ExploreMenuProvider(binding.root.context))
 		viewModel.content.observe(viewLifecycleOwner) {
 			exploreAdapter?.items = it
 		}
@@ -109,7 +111,7 @@ class ExploreFragment :
 	}
 
 	override fun onListHeaderClick(item: ListHeader, view: View) {
-		startActivity(SettingsActivity.newManageSourcesIntent(view.context))
+		startActivity(Intent(view.context, SourcesCatalogActivity::class.java))
 	}
 
 	override fun onPrimaryButtonClick(tipView: TipView) {
@@ -174,7 +176,6 @@ class ExploreFragment :
 		} else {
 			LinearLayoutManager(requireContext())
 		}
-		activity?.invalidateOptionsMenu()
 	}
 
 	private fun showSuggestionsTip() {

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreMenuProvider.kt

@@ -6,10 +6,10 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.settings.SettingsActivity
 
 class ExploreMenuProvider(
 	private val context: Context,
-	private val viewModel: ExploreViewModel,
 ) : MenuProvider {
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
@@ -18,17 +18,12 @@ class ExploreMenuProvider(
 
 	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
 		return when (menuItem.itemId) {
-			R.id.action_grid -> {
-				viewModel.setGridMode(!menuItem.isChecked)
+			R.id.action_manage -> {
+				context.startActivity(SettingsActivity.newSourcesSettingsIntent(context))
 				true
 			}
 
 			else -> false
 		}
 	}
-
-	override fun onPrepareMenu(menu: Menu) {
-		super.onPrepareMenu(menu)
-		menu.findItem(R.id.action_grid)?.isChecked = viewModel.isGrid.value == true
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/ExploreViewModel.kt

@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.core.ui.util.ReversibleAction
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
+import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.explore.ui.model.ExploreButtons
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
@@ -50,11 +51,13 @@ class ExploreViewModel @Inject constructor(
 		valueProducer = { isSourcesGridMode },
 	)
 
-	val isSuggestionsEnabled = settings.observeAsFlow(
+	private val isSuggestionsEnabled = settings.observeAsFlow(
 		key = AppSettings.KEY_SUGGESTIONS,
 		valueProducer = { isSuggestionsEnabled },
 	)
 
+	val sortOrder = MutableStateFlow(SourcesSortOrder.MANUAL) // TODO
+
 	val onOpenManga = MutableEventFlow<Manga>()
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 	val onShowSuggestionsTip = MutableEventFlow<Unit>()
@@ -104,10 +107,6 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
-	fun setGridMode(value: Boolean) {
-		settings.isSourcesGridMode = value
-	}
-
 	fun respondSuggestionTip(isAccepted: Boolean) {
 		settings.isSuggestionsEnabled = isAccepted
 		settings.closeTip(TIP_SUGGESTIONS)
@@ -137,7 +136,7 @@ class ExploreViewModel @Inject constructor(
 			result += RecommendationsItem(recommendation)
 		}
 		if (sources.isNotEmpty()) {
-			result += ListHeader(R.string.remote_sources, R.string.manage)
+			result += ListHeader(R.string.remote_sources, R.string.catalog)
 			if (newSources.isNotEmpty()) {
 				result += TipModel(
 					key = TIP_NEW_SOURCES,

app/src/main/kotlin/org/koitharu/kotatsu/explore/ui/adapter/ExploreAdapterDelegates.kt

@@ -7,6 +7,7 @@ import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.getSummary
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.ui.image.TrimTransformation
@@ -48,8 +49,8 @@ fun exploreButtonsAD(
 			icon.setColorSchemeColors(
 				context.getThemeColor(
 					materialR.attr.colorPrimary,
-					Color.DKGRAY
-				)
+					Color.DKGRAY,
+				),
 			)
 			binding.buttonRandom.icon = icon
 			icon.start()
@@ -98,7 +99,7 @@ fun exploreSourceListItemAD(
 		ItemExploreSourceListBinding.inflate(
 			layoutInflater,
 			parent,
-			false
+			false,
 		)
 	},
 	on = { item, _, _ -> item is MangaSourceItem && !item.isGrid },
@@ -112,6 +113,7 @@ fun exploreSourceListItemAD(
 
 	bind {
 		binding.textViewTitle.text = item.source.title
+		binding.textViewSubtitle.text = item.source.getSummary(context)
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewIcon.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {
 			fallback(fallbackIcon)
@@ -132,7 +134,7 @@ fun exploreSourceGridItemAD(
 		ItemExploreSourceGridBinding.inflate(
 			layoutInflater,
 			parent,
-			false
+			false,
 		)
 	},
 	on = { item, _, _ -> item is MangaSourceItem && item.isGrid },

app/src/main/kotlin/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt

@@ -106,6 +106,9 @@ abstract class FavouritesDao {
 	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id = :id AND deleted_at = 0")
 	abstract fun observeIds(id: Long): Flow<List<Long>>
 
+	@Query("SELECT DISTINCT category_id FROM favourites WHERE manga_id IN (:mangaIds) AND deleted_at = 0")
+	abstract suspend fun findCategoriesIds(mangaIds: Collection<Long>): List<Long>
+
 	/** INSERT **/
 
 	@Insert(onConflict = OnConflictStrategy.REPLACE)
@@ -169,7 +172,9 @@ abstract class FavouritesDao {
 		ListSortOrder.NEWEST -> "favourites.created_at DESC"
 		ListSortOrder.ALPHABETIC -> "manga.title ASC"
 		ListSortOrder.NEW_CHAPTERS -> "(SELECT chapters_new FROM tracks WHERE tracks.manga_id = manga.manga_id) DESC"
+		ListSortOrder.UPDATED, // for legacy support
 		ListSortOrder.PROGRESS -> "(SELECT percent FROM history WHERE history.manga_id = manga.manga_id) DESC"
+
 		else -> throw IllegalArgumentException("Sort order $sortOrder is not supported")
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt

@@ -31,27 +31,27 @@ class FavouritesRepository @Inject constructor(
 ) {
 
 	suspend fun getAllManga(): List<Manga> {
-		val entities = db.favouritesDao.findAll()
+		val entities = db.getFavouritesDao().findAll()
 		return entities.toMangaList()
 	}
 
 	suspend fun getLastManga(limit: Int): List<Manga> {
-		val entities = db.favouritesDao.findLast(limit)
+		val entities = db.getFavouritesDao().findLast(limit)
 		return entities.toMangaList()
 	}
 
 	fun observeAll(order: ListSortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(order)
+		return db.getFavouritesDao().observeAll(order)
 			.mapItems { it.toManga() }
 	}
 
 	suspend fun getManga(categoryId: Long): List<Manga> {
-		val entities = db.favouritesDao.findAll(categoryId)
+		val entities = db.getFavouritesDao().findAll(categoryId)
 		return entities.toMangaList()
 	}
 
 	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<Manga>> {
-		return db.favouritesDao.observeAll(categoryId, order)
+		return db.getFavouritesDao().observeAll(categoryId, order)
 			.mapItems { it.toManga() }
 	}
 
@@ -61,25 +61,25 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategories(): Flow<List<FavouriteCategory>> {
-		return db.favouriteCategoriesDao.observeAll().mapItems {
+		return db.getFavouriteCategoriesDao().observeAll().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesForLibrary(): Flow<List<FavouriteCategory>> {
-		return db.favouriteCategoriesDao.observeAllForLibrary().mapItems {
+		return db.getFavouriteCategoriesDao().observeAllForLibrary().mapItems {
 			it.toFavouriteCategory()
 		}.distinctUntilChanged()
 	}
 
 	fun observeCategoriesWithCovers(): Flow<Map<FavouriteCategory, List<Cover>>> {
-		return db.favouriteCategoriesDao.observeAll()
+		return db.getFavouriteCategoriesDao().observeAll()
 			.map {
 				db.withTransaction {
 					val res = LinkedHashMap<FavouriteCategory, List<Cover>>()
 					for (entity in it) {
 						val cat = entity.toFavouriteCategory()
-						res[cat] = db.favouritesDao.findCovers(
+						res[cat] = db.getFavouritesDao().findCovers(
 							categoryId = cat.id,
 							order = cat.order,
 						)
@@ -90,16 +90,20 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	fun observeCategory(id: Long): Flow<FavouriteCategory?> {
-		return db.favouriteCategoriesDao.observe(id)
+		return db.getFavouriteCategoriesDao().observe(id)
 			.map { it?.toFavouriteCategory() }
 	}
 
 	fun observeCategoriesIds(mangaId: Long): Flow<Set<Long>> {
-		return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
+		return db.getFavouritesDao().observeIds(mangaId).map { it.toSet() }
 	}
 
 	suspend fun getCategory(id: Long): FavouriteCategory {
-		return db.favouriteCategoriesDao.find(id.toInt()).toFavouriteCategory()
+		return db.getFavouriteCategoriesDao().find(id.toInt()).toFavouriteCategory()
+	}
+
+	suspend fun getCategoriesIds(mangaIds: Collection<Long>): Set<Long> {
+		return db.getFavouritesDao().findCategoriesIds(mangaIds).toSet()
 	}
 
 	suspend fun createCategory(
@@ -111,14 +115,14 @@ class FavouritesRepository @Inject constructor(
 		val entity = FavouriteCategoryEntity(
 			title = title,
 			createdAt = System.currentTimeMillis(),
-			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
+			sortKey = db.getFavouriteCategoriesDao().getNextSortKey(),
 			categoryId = 0,
 			order = sortOrder.name,
 			track = isTrackerEnabled,
 			deletedAt = 0L,
 			isVisibleInLibrary = isVisibleOnShelf,
 		)
-		val id = db.favouriteCategoriesDao.insert(entity)
+		val id = db.getFavouriteCategoriesDao().insert(entity)
 		val category = entity.toFavouriteCategory(id)
 		channels.createChannel(category)
 		return category
@@ -131,22 +135,22 @@ class FavouritesRepository @Inject constructor(
 		isTrackerEnabled: Boolean,
 		isVisibleOnShelf: Boolean,
 	) {
-		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
+		db.getFavouriteCategoriesDao().update(id, title, sortOrder.name, isTrackerEnabled, isVisibleOnShelf)
 	}
 
 	suspend fun updateCategory(id: Long, isVisibleInLibrary: Boolean) {
-		db.favouriteCategoriesDao.updateLibVisibility(id, isVisibleInLibrary)
+		db.getFavouriteCategoriesDao().updateLibVisibility(id, isVisibleInLibrary)
 	}
 
 	suspend fun updateCategoryTracking(id: Long, isTrackingEnabled: Boolean) {
-		db.favouriteCategoriesDao.updateTracking(id, isTrackingEnabled)
+		db.getFavouriteCategoriesDao().updateTracking(id, isTrackingEnabled)
 	}
 
 	suspend fun removeCategories(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.deleteAll(id)
-				db.favouriteCategoriesDao.delete(id)
+				db.getFavouritesDao().deleteAll(id)
+				db.getFavouriteCategoriesDao().delete(id)
 			}
 		}
 		// run after transaction success
@@ -156,11 +160,11 @@ class FavouritesRepository @Inject constructor(
 	}
 
 	suspend fun setCategoryOrder(id: Long, order: ListSortOrder) {
-		db.favouriteCategoriesDao.updateOrder(id, order.name)
+		db.getFavouriteCategoriesDao().updateOrder(id, order.name)
 	}
 
 	suspend fun reorderCategories(orderedIds: List<Long>) {
-		val dao = db.favouriteCategoriesDao
+		val dao = db.getFavouriteCategoriesDao()
 		db.withTransaction {
 			for ((i, id) in orderedIds.withIndex()) {
 				dao.updateSortKey(id, i)
@@ -172,8 +176,8 @@ class FavouritesRepository @Inject constructor(
 		db.withTransaction {
 			for (manga in mangas) {
 				val tags = manga.tags.toEntities()
-				db.tagsDao.upsert(tags)
-				db.mangaDao.upsert(manga.toEntity(), tags)
+				db.getTagsDao().upsert(tags)
+				db.getMangaDao().upsert(manga.toEntity(), tags)
 				val entity = FavouriteEntity(
 					mangaId = manga.id,
 					categoryId = categoryId,
@@ -181,7 +185,7 @@ class FavouritesRepository @Inject constructor(
 					sortKey = 0,
 					deletedAt = 0L,
 				)
-				db.favouritesDao.insert(entity)
+				db.getFavouritesDao().insert(entity)
 			}
 		}
 	}
@@ -189,7 +193,7 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromFavourites(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.delete(mangaId = id)
+				db.getFavouritesDao().delete(mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToFavourites(ids) }
@@ -198,14 +202,14 @@ class FavouritesRepository @Inject constructor(
 	suspend fun removeFromCategory(categoryId: Long, ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.delete(categoryId = categoryId, mangaId = id)
+				db.getFavouritesDao().delete(categoryId = categoryId, mangaId = id)
 			}
 		}
 		return ReversibleHandle { recoverToCategory(categoryId, ids) }
 	}
 
 	private fun observeOrder(categoryId: Long): Flow<ListSortOrder> {
-		return db.favouriteCategoriesDao.observe(categoryId)
+		return db.getFavouriteCategoriesDao().observe(categoryId)
 			.filterNotNull()
 			.map { x -> ListSortOrder(x.order, ListSortOrder.NEWEST) }
 			.distinctUntilChanged()
@@ -214,7 +218,7 @@ class FavouritesRepository @Inject constructor(
 	private suspend fun recoverToFavourites(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.recover(mangaId = id)
+				db.getFavouritesDao().recover(mangaId = id)
 			}
 		}
 	}
@@ -222,7 +226,7 @@ class FavouritesRepository @Inject constructor(
 	private suspend fun recoverToCategory(categoryId: Long, ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.favouritesDao.recover(mangaId = id, categoryId = categoryId)
+				db.getFavouritesDao().recover(mangaId = id, categoryId = categoryId)
 			}
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavoriteSheet.kt

@@ -19,17 +19,12 @@ import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.SheetFavoriteCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
 @AndroidEntryPoint
-class FavouriteSheet :
-	BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(),
-	OnListItemClickListener<MangaCategoryItem> {
+class FavoriteSheet : BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(), OnListItemClickListener<MangaCategoryItem> {
 
-	private val viewModel: MangaCategoriesViewModel by viewModels()
-
-	private var adapter: MangaCategoriesAdapter? = null
+	private val viewModel by viewModels<FavoriteSheetViewModel>()
 
 	override fun onCreateViewBinding(
 		inflater: LayoutInflater,
@@ -41,44 +36,32 @@ class FavouriteSheet :
 		savedInstanceState: Bundle?,
 	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		adapter = MangaCategoriesAdapter(this)
+		val adapter = MangaCategoriesAdapter(this)
 		binding.recyclerViewCategories.adapter = adapter
-		viewModel.content.observe(viewLifecycleOwner, this::onContentChanged)
+		viewModel.content.observe(viewLifecycleOwner, adapter)
 		viewModel.onError.observeEvent(viewLifecycleOwner, ::onError)
 	}
 
-	override fun onDestroyView() {
-		adapter = null
-		super.onDestroyView()
-	}
-
 	override fun onItemClick(item: MangaCategoryItem, view: View) {
 		viewModel.setChecked(item.category.id, !item.isChecked)
 	}
 
-	private fun onContentChanged(categories: List<ListModel>) {
-		adapter?.items = categories
-	}
-
 	private fun onError(e: Throwable) {
 		Toast.makeText(context ?: return, e.getDisplayMessage(resources), Toast.LENGTH_SHORT).show()
 	}
 
 	companion object {
 
-		private const val TAG = "FavouriteCategoriesDialog"
+		private const val TAG = "FavoriteSheet"
 		const val KEY_MANGA_LIST = "manga_list"
 
-		fun show(fm: FragmentManager, manga: Manga) = Companion.show(fm, listOf(manga))
+		fun show(fm: FragmentManager, manga: Manga) = show(fm, setOf(manga))
 
-		fun show(fm: FragmentManager, manga: Collection<Manga>) =
-			FavouriteSheet().withArgs(1) {
-				putParcelableArrayList(
-					KEY_MANGA_LIST,
-					manga.mapTo(ArrayList(manga.size)) {
-						ParcelableManga(it)
-					},
-				)
-			}.showDistinct(fm, TAG)
+		fun show(fm: FragmentManager, manga: Collection<Manga>) = FavoriteSheet().withArgs(1) {
+			putParcelableArrayList(
+				KEY_MANGA_LIST,
+				manga.mapTo(ArrayList(manga.size), ::ParcelableManga),
+			)
+		}.showDistinct(fm, TAG)
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/FavoriteSheetViewModel.kt

@@ -4,77 +4,70 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.model.ids
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
+import org.koitharu.kotatsu.core.util.ext.firstNotNull
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet.Companion.KEY_MANGA_LIST
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.CategoriesHeaderItem
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
-import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import javax.inject.Inject
 
 @HiltViewModel
-class MangaCategoriesViewModel @Inject constructor(
+class FavoriteSheetViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val favouritesRepository: FavouritesRepository,
 	settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val manga = savedStateHandle.require<List<ParcelableManga>>(KEY_MANGA_LIST).map { it.manga }
+	private val manga = savedStateHandle.require<List<ParcelableManga>>(FavoriteSheet.KEY_MANGA_LIST).mapToSet {
+		it.manga
+	}
 	private val header = CategoriesHeaderItem()
-
-	val content: StateFlow<List<ListModel>> = combine(
+	private val checkedCategories = MutableStateFlow<Set<Long>?>(null)
+	val content = combine(
 		favouritesRepository.observeCategories(),
-		observeCategoriesIds(),
-	) { all, checked ->
-		buildList(all.size + 1) {
+		checkedCategories.filterNotNull(),
+		settings.observeAsFlow(AppSettings.KEY_TRACKER_ENABLED) { isTrackerEnabled },
+	) { categories, checked, tracker ->
+		buildList(categories.size + 1) {
 			add(header)
-			all.mapTo(this) {
+			categories.mapTo(this) { cat ->
 				MangaCategoryItem(
-					category = it,
-					isChecked = it.id in checked,
-					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
+					category = cat,
+					isChecked = cat.id in checked,
+					isTrackerEnabled = tracker,
 				)
 			}
 		}
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(header))
+
+	init {
+		launchJob(Dispatchers.Default) {
+			checkedCategories.value = favouritesRepository.getCategoriesIds(manga.ids())
+		}
+	}
 
 	fun setChecked(categoryId: Long, isChecked: Boolean) {
 		launchJob(Dispatchers.Default) {
+			val checkedIds = checkedCategories.firstNotNull()
 			if (isChecked) {
+				checkedCategories.value = checkedIds + categoryId
 				favouritesRepository.addToCategory(categoryId, manga)
 			} else {
+				checkedCategories.value = checkedIds - categoryId
 				favouritesRepository.removeFromCategory(categoryId, manga.ids())
 			}
 		}
 	}
-
-	private fun observeCategoriesIds() = if (manga.size == 1) {
-		// Fast path
-		favouritesRepository.observeCategoriesIds(manga[0].id)
-	} else {
-		combine(
-			manga.map { favouritesRepository.observeCategoriesIds(it.id) },
-		) { array ->
-			val result = HashSet<Long>()
-			var isFirst = true
-			for (ids in array) {
-				if (isFirst) {
-					result.addAll(ids)
-					isFirst = false
-				} else {
-					result.retainAll(ids.toSet())
-				}
-			}
-			result
-		}
-	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryDao.kt

@@ -23,7 +23,7 @@ abstract class HistoryDao {
 
 	@Transaction
 	@Query("SELECT * FROM history WHERE deleted_at = 0 AND manga_id IN (:ids)")
-	abstract suspend fun findAll(ids: Collection<Long>): List<HistoryEntity?>
+	abstract suspend fun findAll(ids: Collection<Long>): List<HistoryEntity>
 
 	@Transaction
 	@Query("SELECT * FROM history WHERE deleted_at = 0 ORDER BY updated_at DESC")

app/src/main/kotlin/org/koitharu/kotatsu/history/data/HistoryRepository.kt

@@ -15,6 +15,8 @@ import org.koitharu.kotatsu.core.db.entity.toMangaTag
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.core.model.findById
+import org.koitharu.kotatsu.core.model.isLocal
+import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.core.util.ext.mapItems
@@ -35,39 +37,40 @@ class HistoryRepository @Inject constructor(
 	private val trackingRepository: TrackingRepository,
 	private val settings: AppSettings,
 	private val scrobblers: Set<@JvmSuppressWildcards Scrobbler>,
+	private val mangaRepository: MangaDataRepository,
 ) {
 
 	suspend fun getList(offset: Int, limit: Int): List<Manga> {
-		val entities = db.historyDao.findAll(offset, limit)
+		val entities = db.getHistoryDao().findAll(offset, limit)
 		return entities.map { it.manga.toManga(it.tags.toMangaTags()) }
 	}
 
 	suspend fun getLastOrNull(): Manga? {
-		val entity = db.historyDao.findAll(0, 1).firstOrNull() ?: return null
+		val entity = db.getHistoryDao().findAll(0, 1).firstOrNull() ?: return null
 		return entity.manga.toManga(entity.tags.toMangaTags())
 	}
 
 	fun observeLast(): Flow<Manga?> {
-		return db.historyDao.observeAll(1).map {
+		return db.getHistoryDao().observeAll(1).map {
 			val first = it.firstOrNull()
 			first?.manga?.toManga(first.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(): Flow<List<Manga>> {
-		return db.historyDao.observeAll().mapItems {
+		return db.getHistoryDao().observeAll().mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
 	fun observeAll(limit: Int): Flow<List<Manga>> {
-		return db.historyDao.observeAll(limit).mapItems {
+		return db.getHistoryDao().observeAll(limit).mapItems {
 			it.manga.toManga(it.tags.toMangaTags())
 		}
 	}
 
 	fun observeAllWithHistory(order: ListSortOrder): Flow<List<MangaWithHistory>> {
-		return db.historyDao.observeAll(order).mapItems {
+		return db.getHistoryDao().observeAll(order).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
 				it.history.toMangaHistory(),
@@ -76,13 +79,13 @@ class HistoryRepository @Inject constructor(
 	}
 
 	fun observeOne(id: Long): Flow<MangaHistory?> {
-		return db.historyDao.observe(id).map {
+		return db.getHistoryDao().observe(id).map {
 			it?.toMangaHistory()
 		}
 	}
 
 	fun observeHasItems(): Flow<Boolean> {
-		return db.historyDao.observeCount()
+		return db.getHistoryDao().observeCount()
 			.map { it > 0 }
 			.distinctUntilChanged()
 	}
@@ -91,14 +94,9 @@ class HistoryRepository @Inject constructor(
 		if (shouldSkip(manga)) {
 			return
 		}
-		val tags = manga.tags.toEntities()
 		db.withTransaction {
-			val existing = db.mangaDao.find(manga.id)?.manga
-			if (existing == null || existing.source == manga.source.name) {
-				db.tagsDao.upsert(tags)
-				db.mangaDao.upsert(manga.toEntity(), tags)
-			}
-			db.historyDao.upsert(
+			mangaRepository.storeManga(manga)
+			db.getHistoryDao().upsert(
 				HistoryEntity(
 					mangaId = manga.id,
 					createdAt = System.currentTimeMillis(),
@@ -119,29 +117,29 @@ class HistoryRepository @Inject constructor(
 	}
 
 	suspend fun getOne(manga: Manga): MangaHistory? {
-		return db.historyDao.find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
+		return db.getHistoryDao().find(manga.id)?.recoverIfNeeded(manga)?.toMangaHistory()
 	}
 
 	suspend fun getProgress(mangaId: Long): Float {
-		return db.historyDao.findProgress(mangaId) ?: PROGRESS_NONE
+		return db.getHistoryDao().findProgress(mangaId) ?: PROGRESS_NONE
 	}
 
 	suspend fun clear() {
-		db.historyDao.clear()
+		db.getHistoryDao().clear()
 	}
 
 	suspend fun delete(manga: Manga) {
-		db.historyDao.delete(manga.id)
+		db.getHistoryDao().delete(manga.id)
 	}
 
 	suspend fun deleteAfter(minDate: Long) {
-		db.historyDao.deleteAfter(minDate)
+		db.getHistoryDao().deleteAfter(minDate)
 	}
 
 	suspend fun delete(ids: Collection<Long>): ReversibleHandle {
 		db.withTransaction {
 			for (id in ids) {
-				db.historyDao.delete(id)
+				db.getHistoryDao().delete(id)
 			}
 		}
 		return ReversibleHandle {
@@ -154,13 +152,13 @@ class HistoryRepository @Inject constructor(
 	 * Useful for replacing saved manga on deleting it with remote source
 	 */
 	suspend fun deleteOrSwap(manga: Manga, alternative: Manga?) {
-		if (alternative == null || db.mangaDao.update(alternative.toEntity()) <= 0) {
-			db.historyDao.delete(manga.id)
+		if (alternative == null || db.getMangaDao().update(alternative.toEntity()) <= 0) {
+			db.getHistoryDao().delete(manga.id)
 		}
 	}
 
 	suspend fun getPopularTags(limit: Int): List<MangaTag> {
-		return db.historyDao.findPopularTags(limit).map { x -> x.toMangaTag() }
+		return db.getHistoryDao().findPopularTags(limit).map { x -> x.toMangaTag() }
 	}
 
 	fun shouldSkip(manga: Manga): Boolean {
@@ -178,21 +176,21 @@ class HistoryRepository @Inject constructor(
 	private suspend fun recover(ids: Collection<Long>) {
 		db.withTransaction {
 			for (id in ids) {
-				db.historyDao.recover(id)
+				db.getHistoryDao().recover(id)
 			}
 		}
 	}
 
 	private suspend fun HistoryEntity.recoverIfNeeded(manga: Manga): HistoryEntity {
 		val chapters = manga.chapters
-		if (chapters.isNullOrEmpty() || chapters.findById(chapterId) != null) {
+		if (manga.isLocal || chapters.isNullOrEmpty() || chapters.findById(chapterId) != null) {
 			return this
 		}
 		val newChapterId = chapters.getOrNull(
 			(chapters.size * percent).toInt(),
 		)?.id ?: return this
 		val newEntity = copy(chapterId = newChapterId)
-		db.historyDao.update(newEntity)
+		db.getHistoryDao().update(newEntity)
 		return newEntity
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt

@@ -9,6 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkManageIntent
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
+import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.list.ui.MangaListFragment
@@ -23,6 +24,7 @@ class HistoryListFragment : MangaListFragment() {
 
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
+		RecyclerScrollKeeper(binding.recyclerView).attach()
 		addMenuProvider(HistoryListMenuProvider(binding.root.context, viewModel))
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt

@@ -41,7 +41,7 @@ import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
 import org.koitharu.kotatsu.databinding.FragmentListBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.MangaListAdapter
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
@@ -284,7 +284,7 @@ abstract class MangaListFragment :
 			}
 
 			R.id.action_favourite -> {
-				FavouriteSheet.show(childFragmentManager, selectedItems)
+				FavoriteSheet.show(childFragmentManager, selectedItems)
 				mode.finish()
 				true
 			}

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt

@@ -1,12 +1,12 @@
 package org.koitharu.kotatsu.list.ui.preview
 
 import android.os.Bundle
-import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.graphics.Insets
+import androidx.core.text.method.LinkMovementMethodCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import coil.ImageLoader
@@ -52,7 +52,7 @@ class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickList
 		super.onViewBindingCreated(binding, savedInstanceState)
 		binding.buttonClose.isVisible = activity is MangaListActivity
 		binding.buttonClose.setOnClickListener(this)
-		binding.textViewDescription.movementMethod = LinkMovementMethod.getInstance()
+		binding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		binding.chipsTags.onChipClickListener = this
 		binding.textViewAuthor.setOnClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)

app/src/main/kotlin/org/koitharu/kotatsu/local/ui/ImportWorker.kt

@@ -24,6 +24,7 @@ import coil.request.ImageRequest
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ErrorReporterReceiver
 import org.koitharu.kotatsu.core.util.ext.checkNotificationPermission
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
@@ -91,6 +92,7 @@ class ImportWorker @AssistedInject constructor(
 			.setPriority(NotificationCompat.PRIORITY_DEFAULT)
 			.setDefaults(0)
 			.setSilent(true)
+			.setAutoCancel(true)
 		result.onSuccess { manga ->
 			notification.setLargeIcon(
 				coil.execute(
@@ -110,10 +112,9 @@ class ImportWorker @AssistedInject constructor(
 					PendingIntent.FLAG_UPDATE_CURRENT,
 					false,
 				),
-			).setAutoCancel(true)
-				.setVisibility(
-					if (manga.isNsfw) NotificationCompat.VISIBILITY_SECRET else NotificationCompat.VISIBILITY_PUBLIC,
-				)
+			).setVisibility(
+				if (manga.isNsfw) NotificationCompat.VISIBILITY_SECRET else NotificationCompat.VISIBILITY_PUBLIC,
+			)
 			notification.setContentTitle(applicationContext.getString(R.string.import_completed))
 				.setContentText(applicationContext.getString(R.string.import_completed_hint))
 				.setSmallIcon(R.drawable.ic_stat_done)
@@ -123,6 +124,11 @@ class ImportWorker @AssistedInject constructor(
 			notification.setContentTitle(applicationContext.getString(R.string.error_occurred))
 				.setContentText(error.getDisplayMessage(applicationContext.resources))
 				.setSmallIcon(android.R.drawable.stat_notify_error)
+				.addAction(
+					R.drawable.ic_alert_outline,
+					applicationContext.getString(R.string.report),
+					ErrorReporterReceiver.getPendingIntent(applicationContext, error),
+				)
 		}
 		return notification.build()
 	}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -22,6 +22,7 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.withResumed
 import androidx.transition.TransitionManager
@@ -183,7 +184,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
 		android.R.id.home -> if (isSearchOpened()) {
-			super.onOptionsItemSelected(item)
+			closeSearchCallback.handleOnBackPressed()
+			true
 		} else {
 			viewBinding.searchView.requestFocus()
 			true
@@ -228,6 +230,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 				supportFragmentManager.commit {
 					setReorderingAllowed(true)
 					add(R.id.container, SearchSuggestionFragment.newInstance(), TAG_SEARCH)
+					navigationDelegate.primaryFragment?.let {
+						setMaxLifecycle(it, Lifecycle.State.STARTED)
+					}
 					setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 					runOnCommit { onSearchOpened() }
 				}
@@ -413,16 +418,20 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
 	private inner class CloseSearchCallback : OnBackPressedCallback(false) {
 
 		override fun handleOnBackPressed() {
-			val fragment = supportFragmentManager.findFragmentByTag(TAG_SEARCH)
+			val fm = supportFragmentManager
+			val fragment = fm.findFragmentByTag(TAG_SEARCH)
 			viewBinding.searchView.clearFocus()
 			if (fragment == null) {
 				// this should not happen but who knows
 				isEnabled = false
 				return
 			}
-			supportFragmentManager.commit {
+			fm.commit {
 				setReorderingAllowed(true)
 				remove(fragment)
+				navigationDelegate.primaryFragment?.let {
+					setMaxLifecycle(it, Lifecycle.State.RESUMED)
+				}
 				setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 				runOnCommit { onSearchClosed() }
 			}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -40,6 +40,7 @@ import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.ui.BaseFullscreenActivity
+import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
 import org.koitharu.kotatsu.core.util.GridTouchHelper
 import org.koitharu.kotatsu.core.util.IdlingDetector
 import org.koitharu.kotatsu.core.util.ShareHelper
@@ -52,6 +53,7 @@ import org.koitharu.kotatsu.core.util.ext.postDelayed
 import org.koitharu.kotatsu.core.util.ext.setValueRounded
 import org.koitharu.kotatsu.core.util.ext.zipWithPrevious
 import org.koitharu.kotatsu.databinding.ActivityReaderBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.reader.ui.config.ReaderConfigSheet
@@ -72,7 +74,8 @@ class ReaderActivity :
 	ReaderConfigSheet.Callback,
 	ReaderControlDelegate.OnInteractionListener,
 	OnApplyWindowInsetsListener,
-	IdlingDetector.Callback {
+	IdlingDetector.Callback,
+	ZoomControl.ZoomControlListener {
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -110,6 +113,7 @@ class ReaderActivity :
 		controlDelegate = ReaderControlDelegate(resources, settings, this, this)
 		viewBinding.toolbarBottom.setOnMenuItemClickListener(::onOptionsItemSelected)
 		viewBinding.slider.setLabelFormatter(PageLabelFormatter())
+		viewBinding.zoomControl.listener = this
 		ReaderSliderListener(this, viewModel).attachToSlider(viewBinding.slider)
 		insetsDelegate.interceptingWindowInsetsListener = this
 		idlingDetector.bindToLifecycle(this)
@@ -145,6 +149,14 @@ class ReaderActivity :
 				.setAnchorView(viewBinding.appbarBottom)
 				.show()
 		}
+		viewModel.isZoomControlsEnabled.observe(this) {
+			viewBinding.zoomControl.isVisible = it
+		}
+	}
+
+	override fun getParentActivityIntent(): Intent? {
+		val manga = viewModel.manga?.toManga() ?: return null
+		return DetailsActivity.newIntent(this, manga)
 	}
 
 	override fun onUserInteraction() {
@@ -157,6 +169,14 @@ class ReaderActivity :
 		viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 	}
 
+	override fun onZoomIn() {
+		readerManager.currentReader?.onZoomIn()
+	}
+
+	override fun onZoomOut() {
+		readerManager.currentReader?.onZoomOut()
+	}
+
 	private fun onInitReader(mode: ReaderMode?) {
 		if (mode == null) {
 			return
@@ -249,6 +269,7 @@ class ReaderActivity :
 
 	override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
 		touchHelper.dispatchTouchEvent(ev)
+		scrollTimer.onTouchEvent(ev)
 		return super.dispatchTouchEvent(ev)
 	}
 
@@ -286,15 +307,13 @@ class ReaderActivity :
 	private fun onPageSaved(uri: Uri?) {
 		if (uri != null) {
 			Snackbar.make(viewBinding.container, R.string.page_saved, Snackbar.LENGTH_LONG)
-				.setAnchorView(viewBinding.appbarBottom)
 				.setAction(R.string.share) {
 					ShareHelper(this).shareImage(uri)
-				}.show()
+				}
 		} else {
 			Snackbar.make(viewBinding.container, R.string.error_occurred, Snackbar.LENGTH_SHORT)
-				.setAnchorView(viewBinding.appbarBottom)
-				.show()
-		}
+		}.setAnchorView(viewBinding.appbarBottom)
+			.show()
 	}
 
 	private fun setWindowSecure(isSecure: Boolean) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt

@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
@@ -118,17 +119,13 @@ class ReaderViewModel @Inject constructor(
 		valueProducer = { isReaderKeepScreenOn },
 	)
 
-	val isWebtoonZoomEnabled = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
-		key = AppSettings.KEY_WEBTOON_ZOOM,
-		valueProducer = { isWebtoonZoomEnable },
-	)
-
-	val isZoomControlEnabled = settings.observeAsStateFlow(
-		scope = viewModelScope + Dispatchers.Default,
-		key = AppSettings.KEY_READER_ZOOM_BUTTONS,
-		valueProducer = { isReaderZoomButtonsEnabled },
-	)
+	val isZoomControlsEnabled = getObserveIsZoomControlEnabled().flatMapLatest { zoom ->
+		if (zoom) {
+			combine(readerMode, observeIsWebtoonZoomEnabled()) { mode, ze -> ze || mode != ReaderMode.WEBTOON }
+		} else {
+			flowOf(false)
+		}
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
 
 	val readerSettings = ReaderSettings(
 		parentScope = viewModelScope,
@@ -259,10 +256,13 @@ class ReaderViewModel @Inject constructor(
 	@MainThread
 	fun onCurrentPageChanged(position: Int) {
 		val prevJob = stateChangeJob
+		val pages = content.value.pages // capture immediately
 		stateChangeJob = launchJob(Dispatchers.Default) {
 			prevJob?.cancelAndJoin()
 			loadingJob?.join()
-			val pages = content.value.pages
+			if (BuildConfig.DEBUG && pages.size != content.value.pages.size) {
+				throw IllegalStateException("Concurrent pages modification")
+			}
 			pages.getOrNull(position)?.let { page ->
 				currentState.update { cs ->
 					cs?.copy(chapterId = page.chapterId, page = page.index)
@@ -402,4 +402,14 @@ class ReaderViewModel @Inject constructor(
 		val ppc = 1f / chaptersCount
 		return ppc * chapterIndex + ppc * pagePercent
 	}
+
+	private fun observeIsWebtoonZoomEnabled() = settings.observeAsFlow(
+		key = AppSettings.KEY_WEBTOON_ZOOM,
+		valueProducer = { isWebtoonZoomEnable },
+	)
+
+	private fun getObserveIsZoomControlEnabled() = settings.observeAsFlow(
+		key = AppSettings.KEY_READER_ZOOM_BUTTONS,
+		valueProducer = { isReaderZoomButtonsEnabled },
+	)
 }

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimer.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.reader.ui
 
+import android.view.MotionEvent
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import dagger.assisted.Assisted
@@ -8,11 +9,14 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import kotlin.math.roundToLong
@@ -33,6 +37,7 @@ class ScrollTimer @AssistedInject constructor(
 	private var delayMs: Long = 10L
 	private var pageSwitchDelay: Long = 100L
 	private var resumeAt = 0L
+	private var isTouchDown = MutableStateFlow(false)
 
 	var isEnabled: Boolean = false
 		set(value) {
@@ -55,6 +60,19 @@ class ScrollTimer @AssistedInject constructor(
 		resumeAt = System.currentTimeMillis() + INTERACTION_SKIP_MS
 	}
 
+	fun onTouchEvent(event: MotionEvent) {
+		when (event.actionMasked) {
+			MotionEvent.ACTION_DOWN -> {
+				isTouchDown.value = true
+			}
+
+			MotionEvent.ACTION_UP,
+			MotionEvent.ACTION_CANCEL -> {
+				isTouchDown.value = false
+			}
+		}
+	}
+
 	private fun onSpeedChanged(speed: Float) {
 		if (speed <= 0f) {
 			delayMs = 0L
@@ -108,12 +126,18 @@ class ScrollTimer @AssistedInject constructor(
 	}
 
 	private fun isPaused(): Boolean {
-		return resumeAt > System.currentTimeMillis()
+		return isTouchDown.value || resumeAt > System.currentTimeMillis()
 	}
 
 	private suspend fun delayUntilResumed() {
 		while (isPaused()) {
-			delay(resumeAt - System.currentTimeMillis())
+			val delayTime = resumeAt - System.currentTimeMillis()
+			if (delayTime > 0) {
+				delay(delayTime)
+			} else {
+				yield()
+			}
+			isTouchDown.first { !it }
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderConfigSheet.kt

@@ -47,7 +47,10 @@ class ReaderConfigSheet :
 
 	private val viewModel by activityViewModels<ReaderViewModel>()
 	private val savePageRequest = registerForActivityResult(PageSaveContract(), this)
-	private var orientationHelper: ScreenOrientationHelper? = null
+
+	@Inject
+	lateinit var orientationHelper: ScreenOrientationHelper
+
 	private lateinit var mode: ReaderMode
 
 	@Inject
@@ -113,7 +116,7 @@ class ReaderConfigSheet :
 			}
 
 			R.id.button_screen_rotate -> {
-				orientationHelper?.toggleOrientation()
+				orientationHelper.isLandscape = !orientationHelper.isLandscape
 			}
 
 			R.id.button_color_filter -> {
@@ -128,9 +131,13 @@ class ReaderConfigSheet :
 		when (buttonView.id) {
 			R.id.switch_scroll_timer -> {
 				findCallback()?.isAutoScrollEnabled = isChecked
-				requireViewBinding().labelTimer.isVisible = isChecked
+				requireViewBinding().layoutTimer.isVisible = isChecked
 				requireViewBinding().sliderTimer.isVisible = isChecked
 			}
+
+			R.id.switch_screen_lock_rotation -> {
+				orientationHelper.isLocked = isChecked
+			}
 		}
 	}
 
@@ -159,6 +166,7 @@ class ReaderConfigSheet :
 		if (fromUser) {
 			settings.readerAutoscrollSpeed = value
 		}
+		(viewBinding ?: return).labelTimerValue.text = getString(R.string.speed_value, value * 10f)
 	}
 
 	override fun onActivityResult(result: Uri?) {
@@ -167,14 +175,23 @@ class ReaderConfigSheet :
 	}
 
 	private fun observeScreenOrientation() {
-		val helper = ScreenOrientationHelper(requireActivity())
-		orientationHelper = helper
-		helper.observeAutoOrientation()
+		orientationHelper.observeAutoOrientation()
 			.onEach {
-				requireViewBinding().buttonScreenRotate.isGone = it
+				with(requireViewBinding()) {
+					buttonScreenRotate.isGone = it
+					switchScreenLockRotation.isVisible = it
+					updateOrientationLockSwitch()
+				}
 			}.launchIn(viewLifecycleScope)
 	}
 
+	private fun updateOrientationLockSwitch() {
+		val switch = viewBinding?.switchScreenLockRotation ?: return
+		switch.setOnCheckedChangeListener(null)
+		switch.isChecked = orientationHelper.isLocked
+		switch.setOnCheckedChangeListener(this)
+	}
+
 	private fun findCallback(): Callback? {
 		return (parentFragment as? Callback) ?: (activity as? Callback)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderSettings.kt

@@ -46,9 +46,6 @@ class ReaderSettings(
 	val isPagesNumbersEnabled: Boolean
 		get() = settings.isPagesNumbersEnabled
 
-	val isZoomControlsEnabled: Boolean
-		get() = settings.isReaderZoomButtonsEnabled
-
 	fun applyBackground(view: View) {
 		val bg = settings.readerBackground
 		view.background = bg.resolve(view.context)
@@ -106,8 +103,6 @@ class ReaderSettings(
 			if (
 				key == AppSettings.KEY_ZOOM_MODE ||
 				key == AppSettings.KEY_PAGES_NUMBERS ||
-				key == AppSettings.KEY_WEBTOON_ZOOM ||
-				key == AppSettings.KEY_READER_ZOOM_BUTTONS ||
 				key == AppSettings.KEY_READER_BACKGROUND ||
 				key == AppSettings.KEY_32BIT_COLOR
 			) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/BaseReaderFragment.kt

@@ -6,6 +6,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.viewbinding.ViewBinding
 import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.ui.BaseFragment
+import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -14,7 +15,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 
 private const val KEY_STATE = "state"
 
-abstract class BaseReaderFragment<B : ViewBinding> : BaseFragment<B>() {
+abstract class BaseReaderFragment<B : ViewBinding> : BaseFragment<B>(), ZoomControl.ZoomControlListener {
 
 	protected val viewModel by activityViewModels<ReaderViewModel>()
 	private var stateToSave: ReaderState? = null

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/reversed/ReversedReaderFragment.kt

@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
+import org.koitharu.kotatsu.core.util.ext.findCurrentViewHolder
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -28,6 +29,7 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 import org.koitharu.kotatsu.reader.ui.pager.BaseReaderFragment
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.reader.ui.pager.standard.NoAnimPageTransformer
+import org.koitharu.kotatsu.reader.ui.pager.standard.PageHolder
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerEventSupplier
 import org.koitharu.kotatsu.reader.ui.pager.standard.PagerReaderFragment
 import javax.inject.Inject
@@ -104,6 +106,15 @@ class ReversedReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>
 		exceptionResolver = exceptionResolver,
 	)
 
+	override fun onZoomIn() {
+		(viewBinding?.pager?.findCurrentViewHolder() as? PageHolder)?.onZoomIn()
+	}
+
+	override fun onZoomOut() {
+		(viewBinding?.pager?.findCurrentViewHolder() as? PageHolder)?.onZoomOut()
+	}
+
+
 	override fun switchPageBy(delta: Int) {
 		with(requireViewBinding().pager) {
 			setCurrentItem(currentItem - delta, isAnimationEnabled())

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.graphics.PointF
 import android.net.Uri
 import android.view.View
+import android.view.animation.DecelerateInterpolator
 import androidx.core.view.isVisible
 import androidx.lifecycle.LifecycleOwner
 import com.davemorrissey.labs.subscaleview.ImageSource
@@ -12,6 +13,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.ifZero
 import org.koitharu.kotatsu.core.util.ext.isLowRamDevice
@@ -29,7 +31,8 @@ open class PageHolder(
 	networkState: NetworkState,
 	exceptionResolver: ExceptionResolver,
 ) : BasePageHolder<ItemPageBinding>(binding, loader, settings, networkState, exceptionResolver),
-	View.OnClickListener {
+	View.OnClickListener,
+	ZoomControl.ZoomControlListener {
 
 	init {
 		binding.ssiv.bindToLifecycle(owner)
@@ -40,12 +43,10 @@ open class PageHolder(
 		@Suppress("LeakingThis")
 		bindingInfo.buttonErrorDetails.setOnClickListener(this)
 		binding.textViewNumber.isVisible = settings.isPagesNumbersEnabled
-		binding.zoomControl.listener = SsivZoomListener(binding.ssiv)
 	}
 
 	override fun onConfigChanged() {
 		super.onConfigChanged()
-		binding.zoomControl.isVisible = settings.isZoomControlsEnabled
 		@Suppress("SENSELESS_COMPARISON")
 		if (settings.applyBitmapConfig(binding.ssiv) && delegate != null) {
 			delegate.reload()
@@ -141,4 +142,23 @@ open class PageHolder(
 		bindingInfo.layoutError.isVisible = true
 		bindingInfo.progressBar.hide()
 	}
+
+	override fun onZoomIn() {
+		scaleBy(1.2f)
+	}
+
+	override fun onZoomOut() {
+		scaleBy(0.8f)
+	}
+
+	private fun scaleBy(factor: Float) {
+		val ssiv = binding.ssiv
+		val center = ssiv.getCenter() ?: return
+		val newScale = ssiv.scale * factor
+		ssiv.animateScaleAndCenter(newScale, center)?.apply {
+			withDuration(ssiv.resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
+			withInterpolator(DecelerateInterpolator())
+			start()
+		}
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/PagerReaderFragment.kt

@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.prefs.ReaderAnimation
 import org.koitharu.kotatsu.core.util.ext.doOnPageChanged
+import org.koitharu.kotatsu.core.util.ext.findCurrentViewHolder
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.recyclerView
 import org.koitharu.kotatsu.core.util.ext.resetTransformations
@@ -82,6 +83,14 @@ class PagerReaderFragment : BaseReaderFragment<FragmentReaderStandardBinding>(),
 		super.onDestroyView()
 	}
 
+	override fun onZoomIn() {
+		(viewBinding?.pager?.findCurrentViewHolder() as? PageHolder)?.onZoomIn()
+	}
+
+	override fun onZoomOut() {
+		(viewBinding?.pager?.findCurrentViewHolder() as? PageHolder)?.onZoomOut()
+	}
+
 	override fun onGenericMotion(v: View?, event: MotionEvent): Boolean {
 		if (event.source and InputDevice.SOURCE_CLASS_POINTER != 0) {
 			if (event.actionMasked == MotionEvent.ACTION_SCROLL) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/standard/SsivZoomListener.kt

@@ -1,28 +0,0 @@
-package org.koitharu.kotatsu.reader.ui.pager.standard
-
-import android.view.animation.DecelerateInterpolator
-import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
-
-class SsivZoomListener(
-	private val ssiv: SubsamplingScaleImageView,
-) : ZoomControl.ZoomControlListener {
-
-	override fun onZoomIn() {
-		scaleBy(1.2f)
-	}
-
-	override fun onZoomOut() {
-		scaleBy(0.8f)
-	}
-
-	private fun scaleBy(factor: Float) {
-		val center = ssiv.getCenter() ?: return
-		val newScale = ssiv.scale * factor
-		ssiv.animateScaleAndCenter(newScale, center)?.apply {
-			withDuration(ssiv.resources.getInteger(android.R.integer.config_shortAnimTime).toLong())
-			withInterpolator(DecelerateInterpolator())
-			start()
-		}
-	}
-}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt

@@ -4,18 +4,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import androidx.core.view.isVisible
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.yield
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.util.ext.findCenterViewPosition
 import org.koitharu.kotatsu.core.util.ext.firstVisibleItemPosition
-import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.databinding.FragmentReaderWebtoonBinding
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -47,15 +44,6 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 			adapter = readerAdapter
 			addOnPageScrollListener(PageScrollListener())
 		}
-		binding.zoomControl.listener = binding.frame
-
-		viewModel.isWebtoonZoomEnabled.observe(viewLifecycleOwner) {
-			binding.frame.isZoomEnable = it
-		}
-		combine(viewModel.isWebtoonZoomEnabled, viewModel.isZoomControlEnabled, Boolean::and)
-			.observe(viewLifecycleOwner) {
-				binding.zoomControl.isVisible = it
-			}
 	}
 
 	override fun onDestroyView() {
@@ -111,6 +99,14 @@ class WebtoonReaderFragment : BaseReaderFragment<FragmentReaderWebtoonBinding>()
 		)
 	}
 
+	override fun onZoomIn() {
+		viewBinding?.frame?.onZoomIn()
+	}
+
+	override fun onZoomOut() {
+		viewBinding?.frame?.onZoomOut()
+	}
+
 	private fun notifyPageChanged(page: Int) {
 		viewModel.onCurrentPageChanged(page)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -95,7 +96,6 @@ open class RemoteListViewModel @Inject constructor(
 			.onEach { filterState ->
 				loadingJob?.cancelAndJoin()
 				mangaList.value = null
-				hasNextPage.value = false
 				loadList(filterState, false)
 			}.catch { error ->
 				listError.value = error
@@ -134,12 +134,18 @@ open class RemoteListViewModel @Inject constructor(
 					sortOrder = filterState.sortOrder,
 					tags = filterState.tags,
 				)
-				if (!append) {
-					mangaList.value = list
-				} else if (list.isNotEmpty()) {
-					mangaList.value = mangaList.value?.plus(list) ?: list
+				val oldList = mangaList.getAndUpdate { oldList ->
+					if (!append || oldList.isNullOrEmpty()) {
+						list
+					} else {
+						oldList + list
+					}
+				}.orEmpty()
+				hasNextPage.value = if (append) {
+					list.isNotEmpty()
+				} else {
+					list.size > oldList.size || hasNextPage.value
 				}
-				hasNextPage.value = list.isNotEmpty() // TODO check if new ids added
 			} catch (e: CancellationException) {
 				throw e
 			} catch (e: Throwable) {
@@ -148,6 +154,7 @@ open class RemoteListViewModel @Inject constructor(
 				if (!mangaList.value.isNullOrEmpty()) {
 					errorEvent.call(e)
 				}
+				hasNextPage.value = false
 			}
 		}.also { loadingJob = it }
 	}

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/data/AniListRepository.kt

@@ -106,7 +106,7 @@ class AniListRepository @Inject constructor(
 		}
 
 	override suspend fun unregister(mangaId: Long) {
-		return db.scrobblingDao.delete(ScrobblerService.ANILIST.id, mangaId)
+		return db.getScrobblingDao().delete(ScrobblerService.ANILIST.id, mangaId)
 	}
 
 	override fun logout() {
@@ -223,7 +223,7 @@ class AniListRepository @Inject constructor(
 			comment = json.getString("notes"),
 			rating = scoreFormat.normalize(json.getDouble("score").toFloat()),
 		)
-		db.scrobblingDao.upsert(entity)
+		db.getScrobblingDao().upsert(entity)
 	}
 
 	private fun ScrobblerManga(json: JSONObject): ScrobblerManga {

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/anilist/domain/AniListScrobbler.kt

@@ -29,7 +29,7 @@ class AniListScrobbler @Inject constructor(
 		status: ScrobblingStatus?,
 		comment: String?,
 	) {
-		val entity = db.scrobblingDao.find(scrobblerService.id, mangaId)
+		val entity = db.getScrobblingDao().find(scrobblerService.id, mangaId)
 		requireNotNull(entity) { "Scrobbling info for manga $mangaId not found" }
 		repository.updateRate(
 			rateId = entity.id,

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/domain/Scrobbler.kt

@@ -67,24 +67,24 @@ abstract class Scrobbler(
 	}
 
 	suspend fun scrobble(mangaId: Long, chapter: MangaChapter) {
-		val entity = db.scrobblingDao.find(scrobblerService.id, mangaId) ?: return
+		val entity = db.getScrobblingDao().find(scrobblerService.id, mangaId) ?: return
 		repository.updateRate(entity.id, entity.mangaId, chapter)
 	}
 
 	suspend fun getScrobblingInfoOrNull(mangaId: Long): ScrobblingInfo? {
-		val entity = db.scrobblingDao.find(scrobblerService.id, mangaId) ?: return null
+		val entity = db.getScrobblingDao().find(scrobblerService.id, mangaId) ?: return null
 		return entity.toScrobblingInfo()
 	}
 
 	abstract suspend fun updateScrobblingInfo(mangaId: Long, rating: Float, status: ScrobblingStatus?, comment: String?)
 
 	fun observeScrobblingInfo(mangaId: Long): Flow<ScrobblingInfo?> {
-		return db.scrobblingDao.observe(scrobblerService.id, mangaId)
+		return db.getScrobblingDao().observe(scrobblerService.id, mangaId)
 			.map { it?.toScrobblingInfo() }
 	}
 
 	fun observeAllScrobblingInfo(): Flow<List<ScrobblingInfo>> {
-		return db.scrobblingDao.observe(scrobblerService.id)
+		return db.getScrobblingDao().observe(scrobblerService.id)
 			.map { entities ->
 				coroutineScope {
 					entities.map {

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
@@ -18,6 +19,7 @@ import org.koitharu.kotatsu.core.parser.MangaIntent
 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.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.requireValue
 import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -27,7 +29,6 @@ import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.scrobbling.common.domain.Scrobbler
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblerManga
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.model.ScrobblerHint
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 @HiltViewModel
@@ -53,7 +54,7 @@ class ScrobblingSelectorViewModel @Inject constructor(
 		get() = availableScrobblers[selectedScrobblerIndex.requireValue()]
 
 	val content: StateFlow<List<ListModel>> = combine(
-		scrobblerMangaList,
+		scrobblerMangaList.map { it.distinctBy { x -> x.id } },
 		listError,
 		hasNextPage,
 	) { list, error, isHasNextPage ->

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/mal/data/MALRepository.kt

@@ -85,7 +85,7 @@ class MALRepository @Inject constructor(
 	}
 
 	override suspend fun unregister(mangaId: Long) {
-		return db.scrobblingDao.delete(ScrobblerService.MAL.id, mangaId)
+		return db.getScrobblingDao().delete(ScrobblerService.MAL.id, mangaId)
 	}
 
 	override suspend fun findManga(query: String, offset: Int): List<ScrobblerManga> {
@@ -98,6 +98,7 @@ class MALRepository @Inject constructor(
 			.build()
 		val request = Request.Builder().url(url).get().build()
 		val response = okHttp.newCall(request).await().parseJson()
+		check(response.has("data")) { "Invalid response: \"$response\"" }
 		val data = response.getJSONArray("data")
 		return data.mapJSONNotNull { jsonToManga(it) }
 	}
@@ -175,7 +176,7 @@ class MALRepository @Inject constructor(
 			comment = json.getString("comments"),
 			rating = (json.getDouble("score").toFloat() / 10f).coerceIn(0f, 1f),
 		)
-		db.scrobblingDao.upsert(entity)
+		db.getScrobblingDao().upsert(entity)
 	}
 
 	override fun logout() {

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/mal/domain/MALScrobbler.kt

@@ -30,7 +30,7 @@ class MALScrobbler @Inject constructor(
 		status: ScrobblingStatus?,
 		comment: String?,
 	) {
-		val entity = db.scrobblingDao.find(scrobblerService.id, mangaId)
+		val entity = db.getScrobblingDao().find(scrobblerService.id, mangaId)
 		requireNotNull(entity) { "Scrobbling info for manga $mangaId not found" }
 		repository.updateRate(
 			rateId = entity.id,

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/shikimori/data/ShikimoriRepository.kt

@@ -84,7 +84,7 @@ class ShikimoriRepository @Inject constructor(
 		}
 
 	override suspend fun unregister(mangaId: Long) {
-		return db.scrobblingDao.delete(ScrobblerService.SHIKIMORI.id, mangaId)
+		return db.getScrobblingDao().delete(ScrobblerService.SHIKIMORI.id, mangaId)
 	}
 
 	override fun logout() {
@@ -192,7 +192,7 @@ class ShikimoriRepository @Inject constructor(
 			comment = json.getString("text"),
 			rating = (json.getDouble("score").toFloat() / 10f).coerceIn(0f, 1f),
 		)
-		db.scrobblingDao.upsert(entity)
+		db.getScrobblingDao().upsert(entity)
 	}
 
 	private fun ScrobblerManga(json: JSONObject) = ScrobblerManga(

app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/shikimori/domain/ShikimoriScrobbler.kt

@@ -31,7 +31,7 @@ class ShikimoriScrobbler @Inject constructor(
 		status: ScrobblingStatus?,
 		comment: String?,
 	) {
-		val entity = db.scrobblingDao.find(scrobblerService.id, mangaId)
+		val entity = db.getScrobblingDao().find(scrobblerService.id, mangaId)
 		requireNotNull(entity) { "Scrobbling info for manga $mangaId not found" }
 		repository.updateRate(
 			rateId = entity.id,

app/src/main/kotlin/org/koitharu/kotatsu/search/domain/MangaSearchRepository.kt

@@ -40,9 +40,9 @@ class MangaSearchRepository @Inject constructor(
 		}
 		val skipNsfw = settings.isNsfwContentDisabled
 		return if (source != null) {
-			db.mangaDao.searchByTitle("%$query%", source.name, limit)
+			db.getMangaDao().searchByTitle("%$query%", source.name, limit)
 		} else {
-			db.mangaDao.searchByTitle("%$query%", limit)
+			db.getMangaDao().searchByTitle("%$query%", limit)
 		}.let {
 			if (skipNsfw) it.filterNot { x -> x.manga.isNsfw } else it
 		}
@@ -83,7 +83,7 @@ class MangaSearchRepository @Inject constructor(
 		if (query.isEmpty()) {
 			return emptyList()
 		}
-		val titles = db.suggestionDao.getTitles("$query%")
+		val titles = db.getSuggestionDao().getTitles("$query%")
 		if (titles.isEmpty()) {
 			return emptyList()
 		}
@@ -92,19 +92,20 @@ class MangaSearchRepository @Inject constructor(
 
 	suspend fun getTagsSuggestion(query: String, limit: Int, source: MangaSource?): List<MangaTag> {
 		return when {
-			query.isNotEmpty() && source != null -> db.tagsDao.findTags(source.name, "%$query%", limit)
-			query.isNotEmpty() -> db.tagsDao.findTags("%$query%", limit)
-			source != null -> db.tagsDao.findPopularTags(source.name, limit)
-			else -> db.tagsDao.findPopularTags(limit)
+			query.isNotEmpty() && source != null -> db.getTagsDao()
+				.findTags(source.name, "%$query%", limit)
+			query.isNotEmpty() -> db.getTagsDao().findTags("%$query%", limit)
+			source != null -> db.getTagsDao().findPopularTags(source.name, limit)
+			else -> db.getTagsDao().findPopularTags(limit)
 		}.toMangaTagsList()
 	}
 
 	suspend fun getTagsSuggestion(tags: Set<MangaTag>): List<MangaTag> {
 		val ids = tags.mapToSet { it.toEntity().id }
 		return if (ids.size == 1) {
-			db.tagsDao.findRelatedTags(ids.first())
+			db.getTagsDao().findRelatedTags(ids.first())
 		} else {
-			db.tagsDao.findRelatedTags(ids)
+			db.getTagsDao().findRelatedTags(ids)
 		}.mapNotNull { x ->
 			if (x.id in ids) null else x.toMangaTag()
 		}

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/multi/MultiSearchActivity.kt

@@ -8,7 +8,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.view.ActionMode
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import coil.ImageLoader
@@ -26,7 +25,7 @@ import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.ActivitySearchMultiBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.ui.worker.DownloadStartedObserver
-import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteSheet
+import org.koitharu.kotatsu.favourites.ui.categories.select.FavoriteSheet
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
@@ -159,7 +158,7 @@ class MultiSearchActivity :
 			}
 
 			R.id.action_favourite -> {
-				FavouriteSheet.show(supportFragmentManager, collectSelectedItems())
+				FavoriteSheet.show(supportFragmentManager, collectSelectedItems())
 				mode.finish()
 				true
 			}

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionQueryHintAD.kt

@@ -12,7 +12,7 @@ fun searchSuggestionQueryHintAD(
 	{ inflater, parent -> ItemSearchSuggestionQueryHintBinding.inflate(inflater, parent, false) },
 ) {
 
-	val viewClickListener = View.OnClickListener { v ->
+	val viewClickListener = View.OnClickListener { _ ->
 		listener.onQueryClick(item.query, true)
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionSourceAD.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.getSummary
 import org.koitharu.kotatsu.core.parser.favicon.faviconUri
 import org.koitharu.kotatsu.core.ui.image.FaviconDrawable
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
@@ -40,6 +41,7 @@ fun searchSuggestionSourceAD(
 		} else {
 			item.source.title
 		}
+		binding.textViewSubtitle.text = item.source.getSummary(context)
 		binding.switchLocal.isChecked = item.isEnabled
 		val fallbackIcon = FaviconDrawable(context, R.style.FaviconDrawable_Small, item.source.name)
 		binding.imageViewCover.newImageRequest(lifecycleOwner, item.source.faviconUri())?.run {

app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt

@@ -1,6 +1,5 @@
 package org.koitharu.kotatsu.settings
 
-import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -9,7 +8,6 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.View
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.app.LocaleManagerCompat
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,8 +16,8 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ListMode
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
+import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.getLocalesConfig
-import org.koitharu.kotatsu.core.util.ext.map
 import org.koitharu.kotatsu.core.util.ext.postDelayed
 import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat
 import org.koitharu.kotatsu.core.util.ext.toList
@@ -27,7 +25,6 @@ import org.koitharu.kotatsu.parsers.util.names
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.utils.ActivityListPreference
 import org.koitharu.kotatsu.settings.utils.SliderPreference
-import java.util.Locale
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -110,7 +107,7 @@ class AppearanceSettingsFragment :
 	private fun initLocalePicker(preference: ListPreference) {
 		val locales = preference.context.getLocalesConfig()
 			.toList()
-			.sortedWith(LocaleComparator(preference.context))
+			.sortedWith(LocaleComparator())
 		preference.entries = Array(locales.size + 1) { i ->
 			if (i == 0) {
 				getString(R.string.automatic)
@@ -134,24 +131,4 @@ class AppearanceSettingsFragment :
 			getString(it.title)
 		}
 	}
-
-	private class LocaleComparator(context: Context) : Comparator<Locale> {
-
-		private val deviceLocales = LocaleManagerCompat.getSystemLocales(context)
-			.map { it.language }
-
-		override fun compare(a: Locale, b: Locale): Int {
-			return if (a === b) {
-				0
-			} else {
-				val indexA = deviceLocales.indexOf(a.language)
-				val indexB = deviceLocales.indexOf(b.language)
-				if (indexA == -1 && indexB == -1) {
-					compareValues(a.language, b.language)
-				} else {
-					-2 - (indexA - indexB)
-				}
-			}
-		}
-	}
 }