Update parsers

Currently translated at 100.0% (658 of 658 strings)

Translated using Weblate (Russian)

Currently translated at 100.0% (658 of 658 strings)

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/report_bug.yml

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

.github/ISSUE_TEMPLATE/request_feature.yml

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

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 642
-		versionName = '7.0.1'
+		versionCode = 651
+		versionName = '7.3'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:078b59b1e2') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:74b8aaa94e') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -90,14 +90,15 @@ dependencies {
 	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
 
-	implementation 'androidx.appcompat:appcompat:1.6.1'
+	implementation 'androidx.appcompat:appcompat:1.7.0'
 	implementation 'androidx.core:core-ktx:1.13.1'
 	implementation 'androidx.activity:activity-ktx:1.9.0'
-	implementation 'androidx.fragment:fragment-ktx:1.7.1'
+	implementation 'androidx.fragment:fragment-ktx:1.8.1'
+	implementation 'androidx.transition:transition-ktx:1.5.0'
 	implementation 'androidx.collection:collection-ktx:1.4.0'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
-	implementation 'androidx.lifecycle:lifecycle-service:2.7.0'
-	implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
+	implementation 'androidx.lifecycle:lifecycle-service:2.8.3'
+	implementation 'androidx.lifecycle:lifecycle-process:2.8.3'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.2'
@@ -105,7 +106,7 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.12.0'
-	implementation 'androidx.lifecycle:lifecycle-common-java8:2.7.0'
+	implementation 'androidx.lifecycle:lifecycle-common-java8:2.8.3'
 	implementation 'androidx.webkit:webkit:1.11.0'
 
 	implementation 'androidx.work:work-runtime:2.9.0'
@@ -135,7 +136,7 @@ dependencies {
 
 	implementation 'io.coil-kt:coil-base:2.6.0'
 	implementation 'io.coil-kt:coil-svg:2.6.0'
-	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:02e6d6cfe9'
+	implementation 'com.github.KotatsuApp:subsampling-scale-image-view:882bc0620c'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 	implementation 'io.noties.markwon:core:4.6.2'
 
@@ -153,10 +154,10 @@ dependencies {
 	testImplementation 'org.json:json:20240303'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 
-	androidTestImplementation 'androidx.test:runner:1.5.2'
-	androidTestImplementation 'androidx.test:rules:1.5.0'
-	androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-	androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+	androidTestImplementation 'androidx.test:runner:1.6.1'
+	androidTestImplementation 'androidx.test:rules:1.6.1'
+	androidTestImplementation 'androidx.test:core-ktx:1.6.1'
+	androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 
 	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
 

app/src/debug/AndroidManifest.xml

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

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

@@ -0,0 +1,33 @@
+package org.koitharu.kotatsu.settings
+
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import androidx.core.view.MenuProvider
+import leakcanary.LeakCanary
+import org.koitharu.kotatsu.R
+import org.koitharu.workinspector.WorkInspector
+
+class SettingsMenuProvider(
+	private val context: Context,
+) : MenuProvider {
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_settings, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_leaks -> {
+			context.startActivity(LeakCanary.newLeakDisplayActivityIntent())
+			true
+		}
+
+		R.id.action_works -> {
+			context.startActivity(WorkInspector.getIntent(context))
+			true
+		}
+
+		else -> false
+	}
+}

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

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

app/src/main/AndroidManifest.xml

@@ -100,6 +100,13 @@
 			<intent-filter>
 				<action android:name="${applicationId}.action.READ_MANGA" />
 			</intent-filter>
+			<intent-filter>
+				<action android:name="com.samsung.android.support.REMOTE_ACTION" />
+			</intent-filter>
+
+			<meta-data
+				android:name="com.samsung.android.support.REMOTE_ACTION"
+				android:resource="@xml/remote_action" />
 		</activity>
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
@@ -248,6 +255,9 @@
 		<activity
 			android:name="org.koitharu.kotatsu.settings.about.AppUpdateActivity"
 			android:label="@string/app_update_available" />
+		<activity
+			android:name="org.koitharu.kotatsu.tracker.ui.debug.TrackerDebugActivity"
+			android:label="@string/tracker_debug_info" />
 
 		<service
 			android:name="androidx.work.impl.foreground.SystemForegroundService"

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

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

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

@@ -108,8 +108,10 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 
 	override fun onDestroy() {
 		super.onDestroy()
-		viewBinding.webView.stopLoading()
-		viewBinding.webView.destroy()
+		if (hasViewBinding()) {
+			viewBinding.webView.stopLoading()
+			viewBinding.webView.destroy()
+		}
 	}
 
 	override fun onLoadingStateChanged(isLoading: Boolean) {

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

@@ -27,13 +27,14 @@ import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.browser.cloudflare.CaptchaNotifier
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.os.NetworkState
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.favicon.FaviconFetcher
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.image.CoilImageGetter
 import org.koitharu.kotatsu.core.ui.util.ActivityRecreationHandle
 import org.koitharu.kotatsu.core.util.AcraScreenLogger
@@ -47,6 +48,7 @@ import org.koitharu.kotatsu.local.data.LocalStorageChanges
 import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.main.domain.CoverRestoreInterceptor
 import org.koitharu.kotatsu.main.ui.protect.AppProtectHelper
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
 import org.koitharu.kotatsu.settings.backup.BackupObserver
@@ -70,8 +72,9 @@ interface AppModule {
 		@Provides
 		@Singleton
 		fun provideNetworkState(
-			@ApplicationContext context: Context
-		) = NetworkState(context.connectivityManager)
+			@ApplicationContext context: Context,
+			settings: AppSettings,
+		) = NetworkState(context.connectivityManager, settings)
 
 		@Provides
 		@Singleton
@@ -150,10 +153,12 @@ interface AppModule {
 			appProtectHelper: AppProtectHelper,
 			activityRecreationHandle: ActivityRecreationHandle,
 			acraScreenLogger: AcraScreenLogger,
+			screenshotPolicyHelper: ScreenshotPolicyHelper,
 		): Set<@JvmSuppressWildcards Application.ActivityLifecycleCallbacks> = arraySetOf(
 			appProtectHelper,
 			activityRecreationHandle,
 			acraScreenLogger,
+			screenshotPolicyHelper,
 		)
 
 		@Provides

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

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.json.getBooleanOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getIntOrDefault
+import org.koitharu.kotatsu.parsers.util.json.getLongOrDefault
 import org.koitharu.kotatsu.parsers.util.json.getStringOrNull
 
 class JsonDeserializer(private val json: JSONObject) {
@@ -84,6 +85,9 @@ class JsonDeserializer(private val json: JSONObject) {
 		source = json.getString("source"),
 		isEnabled = json.getBoolean("enabled"),
 		sortKey = json.getInt("sort_key"),
+		addedIn = json.getIntOrDefault("added_in", 0),
+		lastUsedAt = json.getLongOrDefault("used_at", 0L),
+		isPinned = json.getBooleanOrDefault("pinned", false),
 	)
 
 	fun toMap(): Map<String, Any?> {

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

@@ -89,6 +89,9 @@ class JsonSerializer private constructor(private val json: JSONObject) {
 			put("source", e.source)
 			put("enabled", e.isEnabled)
 			put("sort_key", e.sortKey)
+			put("added_in", e.addedIn)
+			put("used_at", e.lastUsedAt)
+			put("pinned", e.isPinned)
 		},
 	)
 

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

@@ -16,16 +16,16 @@ class MemoryContentCache @Inject constructor(application: Application) : Compone
 
 	private val isLowRam = application.isLowRamDevice()
 
-	init {
-		application.registerComponentCallbacks(this)
-	}
-
 	private val detailsCache = ExpiringLruCache<SafeDeferred<Manga>>(if (isLowRam) 1 else 4, 5, TimeUnit.MINUTES)
 	private val pagesCache =
 		ExpiringLruCache<SafeDeferred<List<MangaPage>>>(if (isLowRam) 1 else 4, 10, TimeUnit.MINUTES)
 	private val relatedMangaCache =
 		ExpiringLruCache<SafeDeferred<List<Manga>>>(if (isLowRam) 1 else 3, 10, TimeUnit.MINUTES)
 
+	init {
+		application.registerComponentCallbacks(this)
+	}
+
 	suspend fun getDetails(source: MangaSource, url: String): Manga? {
 		return detailsCache[Key(source, url)]?.awaitOrNull()
 	}

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

@@ -33,6 +33,8 @@ import org.koitharu.kotatsu.core.db.migrations.Migration17To18
 import org.koitharu.kotatsu.core.db.migrations.Migration18To19
 import org.koitharu.kotatsu.core.db.migrations.Migration19To20
 import org.koitharu.kotatsu.core.db.migrations.Migration1To2
+import org.koitharu.kotatsu.core.db.migrations.Migration20To21
+import org.koitharu.kotatsu.core.db.migrations.Migration21To22
 import org.koitharu.kotatsu.core.db.migrations.Migration2To3
 import org.koitharu.kotatsu.core.db.migrations.Migration3To4
 import org.koitharu.kotatsu.core.db.migrations.Migration4To5
@@ -58,7 +60,7 @@ import org.koitharu.kotatsu.tracker.data.TrackEntity
 import org.koitharu.kotatsu.tracker.data.TrackLogEntity
 import org.koitharu.kotatsu.tracker.data.TracksDao
 
-const val DATABASE_VERSION = 20
+const val DATABASE_VERSION = 22
 
 @Database(
 	entities = [
@@ -118,6 +120,8 @@ fun getDatabaseMigrations(context: Context): Array<Migration> = arrayOf(
 	Migration17To18(),
 	Migration18To19(),
 	Migration19To20(),
+	Migration20To21(),
+	Migration21To22(),
 )
 
 fun MangaDatabase(context: Context): MangaDatabase = Room

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

@@ -11,19 +11,26 @@ import androidx.sqlite.db.SimpleSQLiteQuery
 import androidx.sqlite.db.SupportSQLiteQuery
 import kotlinx.coroutines.flow.Flow
 import org.intellij.lang.annotations.Language
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.explore.data.SourcesSortOrder
 
 @Dao
 abstract class MangaSourcesDao {
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract suspend fun findAll(): List<MangaSourceEntity>
 
 	@Query("SELECT source FROM sources WHERE enabled = 1")
 	abstract suspend fun findAllEnabledNames(): List<String>
 
-	@Query("SELECT * FROM sources ORDER BY sort_key")
+	@Query("SELECT * FROM sources WHERE added_in >= :version")
+	abstract suspend fun findAllFromVersion(version: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY used_at DESC LIMIT :limit")
+	abstract suspend fun findLastUsed(limit: Int): List<MangaSourceEntity>
+
+	@Query("SELECT * FROM sources ORDER BY pinned DESC, sort_key")
 	abstract fun observeAll(): Flow<List<MangaSourceEntity>>
 
 	@Query("SELECT enabled FROM sources WHERE source = :source")
@@ -38,6 +45,12 @@ abstract class MangaSourcesDao {
 	@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
 	abstract suspend fun setSortKey(source: String, sortKey: Int)
 
+	@Query("UPDATE sources SET used_at = :value WHERE source = :source")
+	abstract suspend fun setLastUsed(source: String, value: Long)
+
+	@Query("UPDATE sources SET pinned = :isPinned WHERE source = :source")
+	abstract suspend fun setPinned(source: String, isPinned: Boolean)
+
 	@Insert(onConflict = OnConflictStrategy.IGNORE)
 	@Transaction
 	abstract suspend fun insertIfAbsent(entries: Collection<MangaSourceEntity>)
@@ -45,11 +58,14 @@ abstract class MangaSourcesDao {
 	@Upsert
 	abstract suspend fun upsert(entry: MangaSourceEntity)
 
+	@Query("SELECT * FROM sources WHERE pinned = 1")
+	abstract suspend fun findAllPinned(): List<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")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return observeImpl(query)
 	}
 
@@ -57,7 +73,7 @@ abstract class MangaSourcesDao {
 		val orderBy = getOrderBy(order)
 
 		@Language("RoomSql")
-		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY $orderBy")
+		val query = SimpleSQLiteQuery("SELECT * FROM sources WHERE enabled = 1 ORDER BY pinned DESC, $orderBy")
 		return findAllImpl(query)
 	}
 
@@ -68,6 +84,9 @@ abstract class MangaSourcesDao {
 				source = source,
 				isEnabled = isEnabled,
 				sortKey = getMaxSortKey() + 1,
+				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
 			)
 			upsert(entity)
 		}
@@ -86,5 +105,6 @@ abstract class MangaSourcesDao {
 		SourcesSortOrder.ALPHABETIC -> "source ASC"
 		SourcesSortOrder.POPULARITY -> "(SELECT COUNT(*) FROM manga WHERE source = sources.source) DESC"
 		SourcesSortOrder.MANUAL -> "sort_key ASC"
+		SourcesSortOrder.LAST_USED -> "used_at DESC"
 	}
 }

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

@@ -14,4 +14,7 @@ data class MangaSourceEntity(
 	val source: String,
 	@ColumnInfo(name = "enabled") val isEnabled: Boolean,
 	@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
+	@ColumnInfo(name = "added_in") val addedIn: Int,
+	@ColumnInfo(name = "used_at") val lastUsedAt: Long,
+	@ColumnInfo(name = "pinned") val isPinned: Boolean,
 )

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20To21 : Migration(20, 21) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE tracks ADD COLUMN `last_error` TEXT DEFAULT NULL")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `added_in` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21To22 : Migration(21, 22) {
+
+	override fun migrate(db: SupportSQLiteDatabase) {
+		db.execSQL("ALTER TABLE sources ADD COLUMN `used_at` INTEGER NOT NULL DEFAULT 0")
+		db.execSQL("ALTER TABLE sources ADD COLUMN `pinned` INTEGER NOT NULL DEFAULT 0")
+	}
+}

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

@@ -1,36 +1,48 @@
 package org.koitharu.kotatsu.core.exceptions.resolve
 
+import android.content.Context
+import android.widget.Toast
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
-import androidx.collection.ArrayMap
+import androidx.collection.MutableScatterMap
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.alternatives.ui.AlternativesActivity
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.ui.BaseActivity.BaseActivityEntryPoint
 import org.koitharu.kotatsu.core.ui.dialog.ErrorDetailsDialog
 import org.koitharu.kotatsu.core.util.TaggedActivityResult
+import org.koitharu.kotatsu.core.util.ext.findActivity
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
+import java.security.cert.CertPathValidatorException
+import javax.net.ssl.SSLException
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 
-	private val continuations = ArrayMap<String, Continuation<Boolean>>(1)
+	private val continuations = MutableScatterMap<String, Continuation<Boolean>>(1)
 	private val activity: FragmentActivity?
 	private val fragment: Fragment?
 	private val sourceAuthContract: ActivityResultLauncher<MangaSource>
 	private val cloudflareContract: ActivityResultLauncher<CloudFlareProtectedException>
 
+	val context: Context?
+		get() = activity ?: fragment?.context
+
 	constructor(activity: FragmentActivity) {
 		this.activity = activity
 		fragment = null
@@ -56,6 +68,12 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 	suspend fun resolve(e: Throwable): Boolean = when (e) {
 		is CloudFlareProtectedException -> resolveCF(e)
 		is AuthRequiredException -> resolveAuthException(e.source)
+		is SSLException,
+		is CertPathValidatorException -> {
+			showSslErrorDialog()
+			false
+		}
+
 		is NotFoundException -> {
 			openInBrowser(e.url)
 			false
@@ -80,13 +98,37 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 	}
 
 	private fun openInBrowser(url: String) {
-		val context = activity ?: fragment?.activity ?: return
-		context.startActivity(BrowserActivity.newIntent(context, url, null, null))
+		context?.run {
+			startActivity(BrowserActivity.newIntent(this, url, null, null))
+		}
 	}
 
 	private fun openAlternatives(manga: Manga) {
-		val context = activity ?: fragment?.activity ?: return
-		context.startActivity(AlternativesActivity.newIntent(context, manga))
+		context?.run {
+			startActivity(AlternativesActivity.newIntent(this, manga))
+		}
+	}
+
+	private fun showSslErrorDialog() {
+		val ctx = context ?: return
+		val settings = getAppSettings(ctx)
+		if (settings.isSSLBypassEnabled) {
+			Toast.makeText(ctx, R.string.operation_not_supported, Toast.LENGTH_SHORT).show()
+			return
+		}
+		MaterialAlertDialogBuilder(ctx)
+			.setTitle(R.string.ignore_ssl_errors)
+			.setMessage(R.string.ignore_ssl_errors_summary)
+			.setPositiveButton(R.string.apply) { _, _ ->
+				settings.isSSLBypassEnabled = true
+				Toast.makeText(ctx, R.string.settings_apply_restart_required, Toast.LENGTH_SHORT).show()
+				ctx.findActivity()?.finishAffinity()
+			}.setNegativeButton(android.R.string.cancel, null)
+			.show()
+	}
+
+	private fun getAppSettings(context: Context): AppSettings {
+		return EntryPointAccessors.fromApplication<BaseActivityEntryPoint>(context).settings
 	}
 
 	private fun getFragmentManager() = checkNotNull(fragment?.childFragmentManager ?: activity?.supportFragmentManager)
@@ -99,6 +141,9 @@ class ExceptionResolver : ActivityResultCallback<TaggedActivityResult> {
 			is AuthRequiredException -> R.string.sign_in
 			is NotFoundException -> if (e.url.isNotEmpty()) R.string.open_in_browser else 0
 			is UnsupportedSourceException -> if (e.manga != null) R.string.alternatives else 0
+			is SSLException,
+			is CertPathValidatorException -> R.string.fix
+
 			else -> 0
 		}
 

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

@@ -15,15 +15,13 @@ import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.toTitleCase
-import java.util.Locale
 import com.google.android.material.R as materialR
 
 fun MangaSource(name: String): MangaSource {
 	MangaSource.entries.forEach {
 		if (it.name == name) return it
 	}
-	return MangaSource.DUMMY
+	return MangaSource.UNKNOWN
 }
 
 fun MangaSource.isNsfw() = contentType == ContentType.HENTAI
@@ -39,7 +37,7 @@ val ContentType.titleResId
 
 fun MangaSource.getSummary(context: Context): String {
 	val type = context.getString(contentType.titleResId)
-	val locale = locale?.toLocale().getDisplayName(context)
+	val locale = locale.toLocale().getDisplayName(context)
 	return context.getString(R.string.source_summary_pattern, type, locale)
 }
 

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

@@ -25,7 +25,7 @@ data class ParcelableChapter(
 				scanlator = parcel.readString(),
 				uploadDate = parcel.readLong(),
 				branch = parcel.readString(),
-				source = parcel.readSerializableCompat() ?: MangaSource.DUMMY,
+				source = parcel.readSerializableCompat() ?: MangaSource.UNKNOWN,
 			)
 		)
 

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

@@ -4,8 +4,10 @@ import android.util.Log
 import dagger.Lazy
 import okhttp3.Headers
 import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
 import okhttp3.Request
 import okhttp3.Response
+import okio.IOException
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -13,6 +15,7 @@ import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mergeWith
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import java.net.IDN
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,7 +26,7 @@ class CommonHeadersInterceptor @Inject constructor(
 	private val mangaLoaderContextLazy: Lazy<MangaLoaderContextImpl>,
 ) : Interceptor {
 
-	override fun intercept(chain: Interceptor.Chain): Response {
+	override fun intercept(chain: Chain): Response {
 		val request = chain.request()
 		val source = request.tag(MangaSource::class.java)
 		val repository = if (source != null) {
@@ -46,7 +49,7 @@ class CommonHeadersInterceptor @Inject constructor(
 			headersBuilder.trySet(CommonHeaders.REFERER, "https://$idn/")
 		}
 		val newRequest = request.newBuilder().headers(headersBuilder.build()).build()
-		return repository?.intercept(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
+		return repository?.interceptSafe(ProxyChain(chain, newRequest)) ?: chain.proceed(newRequest)
 	}
 
 	private fun Headers.Builder.trySet(name: String, value: String) = try {
@@ -55,10 +58,21 @@ class CommonHeadersInterceptor @Inject constructor(
 		e.printStackTraceDebug()
 	}
 
+	private fun Interceptor.interceptSafe(chain: Chain): Response = runCatchingCancellable {
+		intercept(chain)
+	}.getOrElse { e ->
+		if (e is IOException) {
+			throw e
+		} else {
+			// only IOException can be safely thrown from an Interceptor
+			throw IOException("Error in interceptor: ${e.message}", e)
+		}
+	}
+
 	private class ProxyChain(
-		private val delegate: Interceptor.Chain,
+		private val delegate: Chain,
 		private val request: Request,
-	) : Interceptor.Chain by delegate {
+	) : Chain by delegate {
 
 		override fun request(): Request = request
 	}

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

@@ -83,6 +83,11 @@ class DoHManager(
 					tryGetByIp("2a10:50c0::2:ff"),
 				),
 			).build()
+
+		DoHProvider.ZERO_MS -> DnsOverHttps.Builder().client(bootstrapClient)
+			.url("https://2ca4h4crra.cloudflare-gateway.com/dns-query".toHttpUrl())
+			.resolvePublicAddresses(true)
+			.build()
 	}
 
 	private fun tryGetByIp(ip: String): InetAddress? = try {

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

@@ -2,5 +2,5 @@ package org.koitharu.kotatsu.core.network
 
 enum class DoHProvider {
 
-	NONE, GOOGLE, CLOUDFLARE, ADGUARD
-}
+	NONE, GOOGLE, CLOUDFLARE, ADGUARD, ZERO_MS
+}

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

@@ -1,106 +0,0 @@
-package org.koitharu.kotatsu.core.network
-
-import android.util.Log
-import androidx.collection.ArraySet
-import coil.intercept.Interceptor
-import coil.request.ErrorResult
-import coil.request.ImageResult
-import coil.request.SuccessResult
-import coil.size.Dimension
-import coil.size.isOriginal
-import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.koitharu.kotatsu.BuildConfig
-import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.util.ext.ensureSuccess
-import org.koitharu.kotatsu.core.util.ext.isHttpOrHttps
-import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.util.Collections
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ImageProxyInterceptor @Inject constructor(
-	private val settings: AppSettings,
-) : Interceptor {
-
-	private val blacklist = Collections.synchronizedSet(ArraySet<String>())
-
-	override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
-		val request = chain.request
-		if (!settings.isImagesProxyEnabled) {
-			return chain.proceed(request)
-		}
-		val url: HttpUrl? = when (val data = request.data) {
-			is HttpUrl -> data
-			is String -> data.toHttpUrlOrNull()
-			else -> null
-		}
-		if (url == null || !url.isHttpOrHttps || url.host in blacklist) {
-			return chain.proceed(request)
-		}
-		val newUrl = HttpUrl.Builder()
-			.scheme("https")
-			.host("wsrv.nl")
-			.addQueryParameter("url", url.toString())
-			.addQueryParameter("we", null)
-		val size = request.sizeResolver.size()
-		if (!size.isOriginal) {
-			newUrl.addQueryParameter("crop", "cover")
-			(size.height as? Dimension.Pixels)?.let { newUrl.addQueryParameter("h", it.toString()) }
-			(size.width as? Dimension.Pixels)?.let { newUrl.addQueryParameter("w", it.toString()) }
-		}
-
-		val newRequest = request.newBuilder()
-			.data(newUrl.build())
-			.build()
-		val result = chain.proceed(newRequest)
-		return if (result is SuccessResult) {
-			result
-		} else {
-			logDebug((result as? ErrorResult)?.throwable)
-			chain.proceed(request).also {
-				if (it is SuccessResult) {
-					blacklist.add(url.host)
-				}
-			}
-		}
-	}
-
-	suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
-		if (!settings.isImagesProxyEnabled) {
-			return okHttp.newCall(request).await()
-		}
-		val sourceUrl = request.url
-		val targetUrl = HttpUrl.Builder()
-			.scheme("https")
-			.host("wsrv.nl")
-			.addQueryParameter("url", sourceUrl.toString())
-			.addQueryParameter("we", null)
-		val newRequest = request.newBuilder()
-			.url(targetUrl.build())
-			.build()
-		return runCatchingCancellable {
-			okHttp.doCall(newRequest)
-		}.recover {
-			logDebug(it)
-			okHttp.doCall(request).also {
-				blacklist.add(sourceUrl.host)
-			}
-		}.getOrThrow()
-	}
-
-	private suspend fun OkHttpClient.doCall(request: Request): Response {
-		return newCall(request).await().ensureSuccess()
-	}
-
-	private fun logDebug(e: Throwable?) {
-		if (BuildConfig.DEBUG) {
-			Log.w("ImageProxy", e.toString())
-		}
-	}
-}

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

@@ -15,6 +15,8 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.cookies.AndroidCookieJar
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.network.cookies.PreferencesCookieJar
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
+import org.koitharu.kotatsu.core.network.imageproxy.RealImageProxyInterceptor
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.assertNotInMainThread
 import org.koitharu.kotatsu.local.data.LocalStorageManager
@@ -29,6 +31,9 @@ interface NetworkModule {
 	@Binds
 	fun bindCookieJar(androidCookieJar: MutableCookieJar): CookieJar
 
+	@Binds
+	fun bindImageProxyInterceptor(impl: RealImageProxyInterceptor): ImageProxyInterceptor
+
 	companion object {
 
 		@Provides

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

@@ -0,0 +1,87 @@
+package org.koitharu.kotatsu.core.network.imageproxy
+
+import android.util.Log
+import androidx.collection.ArraySet
+import coil.intercept.Interceptor
+import coil.network.HttpException
+import coil.request.ErrorResult
+import coil.request.ImageRequest
+import coil.request.ImageResult
+import coil.request.SuccessResult
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.HttpStatusException
+import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.core.exceptions.CloudFlareBlockedException
+import org.koitharu.kotatsu.core.util.ext.ensureSuccess
+import org.koitharu.kotatsu.core.util.ext.isHttpOrHttps
+import org.koitharu.kotatsu.parsers.util.await
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import java.net.HttpURLConnection
+import java.util.Collections
+
+abstract class BaseImageProxyInterceptor : ImageProxyInterceptor {
+
+	private val blacklist = Collections.synchronizedSet(ArraySet<String>())
+
+	final override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+		val request = chain.request
+		val url: HttpUrl? = when (val data = request.data) {
+			is HttpUrl -> data
+			is String -> data.toHttpUrlOrNull()
+			else -> null
+		}
+		if (url == null || !url.isHttpOrHttps || url.host in blacklist) {
+			return chain.proceed(request)
+		}
+		val newRequest = onInterceptImageRequest(request, url)
+		return when (val result = chain.proceed(newRequest)) {
+			is SuccessResult -> result
+			is ErrorResult -> {
+				logDebug(result.throwable, newRequest.data)
+				chain.proceed(request).also {
+					if (it is SuccessResult && result.throwable.isBlockedByServer()) {
+						blacklist.add(url.host)
+					}
+				}
+			}
+		}
+	}
+
+	final override suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
+		val newRequest = onInterceptPageRequest(request)
+		return runCatchingCancellable {
+			okHttp.doCall(newRequest)
+		}.recover { error ->
+			logDebug(error, newRequest.url)
+			okHttp.doCall(request).also {
+				if (error.isBlockedByServer()) {
+					blacklist.add(request.url.host)
+				}
+			}
+		}.getOrThrow()
+	}
+
+	protected abstract suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest
+
+	protected abstract suspend fun onInterceptPageRequest(request: Request): Request
+
+	private suspend fun OkHttpClient.doCall(request: Request): Response {
+		return newCall(request).await().ensureSuccess()
+	}
+
+	private fun logDebug(e: Throwable, url: Any) {
+		if (BuildConfig.DEBUG) {
+			Log.w("ImageProxy", "${e.message}: $url", e)
+		}
+	}
+
+	private fun Throwable.isBlockedByServer(): Boolean {
+		return this is CloudFlareBlockedException
+			|| (this is HttpException && response.code == HttpURLConnection.HTTP_FORBIDDEN)
+			|| (this is HttpStatusException && statusCode == HttpURLConnection.HTTP_FORBIDDEN)
+	}
+}

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

@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.network.imageproxy
+
+import coil.intercept.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+
+interface ImageProxyInterceptor : Interceptor {
+
+	suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response
+}

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

@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.core.network.imageproxy
+
+import coil.intercept.Interceptor
+import coil.request.ImageResult
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.plus
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import org.koitharu.kotatsu.parsers.util.await
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RealImageProxyInterceptor @Inject constructor(
+	private val settings: AppSettings,
+) : ImageProxyInterceptor {
+
+	private val delegate = settings.observeAsStateFlow(
+		scope = processLifecycleScope + Dispatchers.Default,
+		key = AppSettings.KEY_IMAGES_PROXY,
+		valueProducer = { createDelegate() },
+	)
+
+	override suspend fun intercept(chain: Interceptor.Chain): ImageResult {
+		return delegate.value?.intercept(chain) ?: chain.proceed(chain.request)
+	}
+
+	override suspend fun interceptPageRequest(request: Request, okHttp: OkHttpClient): Response {
+		return delegate.value?.interceptPageRequest(request, okHttp) ?: okHttp.newCall(request).await()
+	}
+
+	private fun createDelegate(): ImageProxyInterceptor? = when (val proxy = settings.imagesProxy) {
+		-1 -> null
+		0 -> WsrvNlProxyInterceptor()
+		1 -> ZeroMsProxyInterceptor()
+		else -> error("Unsupported images proxy $proxy")
+	}
+}

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

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.network.imageproxy
+
+import coil.request.ImageRequest
+import coil.size.Dimension
+import coil.size.isOriginal
+import okhttp3.HttpUrl
+import okhttp3.Request
+
+class WsrvNlProxyInterceptor : BaseImageProxyInterceptor() {
+
+	override suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest {
+		val newUrl = HttpUrl.Builder()
+			.scheme("https")
+			.host("wsrv.nl")
+			.addQueryParameter("url", url.toString())
+			.addQueryParameter("we", null)
+		val size = request.sizeResolver.size()
+		if (!size.isOriginal) {
+			newUrl.addQueryParameter("crop", "cover")
+			(size.height as? Dimension.Pixels)?.let { newUrl.addQueryParameter("h", it.toString()) }
+			(size.width as? Dimension.Pixels)?.let { newUrl.addQueryParameter("w", it.toString()) }
+		}
+
+		return request.newBuilder()
+			.data(newUrl.build())
+			.build()
+	}
+
+	override suspend fun onInterceptPageRequest(request: Request): Request {
+		val sourceUrl = request.url
+		val targetUrl = HttpUrl.Builder()
+			.scheme("https")
+			.host("wsrv.nl")
+			.addQueryParameter("url", sourceUrl.toString())
+			.addQueryParameter("we", null)
+		return request.newBuilder()
+			.url(targetUrl.build())
+			.build()
+	}
+}

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

@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.core.network.imageproxy
+
+import coil.request.ImageRequest
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Request
+
+class ZeroMsProxyInterceptor : BaseImageProxyInterceptor() {
+
+	override suspend fun onInterceptImageRequest(request: ImageRequest, url: HttpUrl): ImageRequest {
+		if (url.host == "x.0ms.dev" || url.host == "0ms.dev") {
+			return request
+		}
+		val newUrl = ("https://x.0ms.dev/q70/$url").toHttpUrl()
+		return request.newBuilder()
+			.data(newUrl)
+			.build()
+	}
+
+	override suspend fun onInterceptPageRequest(request: Request): Request {
+		val newUrl = ("https://x.0ms.dev/q70/${request.url}").toHttpUrl()
+		return request.newBuilder()
+			.url(newUrl)
+			.build()
+	}
+}

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

@@ -5,13 +5,15 @@ import android.net.ConnectivityManager.NetworkCallback
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.os.Build
 import kotlinx.coroutines.flow.first
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.MediatorStateFlow
-import org.koitharu.kotatsu.core.util.ext.isOnline
 
 class NetworkState(
 	private val connectivityManager: ConnectivityManager,
-) : MediatorStateFlow<Boolean>(connectivityManager.isOnline()) {
+	private val settings: AppSettings,
+) : MediatorStateFlow<Boolean>(connectivityManager.isOnline(settings)) {
 
 	private val callback = NetworkCallbackImpl()
 
@@ -22,6 +24,7 @@ class NetworkState(
 			.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
 			.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
 			.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+			.addTransportType(NetworkCapabilities.TRANSPORT_VPN)
 			.build()
 		connectivityManager.registerNetworkCallback(request, callback)
 	}
@@ -39,7 +42,7 @@ class NetworkState(
 	}
 
 	private fun invalidate() {
-		publishValue(connectivityManager.isOnline())
+		publishValue(connectivityManager.isOnline(settings))
 	}
 
 	private inner class NetworkCallbackImpl : NetworkCallback() {
@@ -50,4 +53,27 @@ class NetworkState(
 
 		override fun onUnavailable() = invalidate()
 	}
+
+	private companion object {
+
+		fun ConnectivityManager.isOnline(settings: AppSettings): Boolean {
+			if (settings.isOfflineCheckDisabled) {
+				return true
+			}
+			return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+				activeNetwork?.let { isOnline(it) } ?: false
+			} else {
+				@Suppress("DEPRECATION")
+				activeNetworkInfo?.isConnected == true
+			}
+		}
+
+		private fun ConnectivityManager.isOnline(network: Network): Boolean {
+			val capabilities = getNetworkCapabilities(network) ?: return false
+			return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+				|| capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+				|| capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+				|| capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
+		}
+	}
 }

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

@@ -0,0 +1,43 @@
+package org.koitharu.kotatsu.core.parser
+
+import android.graphics.Canvas
+import org.koitharu.kotatsu.parsers.bitmap.Bitmap
+import org.koitharu.kotatsu.parsers.bitmap.Rect
+import java.io.OutputStream
+import android.graphics.Bitmap as AndroidBitmap
+import android.graphics.Rect as AndroidRect
+
+class BitmapWrapper private constructor(
+	private val androidBitmap: AndroidBitmap,
+) : Bitmap {
+
+	private val canvas by lazy { Canvas(androidBitmap) } // is not always used, so initialized lazily
+
+	override val height: Int
+		get() = androidBitmap.height
+
+	override val width: Int
+		get() = androidBitmap.width
+
+	override fun drawBitmap(sourceBitmap: Bitmap, src: Rect, dst: Rect) {
+		val androidSourceBitmap = (sourceBitmap as BitmapWrapper).androidBitmap
+		canvas.drawBitmap(androidSourceBitmap, src.toAndroidRect(), dst.toAndroidRect(), null)
+	}
+
+	fun compressTo(output: OutputStream) {
+		androidBitmap.compress(AndroidBitmap.CompressFormat.PNG, 100, output)
+	}
+
+	companion object {
+
+		fun create(width: Int, height: Int): Bitmap = BitmapWrapper(
+			AndroidBitmap.createBitmap(width, height, AndroidBitmap.Config.ARGB_8888),
+		)
+
+		fun create(bitmap: AndroidBitmap): Bitmap = BitmapWrapper(
+			if (bitmap.isMutable) bitmap else bitmap.copy(AndroidBitmap.Config.ARGB_8888, true),
+		)
+
+		private fun Rect.toAndroidRect() = AndroidRect(left, top, right, bottom)
+	}
+}

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

@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaListFilter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import java.util.EnumSet
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class EmptyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("localhost")
+
+	override val availableSortOrders: Set<SortOrder>
+		get() = EnumSet.allOf(SortOrder::class.java)
+
+	override suspend fun getDetails(manga: Manga): Manga = stub(manga)
+
+	override suspend fun getList(offset: Int, filter: MangaListFilter?): List<Manga> = stub(null)
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> = stub(null)
+
+	override suspend fun getAvailableTags(): Set<MangaTag> = stub(null)
+
+	override suspend fun getRelatedManga(seed: Manga): List<Manga> = stub(seed)
+
+	private fun stub(manga: Manga?): Nothing {
+		throw UnsupportedSourceException("This manga source is not supported", manga)
+	}
+}

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

@@ -36,7 +36,7 @@ class MangaLinkResolver @Inject constructor(
 		require(uri.pathSegments.singleOrNull() == "manga") { "Invalid url" }
 		val sourceName = requireNotNull(uri.getQueryParameter("source")) { "Source is not specified" }
 		val source = MangaSource(sourceName)
-		require(source != MangaSource.DUMMY) { "Manga source $sourceName is not supported" }
+		require(source != MangaSource.UNKNOWN) { "Manga source $sourceName is not supported" }
 		val repo = repositoryFactory.create(source)
 		return repo.findExact(
 			url = uri.getQueryParameter("url"),

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.parser
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.BitmapFactory
 import android.util.Base64
 import android.webkit.WebView
 import androidx.annotation.MainThread
@@ -10,15 +11,21 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.asResponseBody
+import okio.Buffer
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.network.cookies.MutableCookieJar
 import org.koitharu.kotatsu.core.prefs.SourceSettings
 import org.koitharu.kotatsu.core.util.ext.configureForParser
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.core.util.ext.requireBody
 import org.koitharu.kotatsu.core.util.ext.sanitizeHeaderValue
 import org.koitharu.kotatsu.core.util.ext.toList
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.bitmap.Bitmap
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.network.UserAgents
@@ -68,6 +75,27 @@ class MangaLoaderContextImpl @Inject constructor(
 		return LocaleListCompat.getAdjustedDefault().toList()
 	}
 
+	override fun redrawImageResponse(response: Response, redraw: (image: Bitmap) -> Bitmap): Response {
+		val image = response.requireBody().byteStream()
+
+		val opts = BitmapFactory.Options()
+		opts.inMutable = true
+		val bitmap = BitmapFactory.decodeStream(image, null, opts) ?: error("Cannot decode bitmap")
+		val result = redraw(BitmapWrapper.create(bitmap)) as BitmapWrapper
+
+		val body = Buffer().also {
+			result.compressTo(it.outputStream())
+		}.asResponseBody("image/jpeg".toMediaType())
+
+		return response.newBuilder()
+			.body(body)
+			.build()
+	}
+
+	override fun createBitmap(width: Int, height: Int): Bitmap {
+		return BitmapWrapper.create(width, height)
+	}
+
 	@MainThread
 	private fun obtainWebView(): WebView {
 		return webViewCached?.get() ?: WebView(androidContext).also {

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

@@ -5,9 +5,9 @@ import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
 fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
-	return if (source == MangaSource.DUMMY) {
-		DummyParser(loaderContext)
-	} else {
-		loaderContext.newParserInstance(source)
+	return when (source) {
+		MangaSource.UNKNOWN -> EmptyParser(loaderContext)
+		MangaSource.DUMMY -> DummyParser(loaderContext)
+		else -> loaderContext.newParserInstance(source)
 	}
 }

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

@@ -26,6 +26,7 @@ import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.util.ext.requireBody
 import org.koitharu.kotatsu.core.util.ext.writeAllCancellable
 import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.util.withExtraCloseable
@@ -150,10 +151,6 @@ class FaviconFetcher(
 		return if (networkResponse != null) DataSource.NETWORK else DataSource.DISK
 	}
 
-	private fun Response.requireBody(): ResponseBody {
-		return checkNotNull(body) { "response body == null" }
-	}
-
 	private fun Size.toCacheKey() = buildString {
 		append(width.toString())
 		append('x')

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

@@ -33,7 +33,6 @@ import org.koitharu.kotatsu.reader.domain.ReaderColorFilter
 import java.io.File
 import java.net.Proxy
 import java.util.EnumSet
-import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -136,6 +135,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
 		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
 
+	val isOfflineCheckDisabled: Boolean
+		get() = prefs.getBoolean(KEY_OFFLINE_DISABLED, false)
+
 	var isAllFavouritesVisible: Boolean
 		get() = prefs.getBoolean(KEY_ALL_FAVOURITES_VISIBLE, true)
 		set(value) = prefs.edit { putBoolean(KEY_ALL_FAVOURITES_VISIBLE, value) }
@@ -152,6 +154,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isTrackerNotificationsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_NOTIFICATIONS, true)
 
+	val isTrackerNsfwDisabled: Boolean
+		get() = prefs.getBoolean(KEY_TRACKER_NO_NSFW, false)
+
 	var notificationSound: Uri
 		get() = prefs.getString(KEY_NOTIFICATIONS_SOUND, null)?.toUriOrNull()
 			?: Settings.System.DEFAULT_NOTIFICATION_URI
@@ -284,17 +289,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		get() = prefs.getBoolean(KEY_SOURCES_GRID, true)
 		set(value) = prefs.edit { putBoolean(KEY_SOURCES_GRID, value) }
 
-	val isNewSourcesTipEnabled: Boolean
-		get() = prefs.getBoolean(KEY_SOURCES_NEW, true)
+	var sourcesVersion: Int
+		get() = prefs.getInt(KEY_SOURCES_VERSION, 0)
+		set(value) = prefs.edit { putInt(KEY_SOURCES_VERSION, value) }
 
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
 	val screenshotsPolicy: ScreenshotsPolicy
-		get() = runCatching {
-			val key = prefs.getString(KEY_SCREENSHOTS_POLICY, null)?.uppercase(Locale.ROOT)
-			if (key == null) ScreenshotsPolicy.ALLOW else ScreenshotsPolicy.valueOf(key)
-		}.getOrDefault(ScreenshotsPolicy.ALLOW)
+		get() = prefs.getEnumValue(KEY_SCREENSHOTS_POLICY, ScreenshotsPolicy.ALLOW)
 
 	var userSpecifiedMangaDirectories: Set<File>
 		get() {
@@ -377,14 +380,18 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 			}
 		}
 
-	val isImagesProxyEnabled: Boolean
-		get() = prefs.getBoolean(KEY_IMAGES_PROXY, false)
+	val imagesProxy: Int
+		get() {
+			val raw = prefs.getString(KEY_IMAGES_PROXY, null)?.toIntOrNull()
+			return raw ?: if (prefs.getBoolean(KEY_IMAGES_PROXY_OLD, false)) 0 else -1
+		}
 
 	val dnsOverHttps: DoHProvider
 		get() = prefs.getEnumValue(KEY_DOH, DoHProvider.NONE)
 
-	val isSSLBypassEnabled: Boolean
+	var isSSLBypassEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SSL_BYPASS, false)
+		set(value) = prefs.edit { putBoolean(KEY_SSL_BYPASS, value) }
 
 	val proxyType: Proxy.Type
 		get() {
@@ -477,6 +484,15 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 	val isAutoLocalChaptersCleanupEnabled: Boolean
 		get() = prefs.getBoolean(KEY_CHAPTERS_CLEAR_AUTO, false)
 
+	fun isPagesCropEnabled(mode: ReaderMode): Boolean {
+		val rawValue = prefs.getStringSet(KEY_READER_CROP, emptySet())
+		if (rawValue.isNullOrEmpty()) {
+			return false
+		}
+		val needle = if (mode == ReaderMode.WEBTOON) READER_CROP_WEBTOON else READER_CROP_PAGED
+		return needle.toString() in rawValue
+	}
+
 	fun isTipEnabled(tip: String): Boolean {
 		return prefs.getStringSet(KEY_TIPS_CLOSED, emptySet())?.contains(tip) != true
 	}
@@ -544,8 +560,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 
 	companion object {
 
-		const val PAGE_SWITCH_VOLUME_KEYS = "volume"
-
 		const val TRACK_HISTORY = "history"
 		const val TRACK_FAVOURITES = "favourites"
 
@@ -557,6 +571,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_COLOR_THEME = "color_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
+		const val KEY_OFFLINE_DISABLED = "no_offline"
 		const val KEY_PAGES_CACHE_CLEAR = "pages_cache_clear"
 		const val KEY_HTTP_CACHE_CLEAR = "http_cache_clear"
 		const val KEY_COOKIES_CLEAR = "cookies_clear"
@@ -581,6 +596,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_TRACK_CATEGORIES = "track_categories"
 		const val KEY_TRACK_WARNING = "track_warning"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
+		const val KEY_TRACKER_NO_NSFW = "tracker_no_nsfw"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
@@ -589,11 +605,11 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_READER_ANIMATION = "reader_animation2"
 		const val KEY_READER_MODE = "reader_mode"
 		const val KEY_READER_MODE_DETECT = "reader_mode_detect"
+		const val KEY_READER_CROP = "reader_crop"
 		const val KEY_APP_PASSWORD = "app_password"
 		const val KEY_APP_PASSWORD_NUMERIC = "app_password_num"
 		const val KEY_PROTECT_APP = "protect_app"
 		const val KEY_PROTECT_APP_BIOMETRIC = "protect_app_bio"
-		const val KEY_APP_VERSION = "app_version"
 		const val KEY_ZOOM_MODE = "zoom_mode"
 		const val KEY_BACKUP = "backup"
 		const val KEY_RESTORE = "restore"
@@ -643,9 +659,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PREFETCH_CONTENT = "prefetch_content"
 		const val KEY_APP_LOCALE = "app_locale"
 		const val KEY_LOGGING_ENABLED = "logging"
-		const val KEY_LOGS_SHARE = "logs_share"
 		const val KEY_SOURCES_GRID = "sources_grid"
-		const val KEY_SOURCES_NEW = "sources_new"
 		const val KEY_UPDATES_UNSTABLE = "updates_unstable"
 		const val KEY_TIPS_CLOSED = "tips_closed"
 		const val KEY_SSL_BYPASS = "ssl_bypass"
@@ -658,7 +672,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PROXY_AUTH = "proxy_auth"
 		const val KEY_PROXY_LOGIN = "proxy_login"
 		const val KEY_PROXY_PASSWORD = "proxy_password"
-		const val KEY_IMAGES_PROXY = "images_proxy"
+		const val KEY_IMAGES_PROXY = "images_proxy_2"
 		const val KEY_LOCAL_MANGA_DIRS = "local_manga_dirs"
 		const val KEY_DISABLE_NSFW = "no_nsfw"
 		const val KEY_RELATED_MANGA = "related_manga"
@@ -672,7 +686,6 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_CF_CONTRAST = "cf_contrast"
 		const val KEY_CF_INVERTED = "cf_inverted"
 		const val KEY_CF_GRAYSCALE = "cf_grayscale"
-		const val KEY_IGNORE_DOZE = "ignore_dose"
 		const val KEY_PAGES_TAB = "pages_tab"
 		const val KEY_DETAILS_TAB = "details_tab"
 		const val KEY_DETAILS_LAST_TAB = "details_last_tab"
@@ -680,9 +693,23 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
 		const val KEY_PAGES_SAVE_DIR = "pages_dir"
 		const val KEY_PAGES_SAVE_ASK = "pages_dir_ask"
 		const val KEY_STATS_ENABLED = "stats_on"
-		const val KEY_APP_UPDATE = "app_update"
-		const val KEY_APP_TRANSLATION = "about_app_translation"
 		const val KEY_FEED_HEADER = "feed_header"
 		const val KEY_SEARCH_SUGGESTION_TYPES = "search_suggest_types"
+		const val KEY_SOURCES_VERSION = "sources_version"
+
+		// keys for non-persistent preferences
+		const val KEY_APP_VERSION = "app_version"
+		const val KEY_IGNORE_DOZE = "ignore_dose"
+		const val KEY_TRACKER_DEBUG = "tracker_debug"
+		const val KEY_LOGS_SHARE = "logs_share"
+		const val KEY_APP_UPDATE = "app_update"
+		const val KEY_APP_TRANSLATION = "about_app_translation"
+
+		// old keys are for migration only
+		private const val KEY_IMAGES_PROXY_OLD = "images_proxy"
+
+		// values
+		private const val READER_CROP_PAGED = 1
+		private const val READER_CROP_WEBTOON = 2
 	}
 }

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

@@ -3,5 +3,5 @@ package org.koitharu.kotatsu.core.prefs
 enum class ScreenshotsPolicy {
 
 	// Do not rename this
-	ALLOW, BLOCK_NSFW, BLOCK_ALL;
-}
+	ALLOW, BLOCK_NSFW, BLOCK_INCOGNITO, BLOCK_ALL;
+}

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

@@ -12,5 +12,6 @@ enum class SearchSuggestionType(
 	QUERIES_SUGGEST(R.string.suggested_queries),
 	MANGA(R.string.content_type_manga),
 	SOURCES(R.string.remote_sources),
+	RECENT_SOURCES(R.string.recent_sources),
 	AUTHORS(R.string.authors),
 }

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

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.core.prefs
 import android.content.Context
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import androidx.core.content.edit
-import okhttp3.internal.isSensitiveHeader
 import org.koitharu.kotatsu.core.util.ext.getEnumValue
 import org.koitharu.kotatsu.core.util.ext.ifNullOrEmpty
 import org.koitharu.kotatsu.core.util.ext.putEnumValue
@@ -12,6 +11,7 @@ import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.config.MangaSourceConfig
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.settings.utils.validation.DomainValidator
 
 class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig {
 
@@ -31,9 +31,14 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 				.ifNullOrEmpty { key.defaultValue }
 				.sanitizeHeaderValue()
 
-			is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
+			is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue)
+				?.trim()
+				?.takeIf { DomainValidator.isValidDomain(it) }
+				?: key.defaultValue
+
 			is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
 			is ConfigKey.SplitByTranslations -> prefs.getBoolean(key.key, key.defaultValue)
+			is ConfigKey.PreferredImageServer -> prefs.getString(key.key, key.defaultValue)?.takeUnless(String::isEmpty)
 		} as T
 	}
 
@@ -43,6 +48,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
 			is ConfigKey.ShowSuspiciousContent -> putBoolean(key.key, value as Boolean)
 			is ConfigKey.UserAgent -> putString(key.key, (value as String?)?.sanitizeHeaderValue())
 			is ConfigKey.SplitByTranslations -> putBoolean(key.key, value as Boolean)
+			is ConfigKey.PreferredImageServer -> putString(key.key, value as String? ?: "")
 		}
 	}
 

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.ui
 import android.content.Intent
 import android.content.res.Configuration
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -18,6 +19,8 @@ import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
@@ -25,10 +28,12 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.util.ActionModeDelegate
 import org.koitharu.kotatsu.core.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.util.ext.isWebViewUnavailable
+import org.koitharu.kotatsu.main.ui.protect.ScreenshotPolicyHelper
 
 @Suppress("LeakingThis")
 abstract class BaseActivity<B : ViewBinding> :
 	AppCompatActivity(),
+	ScreenshotPolicyHelper.ContentContainer,
 	WindowInsetsDelegate.WindowInsetsListener {
 
 	private var isAmoledTheme = false
@@ -92,11 +97,20 @@ abstract class BaseActivity<B : ViewBinding> :
 	}
 
 	override fun onSupportNavigateUp(): Boolean {
-		if (supportFragmentManager.backStackEntryCount > 0) {
-			supportFragmentManager.popBackStack()
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+			// TODO fix behavior on Android 14
+			dispatchNavigateUp()
+			return true
+		}
+		val fm = supportFragmentManager
+		if (fm.isStateSaved) {
 			return false
 		}
-		dispatchNavigateUp()
+		if (fm.backStackEntryCount > 0) {
+			fm.popBackStack()
+		} else {
+			dispatchNavigateUp()
+		}
 		return true
 	}
 
@@ -141,6 +155,8 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = flowOf(false)
+
 	private fun putDataToExtras(intent: Intent?) {
 		intent?.putExtra(EXTRA_DATA, intent.data)
 	}
@@ -160,6 +176,8 @@ abstract class BaseActivity<B : ViewBinding> :
 		}
 	}
 
+	protected fun hasViewBinding() = ::viewBinding.isInitialized
+
 	@EntryPoint
 	@InstallIn(SingletonComponent::class)
 	interface BaseActivityEntryPoint {

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

@@ -63,7 +63,7 @@ abstract class BasePreferenceFragment(@StringRes private val titleId: Int) :
 		)
 	}
 
-	protected fun setTitle(title: CharSequence?) {
+	protected open fun setTitle(title: CharSequence?) {
 		(activity as? SettingsActivity)?.setSectionTitle(title)
 	}
 

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

@@ -68,7 +68,7 @@ abstract class BaseViewModel : ViewModel() {
 		errorEvent.call(error)
 	}
 
-	protected inline suspend fun <T> withLoading(block: () -> T): T = try {
+	protected inline fun <T> withLoading(block: () -> T): T = try {
 		loadingCounter.increment()
 		block()
 	} finally {

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

@@ -1,15 +1,10 @@
 package org.koitharu.kotatsu.core.ui.image
 
 import android.graphics.Bitmap
-import androidx.annotation.ColorInt
-import androidx.core.graphics.alpha
-import androidx.core.graphics.blue
 import androidx.core.graphics.get
-import androidx.core.graphics.green
-import androidx.core.graphics.red
 import coil.size.Size
 import coil.transform.Transformation
-import kotlin.math.abs
+import org.koitharu.kotatsu.reader.domain.EdgeDetector.Companion.isColorTheSame
 
 class TrimTransformation(
 	private val tolerance: Int = 20,
@@ -28,7 +23,7 @@ class TrimTransformation(
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isColBlank = false
 					break
 				}
@@ -47,7 +42,7 @@ class TrimTransformation(
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isColBlank = false
 					break
 				}
@@ -63,7 +58,7 @@ class TrimTransformation(
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isRowBlank = false
 					break
 				}
@@ -79,7 +74,7 @@ class TrimTransformation(
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (!isColorTheSame(input[x, y], prevColor)) {
+				if (!isColorTheSame(input[x, y], prevColor, tolerance)) {
 					isRowBlank = false
 					break
 				}
@@ -98,13 +93,6 @@ class TrimTransformation(
 		}
 	}
 
-	private fun isColorTheSame(@ColorInt a: Int, @ColorInt b: Int): Boolean {
-		return abs(a.red - b.red) <= tolerance &&
-			abs(a.green - b.green) <= tolerance &&
-			abs(a.blue - b.blue) <= tolerance &&
-			abs(a.alpha - b.alpha) <= tolerance
-	}
-
 	override fun equals(other: Any?): Boolean {
 		return this === other || (other is TrimTransformation && other.tolerance == tolerance)
 	}

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

@@ -52,6 +52,16 @@ class FastScrollRecyclerView @JvmOverloads constructor(
 		fastScroller.visibility = if (isFastScrollerEnabled) visibility else GONE
 	}
 
+	override fun setPadding(left: Int, top: Int, right: Int, bottom: Int) {
+		super.setPadding(left, top, right, bottom)
+		fastScroller.setPadding(left, top, right, bottom)
+	}
+
+	override fun setPaddingRelative(start: Int, top: Int, end: Int, bottom: Int) {
+		super.setPaddingRelative(start, top, end, bottom)
+		fastScroller.setPaddingRelative(start, top, end, bottom)
+	}
+
 	override fun onAttachedToWindow() {
 		super.onAttachedToWindow()
 		fastScroller.attachRecyclerView(this)

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

@@ -1,22 +1,34 @@
 package org.koitharu.kotatsu.core.ui.sheet
 
+import android.annotation.SuppressLint
 import android.view.View
+import android.view.ViewGroup
+import androidx.activity.BackEventCompat
 import androidx.activity.OnBackPressedCallback
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
 
 class BottomSheetCollapseCallback(
-	private val behavior: BottomSheetBehavior<*>,
-) : OnBackPressedCallback(behavior.state == STATE_EXPANDED) {
+	private val sheet: ViewGroup,
+	private val behavior: BottomSheetBehavior<*> = BottomSheetBehavior.from(sheet),
+) : OnBackPressedCallback(behavior.state == STATE_EXPANDED || behavior.state == STATE_HALF_EXPANDED) {
 
 	init {
 		behavior.addBottomSheetCallback(
 			object : BottomSheetBehavior.BottomSheetCallback() {
 
+				@SuppressLint("SwitchIntDef")
 				override fun onStateChanged(view: View, state: Int) {
-					isEnabled = state == STATE_EXPANDED || state == STATE_HALF_EXPANDED
+					when (state) {
+						STATE_EXPANDED,
+						STATE_HALF_EXPANDED -> isEnabled = true
+
+						STATE_COLLAPSED,
+						STATE_HIDDEN -> isEnabled = false
+					}
 				}
 
 				override fun onSlide(p0: View, p1: Float) = Unit
@@ -24,7 +36,11 @@ class BottomSheetCollapseCallback(
 		)
 	}
 
-	override fun handleOnBackPressed() {
-		behavior.state = STATE_COLLAPSED
-	}
+	override fun handleOnBackPressed() = behavior.handleBackInvoked()
+
+	override fun handleOnBackCancelled() = behavior.cancelBackProgress()
+
+	override fun handleOnBackProgressed(backEvent: BackEventCompat) = behavior.updateBackProgress(backEvent)
+
+	override fun handleOnBackStarted(backEvent: BackEventCompat) = behavior.startBackProgress(backEvent)
 }

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

@@ -12,6 +12,8 @@ import com.google.android.material.chip.ChipGroup
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.castOrNull
 
+import com.google.android.material.R as materialR
+
 class ChipsView @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
@@ -24,7 +26,9 @@ class ChipsView @JvmOverloads constructor(
 		onChipClickListener?.onChipClick(it as Chip, it.tag)
 	}
 	private val chipOnCloseListener = OnClickListener {
-		onChipCloseClickListener?.onChipCloseClick(it as Chip, it.tag)
+		val chip = it as Chip
+		val data = it.tag
+		onChipCloseClickListener?.onChipCloseClick(chip, data) ?: onChipClickListener?.onChipClick(chip, data)
 	}
 	private val chipStyle: Int
 	var onChipClickListener: OnChipClickListener? = null
@@ -48,7 +52,7 @@ class ChipsView @JvmOverloads constructor(
 		if (isInEditMode) {
 			setChips(
 				List(5) {
-					ChipModel(0, "Chip $it", 0, isCheckable = false, isChecked = false)
+					ChipModel(title = "Chip $it")
 				},
 			)
 		}
@@ -99,6 +103,15 @@ class ChipsView @JvmOverloads constructor(
 			chip.isChipIconVisible = true
 		}
 		chip.isChecked = model.isChecked
+		chip.isCheckedIconVisible = chip.isCheckable && model.icon == 0
+		chip.isCloseIconVisible = if (onChipCloseClickListener != null || model.isDropdown) {
+			chip.setCloseIconResource(
+				if (model.isDropdown) R.drawable.ic_expand_more else materialR.drawable.ic_m3_chip_close,
+			)
+			true
+		} else {
+			false
+		}
 		chip.tag = model.data
 	}
 
@@ -106,12 +119,11 @@ class ChipsView @JvmOverloads constructor(
 		val chip = Chip(context)
 		val drawable = ChipDrawable.createFromAttributes(context, null, 0, chipStyle)
 		chip.setChipDrawable(drawable)
-		chip.isCheckedIconVisible = true
 		chip.isChipIconVisible = false
-		chip.isCloseIconVisible = onChipCloseClickListener != null
 		chip.setOnCloseIconClickListener(chipOnCloseListener)
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
+		chip.isElegantTextHeight = false
 		addView(chip)
 		return chip
 	}
@@ -127,11 +139,12 @@ class ChipsView @JvmOverloads constructor(
 	}
 
 	data class ChipModel(
-		@ColorRes val tint: Int,
 		val title: CharSequence,
-		@DrawableRes val icon: Int,
-		val isCheckable: Boolean,
-		val isChecked: Boolean,
+		@DrawableRes val icon: Int = 0,
+		val isCheckable: Boolean = false,
+		@ColorRes val tint: Int = 0,
+		val isChecked: Boolean = false,
+		val isDropdown: Boolean = false,
 		val data: Any? = null,
 	)
 

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

@@ -23,11 +23,16 @@ class SelectableTextView @JvmOverloads constructor(
 	private fun fixSelectionRange() {
 		if (selectionStart < 0 || selectionEnd < 0) {
 			val spannableText = text as? Spannable ?: return
-			Selection.setSelection(spannableText, text.length)
+			Selection.setSelection(spannableText, spannableText.length)
 		}
 	}
 
 	override fun scrollTo(x: Int, y: Int) {
 		super.scrollTo(0, 0)
 	}
+
+	fun selectAll() {
+		val spannableText = text as? Spannable ?: return
+		Selection.selectAll(spannableText)
+	}
 }

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

@@ -1,14 +1,27 @@
 package org.koitharu.kotatsu.core.util
 
 import androidx.core.os.LocaleListCompat
-import org.koitharu.kotatsu.core.util.ext.map
+import org.koitharu.kotatsu.core.util.ext.iterator
 import java.util.Locale
 
 class LocaleComparator : Comparator<Locale> {
 
-	private val deviceLocales = LocaleListCompat.getAdjustedDefault()//LocaleManagerCompat.getSystemLocales(context)
-		.map { it.language }
-		.distinct()
+	private val deviceLocales: List<String>
+
+	init {
+		val localeList = LocaleListCompat.getAdjustedDefault()
+		deviceLocales = buildList(localeList.size() + 1) {
+			add("")
+			val set = HashSet<String>(localeList.size() + 1)
+			set.add("")
+			for (locale in localeList) {
+				val lang = locale.language
+				if (set.add(lang)) {
+					add(lang)
+				}
+			}
+		}
+	}
 
 	override fun compare(a: Locale, b: Locale): Int {
 		val indexA = deviceLocales.indexOf(a.language)

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

@@ -19,6 +19,7 @@ import android.content.pm.ResolveInfo
 import android.database.SQLException
 import android.graphics.Bitmap
 import android.graphics.Color
+import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -75,6 +76,9 @@ val Context.activityManager: ActivityManager?
 val Context.powerManager: PowerManager?
 	get() = getSystemService(POWER_SERVICE) as? PowerManager
 
+val Context.connectivityManager: ConnectivityManager
+	get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
 fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
 
 suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatchingCancellable {

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

@@ -69,4 +69,11 @@ fun <T> Iterable<T>.sortedWithSafe(comparator: Comparator<in T>): List<T> = try
 	}
 }
 
-fun Collection<*>?.sizeOrZero() = if (this == null) 0 else size
+fun Collection<*>?.sizeOrZero() = this?.size ?: 0
+
+@Suppress("UNCHECKED_CAST")
+inline fun <T, reified R> Collection<T>.mapToArray(transform: (T) -> R): Array<R> {
+	val result = arrayOfNulls<R>(size)
+	forEachIndexed { index, t -> result[index] = transform(t) }
+	return result as Array<R>
+}

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

@@ -12,12 +12,16 @@ import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koitharu.kotatsu.core.util.AcraCoroutineErrorHandler
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
+import org.koitharu.kotatsu.parsers.util.cancelAll
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.coroutines.cancellation.CancellationException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
@@ -90,3 +94,10 @@ fun <T> Deferred<T>.peek(): T? = if (isCompleted) {
 } else {
 	null
 }
+
+@Suppress("SuspendFunctionOnCoroutineScope")
+suspend fun CoroutineScope.cancelChildrenAndJoin(cause: CancellationException? = null) {
+	val jobs = coroutineContext[Job]?.children?.toList() ?: return
+	jobs.cancelAll(cause)
+	jobs.joinAll()
+}

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.util.ext
 
+import android.graphics.Bitmap
 import android.graphics.Rect
 import kotlin.math.roundToInt
 
@@ -11,3 +12,9 @@ fun Rect.scale(factor: Double) {
 		(height() - newHeight) / 2,
 	)
 }
+
+inline fun <R> Bitmap.use(block: (Bitmap) -> R) = try {
+	block(this)
+} finally {
+	recycle()
+}

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

@@ -1,13 +1,12 @@
 package org.koitharu.kotatsu.core.util.ext
 
 import okhttp3.Cookie
-import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
+import okhttp3.ResponseBody
 import okhttp3.internal.closeQuietly
-import okhttp3.internal.isSensitiveHeader
 import okio.IOException
 import org.json.JSONObject
 import org.jsoup.HttpStatusException
@@ -42,6 +41,8 @@ fun Response.ensureSuccess() = apply {
 	}
 }
 
+fun Response.requireBody(): ResponseBody = checkNotNull(body) { "Response body is null" }
+
 fun Cookie.newBuilder(): Cookie.Builder = Cookie.Builder().also { c ->
 	c.name(name)
 	c.value(value)

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

@@ -22,11 +22,10 @@ fun LocaleListCompat.getOrThrow(index: Int) = get(index) ?: throw NoSuchElementE
 
 fun String.toLocale() = Locale(this)
 
-fun Locale?.getDisplayName(context: Context): String {
-	if (this == null) {
-		return context.getString(R.string.various_languages)
-	}
-	return getDisplayLanguage(this).toTitleCase(this)
+fun Locale?.getDisplayName(context: Context): String = when (this) {
+	null -> context.getString(R.string.all_languages)
+	Locale.ROOT -> context.getString(R.string.various_languages)
+	else -> getDisplayLanguage(this).toTitleCase(this)
 }
 
 private class LocaleListCompatIterator(private val list: LocaleListCompat) : ListIterator<Locale> {

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

@@ -1,26 +0,0 @@
-package org.koitharu.kotatsu.core.util.ext
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.os.Build
-
-val Context.connectivityManager: ConnectivityManager
-	get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-fun ConnectivityManager.isOnline(): Boolean {
-	return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-		activeNetwork?.let { isOnline(it) } ?: false
-	} else {
-		@Suppress("DEPRECATION")
-		activeNetworkInfo?.isConnected == true
-	}
-}
-
-private fun ConnectivityManager.isOnline(network: Network): Boolean {
-	val capabilities = getNetworkCapabilities(network) ?: return false
-	return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-		|| capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
-		|| capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
-}

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

@@ -31,14 +31,15 @@ import coil.request.ImageRequest
 import coil.request.SuccessResult
 import coil.transform.CircleCropTransformation
 import coil.util.CoilUtils
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -122,7 +123,6 @@ class DetailsActivity :
 	lateinit var tagHighlighter: ListExtraProvider
 
 	private val viewModel: DetailsViewModel by viewModels()
-
 	private lateinit var menuProvider: DetailsMenuProvider
 
 	override fun onCreate(savedInstanceState: Bundle?) {
@@ -153,9 +153,10 @@ class DetailsActivity :
 		viewBinding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		viewBinding.chipsTags.onChipClickListener = this
 		TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView)
-		viewBinding.containerBottomSheet?.let { BottomSheetBehavior.from(it) }?.let { behavior ->
-			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(behavior))
+		viewBinding.containerBottomSheet?.let { sheet ->
+			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(sheet))
 		}
+		TitleExpandListener(viewBinding.textViewTitle).attach()
 
 		viewModel.details.filterNotNull().observe(this, ::onMangaUpdated)
 		viewModel.onMangaRemoved.observeEvent(this, ::onMangaRemoved)
@@ -198,6 +199,8 @@ class DetailsActivity :
 		addMenuProvider(menuProvider)
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.manga.map { it?.isNsfw == true }
+
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
@@ -460,7 +463,7 @@ class DetailsActivity :
 				imageViewState.isVisible = false
 			}
 
-			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.DUMMY) {
+			if (manga.source == MangaSource.LOCAL || manga.source == MangaSource.UNKNOWN) {
 				infoLayout.chipSource.isVisible = false
 			} else {
 				infoLayout.chipSource.text = manga.source.title
@@ -535,7 +538,7 @@ class DetailsActivity :
 		}
 		val isFirstCall = buttonRead.tag == null
 		buttonRead.tag = Unit
-		buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, !isFirstCall)
+		buttonRead.setProgress(info.percent.coerceIn(0f, 1f), !isFirstCall)
 		buttonDownload?.isEnabled = info.isValid && info.canDownload
 		buttonRead.isEnabled = info.isValid
 	}
@@ -613,10 +616,7 @@ class DetailsActivity :
 				ChipsView.ChipModel(
 					title = tag.title,
 					tint = tagHighlighter.getTagTint(tag),
-					icon = 0,
 					data = tag,
-					isCheckable = false,
-					isChecked = false,
 				)
 			},
 		)

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

@@ -93,15 +93,19 @@ class DetailsViewModel @Inject constructor(
 
 	val details = MutableStateFlow(intent.manga?.let { MangaDetails(it, null, null, false) })
 	val manga = details.map { x -> x?.toManga() }
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val history = historyRepository.observeOne(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	val favouriteCategories = interactor.observeFavourite(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptySet())
 
 	val isStatsAvailable = statsRepository.observeHasStats(mangaId)
+		.withErrorHandling()
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
 
 	val remoteManga = MutableStateFlow<Manga?>(null)
@@ -162,7 +166,7 @@ class DetailsViewModel @Inject constructor(
 
 	val onMangaRemoved = MutableEventFlow<Manga>()
 	val isScrobblingAvailable: Boolean
-		get() = scrobblers.any { it.isAvailable }
+		get() = scrobblers.any { it.isEnabled }
 
 	val scrobblingInfo: StateFlow<List<ScrobblingInfo>> = interactor.observeScrobblingInfo(mangaId)
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
@@ -393,7 +397,7 @@ class DetailsViewModel @Inject constructor(
 	private fun getScrobbler(index: Int): Scrobbler? {
 		val info = scrobblingInfo.value.getOrNull(index)
 		val scrobbler = if (info != null) {
-			scrobblers.find { it.scrobblerService == info.scrobbler && it.isAvailable }
+			scrobblers.find { it.scrobblerService == info.scrobbler && it.isEnabled }
 		} else {
 			null
 		}

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

@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.annotation.SuppressLint
+import android.transition.TransitionManager
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import android.view.View.OnTouchListener
+import android.view.ViewGroup
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.widgets.SelectableTextView
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
+
+@SuppressLint("ClickableViewAccessibility")
+class TitleExpandListener(
+	private val textView: SelectableTextView,
+) : GestureDetector.SimpleOnGestureListener(), OnTouchListener {
+
+	private val gestureDetector = GestureDetector(textView.context, this)
+	private val linesExpanded = textView.resources.getInteger(R.integer.details_description_lines)
+	private val linesCollapsed = textView.resources.getInteger(R.integer.details_title_lines)
+
+	override fun onTouch(v: View?, event: MotionEvent) = gestureDetector.onTouchEvent(event)
+
+	override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+		if (textView.context.isAnimationsEnabled) {
+			TransitionManager.beginDelayedTransition(textView.parent as ViewGroup)
+		}
+		if (textView.maxLines in 1 until Integer.MAX_VALUE) {
+			textView.maxLines = Integer.MAX_VALUE
+		} else {
+			textView.maxLines = linesCollapsed
+		}
+		return true
+	}
+
+	override fun onLongPress(e: MotionEvent) {
+		textView.maxLines = Integer.MAX_VALUE
+		textView.selectAll()
+	}
+
+	fun attach() {
+		textView.setOnTouchListener(this)
+	}
+}

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

@@ -16,6 +16,13 @@ data class HistoryInfo(
 
 	val canContinue
 		get() = currentChapter >= 0
+
+	val percent: Float
+		get() = if (history != null && (canContinue || isChapterMissing)) {
+			history.percent
+		} else {
+			0f
+		}
 }
 
 fun HistoryInfo(
@@ -24,7 +31,11 @@ fun HistoryInfo(
 	history: MangaHistory?,
 	isIncognitoMode: Boolean
 ): HistoryInfo {
-	val chapters = manga?.chapters?.get(branch)
+	val chapters = if (manga?.chapters?.isEmpty() == true) {
+		emptyList()
+	} else {
+		manga?.chapters?.get(branch)
+	}
 	val currentChapter = if (history != null && !chapters.isNullOrEmpty()) {
 		chapters.indexOfFirst { it.id == history.chapterId }
 	} else {

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/pages/MangaPageFetcher.kt

@@ -19,8 +19,8 @@ import okhttp3.OkHttpClient
 import okio.Path.Companion.toOkioPath
 import okio.buffer
 import okio.source
-import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.data.isFileUri
@@ -92,7 +92,7 @@ class MangaPageFetcher(
 			}
 
 			else -> {
-				val request = PageLoader.createPageRequest(page, pageUrl)
+				val request = PageLoader.createPageRequest(pageUrl, page.source)
 				imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use { response ->
 					if (!response.isSuccessful) {
 						throw HttpException(response)

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

@@ -35,16 +35,16 @@ import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import okhttp3.internal.closeQuietly
 import okio.IOException
 import okio.buffer
 import okio.sink
+import okio.use
 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.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -55,6 +55,7 @@ import org.koitharu.kotatsu.core.util.ext.awaitWorkInfosByTag
 import org.koitharu.kotatsu.core.util.ext.deleteAwait
 import org.koitharu.kotatsu.core.util.ext.deleteWork
 import org.koitharu.kotatsu.core.util.ext.deleteWorks
+import org.koitharu.kotatsu.core.util.ext.ensureSuccess
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.getWorkInputData
 import org.koitharu.kotatsu.core.util.ext.getWorkSpec
@@ -73,9 +74,9 @@ import org.koitharu.kotatsu.local.domain.model.LocalManga
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import java.io.File
 import java.util.UUID
 import java.util.concurrent.TimeUnit
@@ -93,6 +94,7 @@ class DownloadWorker @AssistedInject constructor(
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	private val settings: AppSettings,
 	@LocalStorageChanges private val localStorageChanges: MutableSharedFlow<LocalManga?>,
+	private val imageProxyInterceptor: ImageProxyInterceptor,
 	notificationFactoryFactory: DownloadNotificationFactory.Factory,
 ) : CoroutineWorker(appContext, params) {
 
@@ -327,28 +329,24 @@ class DownloadWorker @AssistedInject constructor(
 		destination: File,
 		source: MangaSource,
 	): File {
-		val request = Request.Builder()
-			.url(url)
-			.tag(MangaSource::class.java, source)
-			.header(CommonHeaders.ACCEPT, "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8")
-			.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
-			.get()
-			.build()
+		val request = PageLoader.createPageRequest(url, source)
 		slowdownDispatcher.delay(source)
-		val call = okHttp.newCall(request)
-		val file = File(destination, UUID.randomUUID().toString() + ".tmp")
-		try {
-			val response = call.clone().await()
-			checkNotNull(response.body).use { body ->
-				file.sink(append = false).buffer().use {
-					it.writeAllCancellable(body.source())
+		return imageProxyInterceptor.interceptPageRequest(request, okHttp)
+			.ensureSuccess()
+			.use { response ->
+				val file = File(destination, UUID.randomUUID().toString() + ".tmp")
+				try {
+					checkNotNull(response.body).use { body ->
+						file.sink(append = false).buffer().use {
+							it.writeAllCancellable(body.source())
+						}
+					}
+				} catch (e: CancellationException) {
+					file.delete()
+					throw e
 				}
+				file
 			}
-		} catch (e: CancellationException) {
-			file.delete()
-			throw e
-		}
-		return file
 	}
 
 	private suspend fun publishState(state: DownloadState) {

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

@@ -6,21 +6,22 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
-import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.prefs.AppSettings
 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 java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
 @Reusable
@@ -29,11 +30,13 @@ class MangaSourcesRepository @Inject constructor(
 	private val settings: AppSettings,
 ) {
 
+	private val isNewSourcesAssimilated = AtomicBoolean(false)
 	private val dao: MangaSourcesDao
 		get() = db.getSourcesDao()
 
 	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
 		remove(MangaSource.LOCAL)
+		remove(MangaSource.UNKNOWN)
 		if (!BuildConfig.DEBUG) {
 			remove(MangaSource.DUMMY)
 		}
@@ -43,25 +46,75 @@ class MangaSourcesRepository @Inject constructor(
 		get() = Collections.unmodifiableSet(remoteSources)
 
 	suspend fun getEnabledSources(): List<MangaSource> {
+		assimilateNewSources()
 		val order = settings.sourcesSortOrder
 		return dao.findAllEnabled(order).toSources(settings.isNsfwContentDisabled, order)
 	}
 
+	suspend fun getPinnedSources(): Set<MangaSource> {
+		assimilateNewSources()
+		val skipNsfw = settings.isNsfwContentDisabled
+		return dao.findAllPinned().mapNotNullTo(EnumSet.noneOf(MangaSource::class.java)) {
+			it.source.toMangaSourceOrNull()?.takeUnless { x -> skipNsfw && x.isNsfw() }
+		}
+	}
+
+	suspend fun getTopSources(limit: Int): List<MangaSource> {
+		assimilateNewSources()
+		return dao.findLastUsed(limit).toSources(settings.isNsfwContentDisabled, null)
+	}
+
 	suspend fun getDisabledSources(): Set<MangaSource> {
+		assimilateNewSources()
 		val result = EnumSet.copyOf(remoteSources)
 		val enabled = dao.findAllEnabledNames()
 		for (name in enabled) {
-			val source = MangaSource(name)
+			val source = name.toMangaSourceOrNull() ?: continue
 			result.remove(source)
 		}
-		if (settings.isNsfwContentDisabled) {
-			result.removeAll { it.isNsfw() }
-		}
 		return result
 	}
 
+	suspend fun getAvailableSources(
+		isDisabledOnly: Boolean,
+		isNewOnly: Boolean,
+		excludeBroken: Boolean,
+		types: Set<ContentType>,
+		query: String?,
+		locale: String?,
+		sortOrder: SourcesSortOrder?,
+	): List<MangaSource> {
+		assimilateNewSources()
+		val entities = dao.findAll().toMutableList()
+		if (isDisabledOnly) {
+			entities.removeAll { it.isEnabled }
+		}
+		if (isNewOnly) {
+			entities.retainAll { it.addedIn == BuildConfig.VERSION_CODE }
+		}
+		val sources = entities.toSources(
+			skipNsfwSources = settings.isNsfwContentDisabled,
+			sortOrder = sortOrder,
+		)
+		if (locale != null) {
+			sources.retainAll { it.locale == locale }
+		}
+		if (excludeBroken) {
+			sources.removeAll { it.isBroken }
+		}
+		if (types.isNotEmpty()) {
+			sources.retainAll { it.contentType in types }
+		}
+		if (!query.isNullOrEmpty()) {
+			sources.retainAll {
+				it.title.contains(query, ignoreCase = true) || it.name.contains(query, ignoreCase = true)
+			}
+		}
+		return sources
+	}
+
 	fun observeIsEnabled(source: MangaSource): Flow<Boolean> {
-		return dao.observeIsEnabled(source.name)
+		return dao.observeIsEnabled(source.name).onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSourcesCount(): Flow<Int> {
@@ -69,8 +122,10 @@ class MangaSourcesRepository @Inject constructor(
 			observeIsNsfwDisabled(),
 			dao.observeEnabled(SourcesSortOrder.MANUAL),
 		) { skipNsfw, sources ->
-			sources.count { !skipNsfw || !MangaSource(it.source).isNsfw() }
-		}.distinctUntilChanged()
+			sources.count {
+				it.source.toMangaSourceOrNull()?.let { s -> !skipNsfw || !s.isNsfw() } == true
+			}
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeAvailableSourcesCount(): Flow<Int> {
@@ -82,7 +137,7 @@ class MangaSourcesRepository @Inject constructor(
 			allMangaSources.count { x ->
 				x.name !in enabled && (!skipNsfw || !x.isNsfw())
 			}
-		}.distinctUntilChanged()
+		}.distinctUntilChanged().onStart { assimilateNewSources() }
 	}
 
 	fun observeEnabledSources(): Flow<List<MangaSource>> = combine(
@@ -92,18 +147,18 @@ class MangaSourcesRepository @Inject constructor(
 		dao.observeEnabled(order).map {
 			it.toSources(skipNsfw, order)
 		}
-	}.flatMapLatest { it }
+	}.flatMapLatest { it }.onStart { assimilateNewSources() }
 
 	fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
 		val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
 		for (entity in entities) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (source in remoteSources) {
 				result.add(source to entity.isEnabled)
 			}
 		}
 		result
-	}
+	}.onStart { assimilateNewSources() }
 
 	suspend fun setSourcesEnabled(sources: Collection<MangaSource>, isEnabled: Boolean): ReversibleHandle {
 		setSourcesEnabledImpl(sources, isEnabled)
@@ -114,6 +169,7 @@ class MangaSourcesRepository @Inject constructor(
 
 	suspend fun setSourcesEnabledExclusive(sources: Set<MangaSource>) {
 		db.withTransaction {
+			assimilateNewSources()
 			for (s in remoteSources) {
 				dao.setEnabled(s.name, s in sources)
 			}
@@ -135,31 +191,34 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	fun observeNewSources(): Flow<Set<MangaSource>> = observeIsNewSourcesEnabled().flatMapLatest {
-		if (it) {
-			combine(
-				dao.observeAll(),
-				observeIsNsfwDisabled(),
-			) { entities, skipNsfw ->
-				val result = EnumSet.copyOf(remoteSources)
-				for (e in entities) {
-					result.remove(MangaSource(e.source))
-				}
-				if (skipNsfw) {
-					result.removeAll { x -> x.isNsfw() }
-				}
-				result
-			}.distinctUntilChanged()
+	fun observeHasNewSources(): Flow<Boolean> = observeIsNsfwDisabled().map { skipNsfw ->
+		val sources = dao.findAllFromVersion(BuildConfig.VERSION_CODE).toSources(skipNsfw, null)
+		sources.isNotEmpty() && sources.size != remoteSources.size
+	}.onStart { assimilateNewSources() }
+
+	fun observeHasNewSourcesForBadge(): Flow<Boolean> = combine(
+		settings.observeAsFlow(AppSettings.KEY_SOURCES_VERSION) { sourcesVersion },
+		observeIsNsfwDisabled(),
+	) { version, skipNsfw ->
+		if (version < BuildConfig.VERSION_CODE) {
+			val sources = dao.findAllFromVersion(version).toSources(skipNsfw, null)
+			sources.isNotEmpty()
 		} else {
-			assimilateNewSources()
-			flowOf(emptySet())
+			false
 		}
+	}.onStart { assimilateNewSources() }
+
+	fun clearNewSourcesBadge() {
+		settings.sourcesVersion = BuildConfig.VERSION_CODE
 	}
 
-	suspend fun assimilateNewSources(): Set<MangaSource> {
+	private suspend fun assimilateNewSources(): Boolean {
+		if (isNewSourcesAssimilated.getAndSet(true)) {
+			return false
+		}
 		val new = getNewSources()
 		if (new.isEmpty()) {
-			return emptySet()
+			return false
 		}
 		var maxSortKey = dao.getMaxSortKey()
 		val entities = new.map { x ->
@@ -167,17 +226,30 @@ class MangaSourcesRepository @Inject constructor(
 				source = x.name,
 				isEnabled = false,
 				sortKey = ++maxSortKey,
+				addedIn = BuildConfig.VERSION_CODE,
+				lastUsedAt = 0,
+				isPinned = false,
 			)
 		}
 		dao.insertIfAbsent(entities)
-		if (settings.isNsfwContentDisabled) {
-			new.removeAll { x -> x.isNsfw() }
-		}
-		return new
+		return true
 	}
 
 	suspend fun isSetupRequired(): Boolean {
-		return dao.findAll().isEmpty()
+		return settings.sourcesVersion == 0 && dao.findAllEnabledNames().isEmpty()
+	}
+
+	suspend fun setIsPinned(sources: Collection<MangaSource>, isPinned: Boolean): ReversibleHandle {
+		setSourcesPinnedImpl(sources, isPinned)
+		return ReversibleHandle {
+			setSourcesEnabledImpl(sources, !isPinned)
+		}
+	}
+
+	suspend fun trackUsage(source: MangaSource) {
+		if (!settings.isIncognitoModeEnabled && !(settings.isHistoryExcludeNsfw && source.isNsfw())) {
+			dao.setLastUsed(source.name, System.currentTimeMillis())
+		}
 	}
 
 	private suspend fun setSourcesEnabledImpl(sources: Collection<MangaSource>, isEnabled: Boolean) {
@@ -192,11 +264,23 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
+	private suspend fun setSourcesPinnedImpl(sources: Collection<MangaSource>, isPinned: Boolean) {
+		if (sources.size == 1) { // fast path
+			dao.setPinned(sources.first().name, isPinned)
+			return
+		}
+		db.withTransaction {
+			for (source in sources) {
+				dao.setPinned(source.name, isPinned)
+			}
+		}
+	}
+
 	private suspend fun getNewSources(): MutableSet<MangaSource> {
 		val entities = dao.findAll()
 		val result = EnumSet.copyOf(remoteSources)
 		for (e in entities) {
-			result.remove(MangaSource(e.source))
+			result.remove(e.source.toMangaSourceOrNull() ?: continue)
 		}
 		return result
 	}
@@ -204,19 +288,23 @@ class MangaSourcesRepository @Inject constructor(
 	private fun List<MangaSourceEntity>.toSources(
 		skipNsfwSources: Boolean,
 		sortOrder: SourcesSortOrder?,
-	): List<MangaSource> {
+	): MutableList<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
+		val pinned = EnumSet.noneOf(MangaSource::class.java)
 		for (entity in this) {
-			val source = MangaSource(entity.source)
+			val source = entity.source.toMangaSourceOrNull() ?: continue
 			if (skipNsfwSources && source.isNsfw()) {
 				continue
 			}
 			if (source in remoteSources) {
 				result.add(source)
+				if (entity.isPinned) {
+					pinned.add(source)
+				}
 			}
 		}
 		if (sortOrder == SourcesSortOrder.ALPHABETIC) {
-			result.sortBy { it.title }
+			result.sortWith(compareBy<MangaSource> { it in pinned }.thenBy { it.title })
 		}
 		return result
 	}
@@ -225,11 +313,9 @@ class MangaSourcesRepository @Inject constructor(
 		isNsfwContentDisabled
 	}
 
-	private fun observeIsNewSourcesEnabled() = settings.observeAsFlow(AppSettings.KEY_SOURCES_NEW) {
-		isNewSourcesTipEnabled
-	}
-
 	private fun observeSortOrder() = settings.observeAsFlow(AppSettings.KEY_SOURCES_ORDER) {
 		sourcesSortOrder
 	}
+
+	private fun String.toMangaSourceOrNull(): MangaSource? = MangaSource.entries.find { it.name == this }
 }

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

@@ -9,4 +9,5 @@ enum class SourcesSortOrder(
 	ALPHABETIC(R.string.by_name),
 	POPULARITY(R.string.popular),
 	MANUAL(R.string.manual),
+	LAST_USED(R.string.last_used),
 }

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

@@ -27,7 +27,6 @@ import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.util.RecyclerViewOwner
 import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
 import org.koitharu.kotatsu.core.ui.util.SpanSizeResolver
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.findAppCompatDelegate
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -40,13 +39,11 @@ import org.koitharu.kotatsu.explore.ui.adapter.ExploreListEventListener
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.TipModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.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
@@ -56,7 +53,7 @@ class ExploreFragment :
 	BaseFragment<FragmentExploreBinding>(),
 	RecyclerViewOwner,
 	ExploreListEventListener,
-	OnListItemClickListener<MangaSourceItem>, TipView.OnButtonClickListener, ListSelectionController.Callback2 {
+	OnListItemClickListener<MangaSourceItem>, ListSelectionController.Callback2 {
 
 	@Inject
 	lateinit var coil: ImageLoader
@@ -74,7 +71,7 @@ class ExploreFragment :
 
 	override fun onViewBindingCreated(binding: FragmentExploreBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this, this) { manga, view ->
+		exploreAdapter = ExploreAdapter(coil, viewLifecycleOwner, this, this) { manga, view ->
 			startActivity(DetailsActivity.newIntent(view.context, manga))
 		}
 		sourceSelectionController = ListSelectionController(
@@ -124,18 +121,6 @@ class ExploreFragment :
 		}
 	}
 
-	override fun onPrimaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> NewSourcesDialogFragment.show(childFragmentManager)
-		}
-	}
-
-	override fun onSecondaryButtonClick(tipView: TipView) {
-		when ((tipView.tag as? TipModel)?.key) {
-			ExploreViewModel.TIP_NEW_SOURCES -> viewModel.discardNewSources()
-		}
-	}
-
 	override fun onClick(v: View) {
 		val intent = when (v.id) {
 			R.id.button_local -> MangaListActivity.newIntent(v.context, MangaSource.LOCAL)
@@ -211,6 +196,16 @@ class ExploreFragment :
 				mode.finish()
 			}
 
+			R.id.action_pin -> {
+				viewModel.setSourcesPinned(selectedSources, isPinned = true)
+				mode.finish()
+			}
+
+			R.id.action_unpin -> {
+				viewModel.setSourcesPinned(selectedSources, isPinned = false)
+				mode.finish()
+			}
+
 			else -> return false
 		}
 		return true

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

@@ -102,18 +102,24 @@ class ExploreViewModel @Inject constructor(
 		}
 	}
 
-	fun discardNewSources() {
-		launchJob(Dispatchers.Default) {
-			sourcesRepository.assimilateNewSources()
-		}
-	}
-
 	fun requestPinShortcut(source: MangaSource) {
 		launchLoadingJob(Dispatchers.Default) {
 			shortcutManager.requestPinShortcut(source)
 		}
 	}
 
+	fun setSourcesPinned(sources: Set<MangaSource>, isPinned: Boolean) {
+		launchJob(Dispatchers.Default) {
+			sourcesRepository.setIsPinned(sources, isPinned)
+			val message = if (sources.size == 1) {
+				if (isPinned) R.string.source_pinned else R.string.source_unpinned
+			} else {
+				if (isPinned) R.string.sources_pinned else R.string.sources_unpinned
+			}
+			onActionDone.call(ReversibleAction(message, null))
+		}
+	}
+
 	fun respondSuggestionTip(isAccepted: Boolean) {
 		settings.isSuggestionsEnabled = isAccepted
 		settings.closeTip(TIP_SUGGESTIONS)
@@ -124,7 +130,7 @@ class ExploreViewModel @Inject constructor(
 		getSuggestionFlow(),
 		isGrid,
 		isRandomLoading,
-		sourcesRepository.observeNewSources(),
+		sourcesRepository.observeHasNewSourcesForBadge(),
 	) { content, suggestions, grid, randomLoading, newSources ->
 		buildList(content, suggestions, grid, randomLoading, newSources)
 	}.withErrorHandling()
@@ -134,7 +140,7 @@ class ExploreViewModel @Inject constructor(
 		recommendation: List<Manga>,
 		isGrid: Boolean,
 		randomLoading: Boolean,
-		newSources: Set<MangaSource>,
+		hasNewSources: Boolean,
 	): List<ListModel> {
 		val result = ArrayList<ListModel>(sources.size + 3)
 		result += ExploreButtons(randomLoading)
@@ -146,7 +152,7 @@ class ExploreViewModel @Inject constructor(
 			result += ListHeader(
 				textRes = R.string.remote_sources,
 				buttonTextRes = R.string.catalog,
-				badge = if (newSources.isNotEmpty()) "" else null,
+				badge = if (hasNewSources) "" else null,
 			)
 			sources.mapTo(result) { MangaSourceItem(it, isGrid) }
 		} else {
@@ -191,6 +197,5 @@ class ExploreViewModel @Inject constructor(
 
 		private const val TIP_SUGGESTIONS = "suggestions"
 		private const val SUGGESTIONS_COUNT = 8
-		const val TIP_NEW_SOURCES = "new_sources"
 	}
 }

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

@@ -4,13 +4,11 @@ import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.core.ui.widgets.TipView
 import org.koitharu.kotatsu.explore.ui.model.MangaSourceItem
 import org.koitharu.kotatsu.list.ui.adapter.ListItemType
 import org.koitharu.kotatsu.list.ui.adapter.emptyHintAD
 import org.koitharu.kotatsu.list.ui.adapter.listHeaderAD
 import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
-import org.koitharu.kotatsu.list.ui.adapter.tipAD
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 
@@ -18,7 +16,6 @@ class ExploreAdapter(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	listener: ExploreListEventListener,
-	tipClickListener: TipView.OnButtonClickListener,
 	clickListener: OnListItemClickListener<MangaSourceItem>,
 	mangaClickListener: OnListItemClickListener<Manga>,
 ) : BaseListAdapter<ListModel>() {
@@ -34,6 +31,5 @@ class ExploreAdapter(
 		addDelegate(ListItemType.EXPLORE_SOURCE_GRID, exploreSourceGridItemAD(coil, clickListener, lifecycleOwner))
 		addDelegate(ListItemType.HINT_EMPTY, emptyHintAD(coil, lifecycleOwner, listener))
 		addDelegate(ListItemType.STATE_LOADING, loadingStateAD())
-		addDelegate(ListItemType.TIP, tipAD(tipClickListener))
 	}
 }

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

@@ -27,15 +27,20 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE deleted_at = 0 GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit")
 	abstract suspend fun findLast(limit: Int): List<FavouriteManga>
 
-	fun observeAll(order: ListSortOrder): Flow<List<FavouriteManga>> {
+	fun observeAll(order: ListSortOrder, limit: Int): Flow<List<FavouriteManga>> {
 		val orderBy = getOrderBy(order)
-
-		@Language("RoomSql")
-		val query = SimpleSQLiteQuery(
-			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
-				"WHERE favourites.deleted_at = 0 GROUP BY favourites.manga_id ORDER BY $orderBy",
-		)
-		return observeAllImpl(query)
+		val query = buildString {
+			append(
+				"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+					"WHERE favourites.deleted_at = 0 GROUP BY favourites.manga_id ORDER BY ",
+			)
+			append(orderBy)
+			if (limit > 0) {
+				append(" LIMIT ")
+				append(limit)
+			}
+		}
+		return observeAllImpl(SimpleSQLiteQuery(query))
 	}
 
 	@Transaction
@@ -52,16 +57,21 @@ abstract class FavouritesDao {
 	)
 	abstract suspend fun findAll(categoryId: Long): List<FavouriteManga>
 
-	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<FavouriteManga>> {
+	fun observeAll(categoryId: Long, order: ListSortOrder, limit: Int): Flow<List<FavouriteManga>> {
 		val orderBy = getOrderBy(order)
+		val query = buildString {
+			append(
+				"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
+					"WHERE category_id = ? AND deleted_at = 0 GROUP BY favourites.manga_id ORDER BY ",
+			)
+			append(orderBy)
+			if (limit > 0) {
+				append(" LIMIT ")
+				append(limit)
+			}
+		}
 
-		@Language("RoomSql")
-		val query = SimpleSQLiteQuery(
-			"SELECT * FROM favourites LEFT JOIN manga ON favourites.manga_id = manga.manga_id " +
-				"WHERE category_id = ? AND deleted_at = 0 GROUP BY favourites.manga_id ORDER BY $orderBy",
-			arrayOf<Any>(categoryId),
-		)
-		return observeAllImpl(query)
+		return observeAllImpl(SimpleSQLiteQuery(query, arrayOf<Any>(categoryId)))
 	}
 
 	suspend fun findCovers(categoryId: Long, order: ListSortOrder): List<Cover> {

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

@@ -38,8 +38,8 @@ class FavouritesRepository @Inject constructor(
 		return entities.toMangaList()
 	}
 
-	fun observeAll(order: ListSortOrder): Flow<List<Manga>> {
-		return db.getFavouritesDao().observeAll(order)
+	fun observeAll(order: ListSortOrder, limit: Int): Flow<List<Manga>> {
+		return db.getFavouritesDao().observeAll(order, limit)
 			.mapItems { it.toManga() }
 	}
 
@@ -48,14 +48,14 @@ class FavouritesRepository @Inject constructor(
 		return entities.toMangaList()
 	}
 
-	fun observeAll(categoryId: Long, order: ListSortOrder): Flow<List<Manga>> {
-		return db.getFavouritesDao().observeAll(categoryId, order)
+	fun observeAll(categoryId: Long, order: ListSortOrder, limit: Int): Flow<List<Manga>> {
+		return db.getFavouritesDao().observeAll(categoryId, order, limit)
 			.mapItems { it.toManga() }
 	}
 
-	fun observeAll(categoryId: Long): Flow<List<Manga>> {
+	fun observeAll(categoryId: Long, limit: Int): Flow<List<Manga>> {
 		return observeOrder(categoryId)
-			.flatMapLatest { order -> observeAll(categoryId, order) }
+			.flatMapLatest { order -> observeAll(categoryId, order, limit) }
 	}
 
 	fun observeMangaCount(): Flow<Int> {
@@ -63,12 +63,6 @@ class FavouritesRepository @Inject constructor(
 			.distinctUntilChanged()
 	}
 
-	suspend fun getCategories(): List<FavouriteCategory> {
-		return db.getFavouriteCategoriesDao().findAll().map {
-			it.toFavouriteCategory()
-		}
-	}
-
 	fun observeCategories(): Flow<List<FavouriteCategory>> {
 		return db.getFavouriteCategoriesDao().observeAll().mapItems {
 			it.toFavouriteCategory()

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

@@ -33,7 +33,7 @@ class FavouritesListFragment : MangaListFragment(), PopupMenu.OnMenuItemClickLis
 		binding.recyclerView.isVP2BugWorkaroundEnabled = true
 	}
 
-	override fun onScrolledToEnd() = Unit
+	override fun onScrolledToEnd() = viewModel.requestMoreItems()
 
 	override fun onFilterClick(view: View?) {
 		val menu = PopupMenu(view?.context ?: return, view)

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

@@ -32,8 +32,11 @@ import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.list.ui.model.toErrorState
 import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
+private const val PAGE_SIZE = 20
+
 @HiltViewModel
 class FavouritesListViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
@@ -46,6 +49,8 @@ class FavouritesListViewModel @Inject constructor(
 
 	val categoryId: Long = savedStateHandle[ARG_CATEGORY_ID] ?: NO_ID
 	private val refreshTrigger = MutableStateFlow(Any())
+	private val limit = MutableStateFlow(PAGE_SIZE)
+	private val isReady = AtomicBoolean(false)
 
 	override val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE_FAVORITES) { favoritesListMode }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.favoritesListMode)
@@ -61,13 +66,7 @@ class FavouritesListViewModel @Inject constructor(
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
 
 	override val content = combine(
-		if (categoryId == NO_ID) {
-			sortOrder.filterNotNull().flatMapLatest {
-				repository.observeAll(it)
-			}
-		} else {
-			repository.observeAll(categoryId)
-		},
+		observeFavorites(),
 		listMode,
 		refreshTrigger,
 	) { list, mode, _ ->
@@ -85,7 +84,10 @@ class FavouritesListViewModel @Inject constructor(
 				),
 			)
 
-			else -> list.toUi(mode, listExtraProvider)
+			else -> {
+				isReady.set(true)
+				list.toUi(mode, listExtraProvider)
+			}
 		}
 	}.catch {
 		emit(listOf(it.toErrorState(canRetry = false)))
@@ -126,4 +128,19 @@ class FavouritesListViewModel @Inject constructor(
 			repository.setCategoryOrder(categoryId, order)
 		}
 	}
+
+	fun requestMoreItems() {
+		if (isReady.compareAndSet(true, false)) {
+			limit.value += PAGE_SIZE
+		}
+	}
+
+	private fun observeFavorites() = if (categoryId == NO_ID) {
+		combine(sortOrder.filterNotNull(), limit, ::Pair)
+			.flatMapLatest { repository.observeAll(it.first, it.second) }
+	} else {
+		limit.flatMapLatest {
+			repository.observeAll(categoryId, it)
+		}
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt

@@ -257,7 +257,7 @@ class FilterCoordinator @Inject constructor(
 			}
 			oldValue.copy(
 				tagsExclude = newTags,
-				tags = oldValue.tags - newTags
+				tags = oldValue.tags - newTags,
 			)
 		}
 	}
@@ -308,7 +308,7 @@ class FilterCoordinator @Inject constructor(
 		currentState.update { oldValue ->
 			oldValue.copy(
 				tags = tags,
-				tagsExclude = oldValue.tagsExclude - tags
+				tagsExclude = oldValue.tagsExclude - tags,
 			)
 		}
 	}
@@ -391,9 +391,7 @@ class FilterCoordinator @Inject constructor(
 		val result = LinkedList<ChipsView.ChipModel>()
 		for (tag in tags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = selectedTags.remove(tag),
 				data = tag,
@@ -406,9 +404,7 @@ class FilterCoordinator @Inject constructor(
 		}
 		for (tag in selectedTags) {
 			val model = ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterHeaderFragment.kt

@@ -61,10 +61,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 	}
 
 	private fun moreTagsChip() = ChipsView.ChipModel(
-		tint = 0,
 		title = getString(R.string.more),
 		icon = materialR.drawable.abc_ic_menu_overflow_material,
-		isCheckable = false,
-		isChecked = false,
 	)
 }

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.ui.model.titleRes
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.parentView
 import org.koitharu.kotatsu.core.util.ext.showDistinct
@@ -29,7 +30,6 @@ import org.koitharu.kotatsu.parsers.model.ContentRating
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import java.util.Locale
 import com.google.android.material.R as materialR
 
@@ -122,10 +122,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 			b.spinnerLocale.context,
 			android.R.layout.simple_spinner_dropdown_item,
 			android.R.id.text1,
-			value.availableItems.map {
-				it?.getDisplayLanguage(it)?.toTitleCase(it)
-					?: b.spinnerLocale.context.getString(R.string.various_languages)
-			},
+			value.availableItems.map { it.getDisplayName(b.spinnerLocale.context) },
 		)
 		val selectedIndex = value.availableItems.indexOf(selected)
 		if (selectedIndex >= 0) {
@@ -144,9 +141,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		val chips = ArrayList<ChipsView.ChipModel>(value.selectedItems.size + value.availableItems.size + 1)
 		value.selectedItems.mapTo(chips) { tag ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = tag.title,
-				icon = 0,
 				isCheckable = true,
 				isChecked = true,
 				data = tag,
@@ -155,9 +150,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -168,12 +161,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenres.setChips(chips)
@@ -200,9 +189,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		value.availableItems.mapNotNullTo(chips) { tag ->
 			if (tag !in value.selectedItems) {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = tag.title,
-					icon = 0,
 					isCheckable = true,
 					isChecked = false,
 					data = tag,
@@ -213,12 +200,8 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		chips.add(
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(R.string.more),
 				icon = materialR.drawable.abc_ic_menu_overflow_material,
-				isCheckable = false,
-				isChecked = false,
-				data = null,
 			),
 		)
 		b.chipsGenresExclude.setChips(chips)
@@ -233,9 +216,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { state ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(state.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = state in value.selectedItems,
 				data = state,
@@ -253,9 +234,7 @@ class FilterSheetFragment : BaseAdaptiveSheet<SheetFilterBinding>(),
 		}
 		val chips = value.availableItems.map { contentRating ->
 			ChipsView.ChipModel(
-				tint = 0,
 				title = getString(contentRating.titleResId),
-				icon = 0,
 				isCheckable = true,
 				isChecked = contentRating in value.selectedItems,
 				data = contentRating,

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

@@ -9,7 +9,6 @@ import androidx.room.Transaction
 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.TagEntity
 import org.koitharu.kotatsu.list.domain.ListSortOrder
 
@@ -28,8 +27,7 @@ abstract class HistoryDao {
 	@Query("SELECT * FROM history WHERE deleted_at = 0 ORDER BY updated_at DESC LIMIT :limit")
 	abstract fun observeAll(limit: Int): Flow<List<HistoryWithManga>>
 
-	// TODO pagination
-	fun observeAll(order: ListSortOrder): Flow<List<HistoryWithManga>> {
+	fun observeAll(order: ListSortOrder, limit: Int): Flow<List<HistoryWithManga>> {
 		val orderBy = when (order) {
 			ListSortOrder.LAST_READ -> "history.updated_at DESC"
 			ListSortOrder.LONG_AGO_READ -> "history.updated_at ASC"
@@ -43,13 +41,18 @@ abstract class HistoryDao {
 			ListSortOrder.UPDATED -> "IFNULL((SELECT last_chapter_date FROM tracks WHERE tracks.manga_id = manga.manga_id), 0) DESC"
 			else -> throw IllegalArgumentException("Sort order $order is not supported")
 		}
-
-		@Language("RoomSql")
-		val query = SimpleSQLiteQuery(
-			"SELECT * FROM history LEFT JOIN manga ON history.manga_id = manga.manga_id " +
-				"WHERE history.deleted_at = 0 GROUP BY history.manga_id ORDER BY $orderBy",
-		)
-		return observeAllImpl(query)
+		val query = buildString {
+			append(
+				"SELECT * FROM history LEFT JOIN manga ON history.manga_id = manga.manga_id " +
+					"WHERE history.deleted_at = 0 GROUP BY history.manga_id ORDER BY ",
+			)
+			append(orderBy)
+			if (limit > 0) {
+				append(" LIMIT ")
+				append(limit)
+			}
+		}
+		return observeAllImpl(SimpleSQLiteQuery(query))
 	}
 
 	@Query("SELECT manga_id FROM history WHERE deleted_at = 0")

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

@@ -74,8 +74,8 @@ class HistoryRepository @Inject constructor(
 		}
 	}
 
-	fun observeAllWithHistory(order: ListSortOrder): Flow<List<MangaWithHistory>> {
-		return db.getHistoryDao().observeAll(order).mapItems {
+	fun observeAllWithHistory(order: ListSortOrder, limit: Int): Flow<List<MangaWithHistory>> {
+		return db.getHistoryDao().observeAll(order, limit).mapItems {
 			MangaWithHistory(
 				it.manga.toManga(it.tags.toMangaTags()),
 				it.history.toMangaHistory(),

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

@@ -32,7 +32,7 @@ class HistoryListFragment : MangaListFragment() {
 		viewModel.isStatsEnabled.observe(viewLifecycleOwner, MenuInvalidator(requireActivity()))
 	}
 
-	override fun onScrolledToEnd() = Unit
+	override fun onScrolledToEnd() = viewModel.requestMoreItems()
 
 	override fun onEmptyActionClick() {
 		startActivity(NetworkManageIntent())

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.history.ui
 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.catch
@@ -43,8 +44,11 @@ import org.koitharu.kotatsu.list.ui.model.toListModel
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import java.time.Instant
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
+private const val PAGE_SIZE = 20
+
 @HiltViewModel
 class HistoryListViewModel @Inject constructor(
 	private val repository: HistoryRepository,
@@ -62,8 +66,11 @@ class HistoryListViewModel @Inject constructor(
 		valueProducer = { historySortOrder },
 	)
 
-	override val listMode = settings.observeAsFlow(AppSettings.KEY_LIST_MODE_HISTORY) { historyListMode }
-		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.historyListMode)
+	override val listMode = settings.observeAsStateFlow(
+		scope = viewModelScope + Dispatchers.Default,
+		key = AppSettings.KEY_LIST_MODE_HISTORY,
+		valueProducer = { historyListMode },
+	)
 
 	private val isGroupingEnabled = settings.observeAsFlow(
 		key = AppSettings.KEY_HISTORY_GROUPING,
@@ -72,6 +79,9 @@ class HistoryListViewModel @Inject constructor(
 		g && s.isGroupingSupported()
 	}
 
+	private val limit = MutableStateFlow(PAGE_SIZE)
+	private val isReady = AtomicBoolean(false)
+
 	val isStatsEnabled = settings.observeAsStateFlow(
 		scope = viewModelScope + Dispatchers.Default,
 		key = AppSettings.KEY_STATS_ENABLED,
@@ -79,7 +89,7 @@ class HistoryListViewModel @Inject constructor(
 	)
 
 	override val content = combine(
-		sortOrder.flatMapLatest { repository.observeAllWithHistory(it) },
+		observeHistory(),
 		isGroupingEnabled,
 		listMode,
 		networkState,
@@ -95,7 +105,10 @@ class HistoryListViewModel @Inject constructor(
 				),
 			)
 
-			else -> mapList(list, grouped, mode, online, incognito)
+			else -> {
+				isReady.set(true)
+				mapList(list, grouped, mode, online, incognito)
+			}
 		}
 	}.onStart {
 		loadingCounter.increment()
@@ -138,6 +151,15 @@ class HistoryListViewModel @Inject constructor(
 		}
 	}
 
+	fun requestMoreItems() {
+		if (isReady.compareAndSet(true, false)) {
+			limit.value += PAGE_SIZE
+		}
+	}
+
+	private fun observeHistory() = combine(sortOrder, limit, ::Pair)
+		.flatMapLatest { repository.observeAllWithHistory(it.first, it.second) }
+
 	private suspend fun mapList(
 		list: List<MangaWithHistory>,
 		grouped: Boolean,

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

@@ -7,11 +7,12 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.viewModels
 import androidx.core.graphics.Insets
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.isVisible
-import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
 import coil.request.CachePolicy
 import coil.request.ErrorResult
@@ -20,17 +21,26 @@ import coil.request.SuccessResult
 import coil.target.ViewTarget
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.ui.BaseActivity
+import org.koitharu.kotatsu.core.ui.util.PopupMenuMediator
+import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.enqueueWith
 import org.koitharu.kotatsu.core.util.ext.getDisplayIcon
 import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
 import org.koitharu.kotatsu.core.util.ext.getSerializableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.getThemeColor
+import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
+import org.koitharu.kotatsu.core.util.ext.source
 import org.koitharu.kotatsu.databinding.ActivityImageBinding
 import org.koitharu.kotatsu.databinding.ItemErrorStateBinding
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import javax.inject.Inject
+import com.google.android.material.R as materialR
 
 @AndroidEntryPoint
 class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listener, View.OnClickListener {
@@ -39,27 +49,45 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 	lateinit var coil: ImageLoader
 
 	private var errorBinding: ItemErrorStateBinding? = null
+	private val viewModel: ImageViewModel by viewModels()
+	private lateinit var menuMediator: PopupMenuMediator
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityImageBinding.inflate(layoutInflater))
 		viewBinding.buttonBack.setOnClickListener(this)
-		loadImage(intent.data)
+		viewBinding.buttonMenu.setOnClickListener(this)
+		val imageUrl = requireNotNull(intent.data)
+
+		val menuProvider = ImageMenuProvider(
+			activity = this,
+			snackbarHost = viewBinding.root,
+			viewModel = viewModel,
+		)
+		menuMediator = PopupMenuMediator(menuProvider)
+		viewModel.isLoading.observe(this, ::onLoadingStateChanged)
+		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.root, null))
+		viewModel.onImageSaved.observeEvent(this, ::onImageSaved)
+		loadImage(imageUrl)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
-		with(viewBinding.buttonBack) {
-			updateLayoutParams<ViewGroup.MarginLayoutParams> {
-				topMargin = insets.top + marginBottom
-				leftMargin = insets.left + marginBottom
-				rightMargin = insets.right + marginBottom
-			}
+		viewBinding.buttonBack.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			topMargin = insets.top + bottomMargin
+			leftMargin = insets.left + bottomMargin
+			rightMargin = insets.right + bottomMargin
+		}
+		viewBinding.buttonMenu.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+			topMargin = insets.top + bottomMargin
+			leftMargin = insets.left + bottomMargin
+			rightMargin = insets.right + bottomMargin
 		}
 	}
 
 	override fun onClick(v: View) {
 		when (v.id) {
 			R.id.button_back -> dispatchNavigateUp()
+			R.id.button_menu -> menuMediator.onLongClick(v)
 			else -> loadImage(intent.data)
 		}
 	}
@@ -92,11 +120,34 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 			.memoryCachePolicy(CachePolicy.DISABLED)
 			.lifecycle(this)
 			.listener(this)
-			.tag(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
+			.source(intent.getSerializableExtraCompat<MangaSource>(EXTRA_SOURCE))
 			.target(SsivTarget(viewBinding.ssiv))
 			.enqueueWith(coil)
 	}
 
+	private fun onImageSaved(uri: Uri) {
+		Snackbar.make(viewBinding.root, R.string.page_saved, Snackbar.LENGTH_LONG)
+			.setAction(R.string.share) {
+				ShareHelper(this).shareImage(uri)
+			}.show()
+	}
+
+	private fun onLoadingStateChanged(isLoading: Boolean) {
+		val button = viewBinding.buttonMenu
+		button.isClickable = !isLoading
+		if (isLoading) {
+			button.setImageDrawable(
+				CircularProgressDrawable(this).also {
+					it.setStyle(CircularProgressDrawable.LARGE)
+					it.setColorSchemeColors(getThemeColor(com.google.android.material.R.attr.colorControlNormal))
+					it.start()
+				},
+			)
+		} else {
+			button.setImageResource(materialR.drawable.abc_ic_menu_overflow_material)
+		}
+	}
+
 	private class SsivTarget(
 		override val view: SubsamplingScaleImageView,
 	) : ViewTarget<SubsamplingScaleImageView> {
@@ -124,7 +175,7 @@ class ImageActivity : BaseActivity<ActivityImageBinding>(), ImageRequest.Listene
 
 	companion object {
 
-		private const val EXTRA_SOURCE = "source"
+		const val EXTRA_SOURCE = "source"
 
 		fun newIntent(context: Context, url: String, source: MangaSource?): Intent {
 			return Intent(context, ImageActivity::class.java)

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

@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.image.ui
+
+import android.Manifest
+import android.os.Build
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.MenuProvider
+import com.google.android.material.snackbar.Snackbar
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.util.ext.tryLaunch
+import org.koitharu.kotatsu.local.data.isZipUri
+
+class ImageMenuProvider(
+	private val activity: ComponentActivity,
+	private val snackbarHost: View,
+	private val viewModel: ImageViewModel,
+) : MenuProvider {
+
+	private val permissionLauncher = activity.registerForActivityResult(
+		ActivityResultContracts.RequestPermission(),
+	) { isGranted ->
+		if (isGranted) {
+			saveImage()
+		}
+	}
+
+	private val saveLauncher = activity.registerForActivityResult(
+		ActivityResultContracts.CreateDocument("image/png"),
+	) { uri ->
+		if (uri != null) {
+			viewModel.saveImage(uri)
+		}
+	}
+
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		menuInflater.inflate(R.menu.opt_image, menu)
+	}
+
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {
+		R.id.action_save -> {
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+				permissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+			} else {
+				saveImage()
+			}
+			true
+		}
+
+		else -> false
+	}
+
+	private fun saveImage() {
+		val name = activity.intent.data?.let {
+			if (it.isZipUri()) {
+				it.fragment
+			} else {
+				it.lastPathSegment
+			}?.substringBeforeLast('.')?.plus(".png")
+		}
+		if (name == null || !saveLauncher.tryLaunch(name)) {
+			Snackbar.make(snackbarHost, R.string.operation_not_supported, Snackbar.LENGTH_SHORT).show()
+		}
+	}
+}

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

@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.image.ui
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import androidx.core.graphics.drawable.toBitmap
+import androidx.lifecycle.SavedStateHandle
+import coil.ImageLoader
+import coil.request.CachePolicy
+import coil.request.ImageRequest
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import org.koitharu.kotatsu.core.ui.BaseActivity
+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.getDrawableOrThrow
+import org.koitharu.kotatsu.core.util.ext.require
+import org.koitharu.kotatsu.core.util.ext.source
+import javax.inject.Inject
+
+@HiltViewModel
+class ImageViewModel @Inject constructor(
+	@ApplicationContext private val context: Context,
+	private val savedStateHandle: SavedStateHandle,
+	private val coil: ImageLoader,
+) : BaseViewModel() {
+
+	val onImageSaved = MutableEventFlow<Uri>()
+
+	fun saveImage(destination: Uri) {
+		launchLoadingJob(Dispatchers.Default) {
+			val request = ImageRequest.Builder(context)
+				.memoryCachePolicy(CachePolicy.READ_ONLY)
+				.data(savedStateHandle.require<Uri>(BaseActivity.EXTRA_DATA))
+				.memoryCachePolicy(CachePolicy.DISABLED)
+				.source(savedStateHandle[ImageActivity.EXTRA_SOURCE])
+				.build()
+			val bitmap = coil.execute(request).getDrawableOrThrow().toBitmap()
+			runInterruptible(Dispatchers.IO) {
+				context.contentResolver.openOutputStream(destination)?.use { output ->
+					check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, output))
+				} ?: error("Cannot open output stream")
+			}
+			onImageSaved.call(destination)
+		}
+	}
+}

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

@@ -37,9 +37,6 @@ suspend fun Manga.toListDetailedModel(
 		ChipsView.ChipModel(
 			tint = extraProvider?.getTagTint(it) ?: 0,
 			title = it.title,
-			icon = 0,
-			isCheckable = false,
-			isChecked = false,
 			data = it,
 		)
 	},

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

@@ -85,10 +85,7 @@ class PreviewViewModel @Inject constructor(
 			ChipsView.ChipModel(
 				title = tag.title,
 				tint = extraProvider.getTagTint(tag),
-				icon = 0,
 				data = tag,
-				isCheckable = false,
-				isChecked = false,
 			)
 		}
 	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())

app/src/main/kotlin/org/koitharu/kotatsu/local/data/LocalMangaRepository.kt

@@ -227,9 +227,11 @@ class LocalMangaRepository @Inject constructor(
 		}.filterNotNullTo(ArrayList(files.size))
 	}
 
-	private suspend fun getAllFiles() = storageManager.getReadableDirs().asSequence().flatMap { dir ->
-		dir.children()
-	}
+	private suspend fun getAllFiles() = storageManager.getReadableDirs()
+		.asSequence()
+		.flatMap { dir ->
+			dir.children().filterNot { it.isHidden }
+		}
 
 	private fun Collection<LocalManga>.unwrap(): List<Manga> = map { it.manga }
 }

app/src/main/kotlin/org/koitharu/kotatsu/local/data/PagesCache.kt

@@ -82,6 +82,13 @@ class PagesCache @Inject constructor(@ApplicationContext context: Context) {
 		}
 	}
 
+	suspend fun clear() {
+		val cache = lruCache.get()
+		runInterruptible(Dispatchers.IO) {
+			cache.clearCache()
+		}
+	}
+
 	private suspend fun getAvailableSize(): Long = runCatchingCancellable {
 		val statFs = StatFs(cacheDir.get().absolutePath)
 		statFs.availableBytes

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

@@ -13,6 +13,7 @@ import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.core.util.ext.toFileOrNull
 import org.koitharu.kotatsu.core.util.ext.toUriOrNull
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
+import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.explore.domain.ExploreRepository
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
@@ -39,6 +40,7 @@ class LocalListViewModel @Inject constructor(
 	exploreRepository: ExploreRepository,
 	@LocalStorageChanges private val localStorageChanges: SharedFlow<LocalManga?>,
 	private val localStorageManager: LocalStorageManager,
+	sourcesRepository: MangaSourcesRepository,
 ) : RemoteListViewModel(
 	savedStateHandle,
 	mangaRepositoryFactory,
@@ -47,6 +49,7 @@ class LocalListViewModel @Inject constructor(
 	listExtraProvider,
 	downloadScheduler,
 	exploreRepository,
+	sourcesRepository,
 ), SharedPreferences.OnSharedPreferenceChangeListener {
 
 	val onMangaRemoved = MutableEventFlow<Unit>()

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/protect/ScreenshotPolicyHelper.kt

@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.main.ui.protect
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.ui.DefaultActivityLifecycleCallbacks
+import javax.inject.Inject
+
+class ScreenshotPolicyHelper @Inject constructor(
+	private val settings: AppSettings,
+) : DefaultActivityLifecycleCallbacks {
+
+	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+		(activity as? ContentContainer)?.setupScreenshotPolicy(activity)
+	}
+
+	private fun ContentContainer.setupScreenshotPolicy(activity: Activity) =
+		lifecycleScope.launch(Dispatchers.Default) {
+			settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy }
+				.flatMapLatest { policy ->
+					when (policy) {
+						ScreenshotsPolicy.ALLOW -> flowOf(false)
+						ScreenshotsPolicy.BLOCK_NSFW -> withContext(Dispatchers.Main) {
+							isNsfwContent()
+						}.distinctUntilChanged()
+
+						ScreenshotsPolicy.BLOCK_ALL -> flowOf(true)
+						ScreenshotsPolicy.BLOCK_INCOGNITO -> settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) {
+							isIncognitoModeEnabled
+						}
+					}
+				}.collect { isSecure ->
+					withContext(Dispatchers.Main) {
+						if (isSecure) {
+							activity.window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						} else {
+							activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+						}
+					}
+				}
+		}
+
+	interface ContentContainer : LifecycleOwner {
+
+		@MainThread
+		fun isNsfwContent(): Flow<Boolean>
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeSheet.kt

@@ -18,13 +18,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.core.util.ext.getDisplayName
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.showDistinct
 import org.koitharu.kotatsu.core.util.ext.tryLaunch
 import org.koitharu.kotatsu.databinding.SheetWelcomeBinding
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.backup.RestoreDialogFragment
 import java.util.Locale
 
@@ -58,7 +58,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 	override fun onChipClick(chip: Chip, data: Any?) {
 		when (data) {
 			is ContentType -> viewModel.setTypeChecked(data, chip.isChecked)
-			is Locale? -> viewModel.setLocaleChecked(data, chip.isChecked)
+			is Locale -> viewModel.setLocaleChecked(data, chip.isChecked)
 		}
 	}
 
@@ -86,14 +86,12 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		}
 	}
 
-	private fun onLocalesChanged(value: FilterProperty<Locale?>) {
+	private fun onLocalesChanged(value: FilterProperty<Locale>) {
 		val chips = viewBinding?.chipsLocales ?: return
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
-					title = it?.getDisplayLanguage(it)?.toTitleCase(it) ?: getString(R.string.various_languages),
-					icon = 0,
+					title = it.getDisplayName(chips.context),
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,
@@ -107,9 +105,7 @@ class WelcomeSheet : BaseAdaptiveSheet<SheetWelcomeBinding>(), ChipsView.OnChipC
 		chips.setChips(
 			value.availableItems.map {
 				ChipsView.ChipModel(
-					tint = 0,
 					title = getString(it.titleResId),
-					icon = 0,
 					isCheckable = true,
 					isChecked = it in value.selectedItems,
 					data = it,

app/src/main/kotlin/org/koitharu/kotatsu/main/ui/welcome/WelcomeViewModel.kt

@@ -11,6 +11,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.LocaleComparator
 import org.koitharu.kotatsu.core.util.ext.sortedWithSafe
 import org.koitharu.kotatsu.core.util.ext.toList
+import org.koitharu.kotatsu.core.util.ext.toLocale
 import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
 import org.koitharu.kotatsu.filter.ui.model.FilterProperty
 import org.koitharu.kotatsu.parsers.model.ContentType
@@ -27,14 +28,14 @@ class WelcomeViewModel @Inject constructor(
 ) : BaseViewModel() {
 
 	private val allSources = repository.allMangaSources
-	private val localesGroups by lazy { allSources.groupBy { it.locale?.let { x -> Locale(x) } } }
+	private val localesGroups by lazy { allSources.groupBy { it.locale.toLocale() } }
 
 	private var updateJob: Job
 
 	val locales = MutableStateFlow(
-		FilterProperty<Locale?>(
-			availableItems = listOf(null),
-			selectedItems = setOf(null),
+		FilterProperty<Locale>(
+			availableItems = listOf(Locale.ROOT),
+			selectedItems = setOf(Locale.ROOT),
 			isLoading = true,
 			error = null,
 		),
@@ -51,22 +52,23 @@ class WelcomeViewModel @Inject constructor(
 
 	init {
 		updateJob = launchJob(Dispatchers.Default) {
-			val languages = localesGroups.keys.associateBy { x -> x?.language }
-			val selectedLocales = HashSet<Locale?>(2)
-			selectedLocales += ConfigurationCompat.getLocales(context.resources.configuration).toList()
+			val languages = localesGroups.keys.associateBy { x -> x.language }
+			val selectedLocales = HashSet<Locale>(2)
+			ConfigurationCompat.getLocales(context.resources.configuration).toList()
 				.firstNotNullOfOrNull { lc -> languages[lc.language] }
-			selectedLocales += null
+				?.let { selectedLocales += it }
+			selectedLocales += Locale.ROOT
 			locales.value = locales.value.copy(
-				availableItems = localesGroups.keys.sortedWithSafe(nullsFirst(LocaleComparator())),
+				availableItems = localesGroups.keys.sortedWithSafe(LocaleComparator()),
 				selectedItems = selectedLocales,
 				isLoading = false,
 			)
-			repository.assimilateNewSources()
+			repository.clearNewSourcesBadge()
 			commit()
 		}
 	}
 
-	fun setLocaleChecked(locale: Locale?, isChecked: Boolean) {
+	fun setLocaleChecked(locale: Locale, isChecked: Boolean) {
 		val snapshot = locales.value
 		locales.value = snapshot.copy(
 			selectedItems = if (isChecked) {
@@ -99,7 +101,7 @@ class WelcomeViewModel @Inject constructor(
 	}
 
 	private suspend fun commit() {
-		val languages = locales.value.selectedItems.mapToSet { it?.language }
+		val languages = locales.value.selectedItems.mapToSet { it.language }
 		val types = types.value.selectedItems
 		val enabledSources = allSources.filterTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
 			x.contentType in types && x.locale in languages

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt

@@ -3,17 +3,20 @@ package org.koitharu.kotatsu.reader.domain
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Size
+import androidx.core.net.toFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.core.model.findChapter
-import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.local.data.isFileUri
+import org.koitharu.kotatsu.local.data.isZipUri
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
@@ -61,19 +64,28 @@ class DetectReaderModeUseCase @Inject constructor(
 		val page = requireNotNull(pages.getOrNull(pageIndex)) { "No pages" }
 		val url = repository.getPageUrl(page)
 		val uri = Uri.parse(url)
-		val size = if (uri.scheme == "cbz") {
-			runInterruptible(Dispatchers.IO) {
+
+		val size = when {
+			uri.isZipUri() -> runInterruptible(Dispatchers.IO) {
 				val zip = ZipFile(uri.schemeSpecificPart)
 				val entry = zip.getEntry(uri.fragment)
 				zip.getInputStream(entry).use {
 					getBitmapSize(it)
 				}
 			}
-		} else {
-			val request = PageLoader.createPageRequest(page, url)
-			imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use {
-				runInterruptible(Dispatchers.IO) {
-					getBitmapSize(it.body?.byteStream())
+
+			uri.isFileUri() -> runInterruptible(Dispatchers.IO) {
+				uri.toFile().inputStream().use {
+					getBitmapSize(it)
+				}
+			}
+
+			else -> {
+				val request = PageLoader.createPageRequest(url, page.source)
+				imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use {
+					runInterruptible(Dispatchers.IO) {
+						getBitmapSize(it.body?.byteStream())
+					}
 				}
 			}
 		}

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/EdgeDetector.kt

@@ -0,0 +1,150 @@
+package org.koitharu.kotatsu.reader.domain
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.graphics.Point
+import android.graphics.Rect
+import androidx.annotation.ColorInt
+import androidx.core.graphics.alpha
+import androidx.core.graphics.blue
+import androidx.core.graphics.get
+import androidx.core.graphics.green
+import androidx.core.graphics.red
+import com.davemorrissey.labs.subscaleview.ImageSource
+import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder
+import com.davemorrissey.labs.subscaleview.decoder.SkiaPooledImageRegionDecoder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.util.ext.use
+import kotlin.math.abs
+
+class EdgeDetector(private val context: Context) {
+
+	private val mutex = Mutex()
+
+	suspend fun getBounds(imageSource: ImageSource): Rect? = mutex.withLock {
+		withContext(Dispatchers.IO) {
+			val decoder = SkiaPooledImageRegionDecoder(Bitmap.Config.RGB_565)
+			try {
+				val size = runInterruptible {
+					decoder.init(context, imageSource)
+				}
+				val edges = coroutineScope {
+					listOf(
+						async { detectLeftRightEdge(decoder, size, isLeft = true) },
+						async { detectTopBottomEdge(decoder, size, isTop = true) },
+						async { detectLeftRightEdge(decoder, size, isLeft = false) },
+						async { detectTopBottomEdge(decoder, size, isTop = false) },
+					).awaitAll()
+				}
+				var hasEdges = false
+				for (edge in edges) {
+					if (edge > 0) {
+						hasEdges = true
+					} else if (edge < 0) {
+						return@withContext null
+					}
+				}
+				if (hasEdges) {
+					Rect(edges[0], edges[1], size.x - edges[2], size.y - edges[3])
+				} else {
+					null
+				}
+			} finally {
+				decoder.recycle()
+			}
+		}
+	}
+
+	private fun detectLeftRightEdge(decoder: ImageRegionDecoder, size: Point, isLeft: Boolean): Int {
+		var width = size.x
+		val rectCount = size.x / BLOCK_SIZE
+		val maxRect = rectCount / 3
+		for (i in 0 until rectCount) {
+			if (i > maxRect) {
+				return -1
+			}
+			var dd = BLOCK_SIZE
+			for (j in 0 until size.y / BLOCK_SIZE) {
+				val regionX = if (isLeft) i * BLOCK_SIZE else size.x - (i + 1) * BLOCK_SIZE
+				decoder.decodeRegion(region(regionX, j * BLOCK_SIZE), 1).use { bitmap ->
+					for (ii in 0 until minOf(BLOCK_SIZE, dd)) {
+						for (jj in 0 until BLOCK_SIZE) {
+							val bi = if (isLeft) ii else BLOCK_SIZE - ii - 1
+							if (bitmap[bi, jj].isNotWhite()) {
+								width = minOf(width, BLOCK_SIZE * i + ii)
+								dd--
+								break
+							}
+						}
+					}
+				}
+				if (dd == 0) {
+					break
+				}
+			}
+			if (dd < BLOCK_SIZE) {
+				break // We have already found vertical field or it is not exist
+			}
+		}
+		return width
+	}
+
+	private fun detectTopBottomEdge(decoder: ImageRegionDecoder, size: Point, isTop: Boolean): Int {
+		var height = size.y
+		val rectCount = size.y / BLOCK_SIZE
+		val maxRect = rectCount / 3
+		for (j in 0 until rectCount) {
+			if (j > maxRect) {
+				return -1
+			}
+			var dd = BLOCK_SIZE
+			for (i in 0 until size.x / BLOCK_SIZE) {
+				val regionY = if (isTop) j * BLOCK_SIZE else size.y - (j + 1) * BLOCK_SIZE
+				decoder.decodeRegion(region(i * BLOCK_SIZE, regionY), 1).use { bitmap ->
+					for (jj in 0 until minOf(BLOCK_SIZE, dd)) {
+						for (ii in 0 until BLOCK_SIZE) {
+							val bj = if (isTop) jj else BLOCK_SIZE - jj - 1
+							if (bitmap[ii, bj].isNotWhite()) {
+								height = minOf(height, BLOCK_SIZE * j + jj)
+								dd--
+								break
+							}
+						}
+					}
+				}
+				if (dd == 0) {
+					break
+				}
+			}
+			if (dd < BLOCK_SIZE) {
+				break // We have already found vertical field or it is not exist
+			}
+		}
+		return height
+	}
+
+	companion object {
+
+		private const val BLOCK_SIZE = 100
+		private const val COLOR_TOLERANCE = 16
+
+		fun isColorTheSame(@ColorInt a: Int, @ColorInt b: Int, tolerance: Int): Boolean {
+			return abs(a.red - b.red) <= tolerance &&
+				abs(a.green - b.green) <= tolerance &&
+				abs(a.blue - b.blue) <= tolerance &&
+				abs(a.alpha - b.alpha) <= tolerance
+		}
+
+		private fun Int.isNotWhite() = !isColorTheSame(this, Color.WHITE, COLOR_TOLERANCE)
+
+		private fun region(x: Int, y: Int) = Rect(x, y, x + BLOCK_SIZE, y + BLOCK_SIZE)
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt

@@ -2,12 +2,14 @@ package org.koitharu.kotatsu.reader.domain
 
 import android.content.Context
 import android.graphics.BitmapFactory
+import android.graphics.Rect
 import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.collection.LongSparseArray
 import androidx.collection.set
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import com.davemorrissey.labs.subscaleview.ImageSource
 import dagger.hilt.android.ActivityRetainedLifecycle
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ActivityRetainedScoped
@@ -27,14 +29,15 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okio.use
 import org.koitharu.kotatsu.core.network.CommonHeaders
-import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
+import org.koitharu.kotatsu.core.network.imageproxy.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
 import org.koitharu.kotatsu.core.util.ext.URI_SCHEME_ZIP
+import org.koitharu.kotatsu.core.util.ext.cancelChildrenAndJoin
 import org.koitharu.kotatsu.core.util.ext.compressToPNG
 import org.koitharu.kotatsu.core.util.ext.ensureRamAtLeast
 import org.koitharu.kotatsu.core.util.ext.ensureSuccess
@@ -44,6 +47,7 @@ import org.koitharu.kotatsu.core.util.ext.isPowerSaveMode
 import org.koitharu.kotatsu.core.util.ext.isTargetNotEmpty
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.ramAvailable
+import org.koitharu.kotatsu.core.util.ext.use
 import org.koitharu.kotatsu.core.util.ext.withProgress
 import org.koitharu.kotatsu.core.util.progress.ProgressDeferred
 import org.koitharu.kotatsu.local.data.PagesCache
@@ -51,6 +55,7 @@ import org.koitharu.kotatsu.local.data.isFileUri
 import org.koitharu.kotatsu.local.data.isZipUri
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
@@ -83,6 +88,7 @@ class PageLoader @Inject constructor(
 	private val prefetchQueue = LinkedList<MangaPage>()
 	private val counter = AtomicInteger(0)
 	private var prefetchQueueLimit = PREFETCH_LIMIT_DEFAULT // TODO adaptive
+	private val edgeDetector = EdgeDetector(context)
 
 	fun isPrefetchApplicable(): Boolean {
 		return repository is RemoteMangaRepository
@@ -142,22 +148,33 @@ class PageLoader @Inject constructor(
 		} else {
 			val file = uri.toFile()
 			context.ensureRamAtLeast(file.length() * 2)
-			val image = runInterruptible(Dispatchers.IO) {
+			runInterruptible(Dispatchers.IO) {
 				BitmapFactory.decodeFile(file.absolutePath)
-			}
-			try {
+			}.use { image ->
 				image.compressToPNG(file)
-			} finally {
-				image.recycle()
 			}
 			uri
 		}
 	}
 
+	suspend fun getTrimmedBounds(uri: Uri): Rect? = runCatchingCancellable {
+		edgeDetector.getBounds(ImageSource.Uri(uri))
+	}.onFailure { error ->
+		error.printStackTraceDebug()
+	}.getOrNull()
+
 	suspend fun getPageUrl(page: MangaPage): String {
 		return getRepository(page.source).getPageUrl(page)
 	}
 
+	suspend fun invalidate(clearCache: Boolean) {
+		tasks.clear()
+		loaderScope.cancelChildrenAndJoin()
+		if (clearCache) {
+			cache.clear()
+		}
+	}
+
 	private fun onIdle() = loaderScope.launch {
 		prefetchLock.withLock {
 			while (prefetchQueue.isNotEmpty()) {
@@ -213,7 +230,7 @@ class PageLoader @Inject constructor(
 
 			uri.isFileUri() -> uri
 			else -> {
-				val request = createPageRequest(page, pageUrl)
+				val request = createPageRequest(pageUrl, page.source)
 				imageProxyInterceptor.interceptPageRequest(request, okHttp).ensureSuccess().use { response ->
 					val body = checkNotNull(response.body) { "Null response body" }
 					body.withProgress(progress).use {
@@ -248,12 +265,12 @@ class PageLoader @Inject constructor(
 		private const val PREFETCH_LIMIT_DEFAULT = 6
 		private const val PREFETCH_MIN_RAM_MB = 80L
 
-		fun createPageRequest(page: MangaPage, pageUrl: String) = Request.Builder()
+		fun createPageRequest(pageUrl: String, mangaSource: MangaSource) = Request.Builder()
 			.url(pageUrl)
 			.get()
 			.header(CommonHeaders.ACCEPT, "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8")
 			.cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE)
-			.tag(MangaSource::class.java, page.source)
+			.tag(MangaSource::class.java, mangaSource)
 			.build()
 	}
 }

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

@@ -28,6 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.BuildConfig
@@ -142,7 +143,6 @@ class ReaderActivity :
 		viewModel.content.observe(this) {
 			onLoadingStateChanged(viewModel.isLoading.value)
 		}
-		viewModel.isScreenshotsBlockEnabled.observe(this, this::setWindowSecure)
 		viewModel.isKeepScreenOnEnabled.observe(this, this::setKeepScreenOn)
 		viewModel.isInfoBarEnabled.observe(this, ::onReaderBarChanged)
 		viewModel.isBookmarkAdded.observe(this, MenuInvalidator(this))
@@ -179,6 +179,8 @@ class ReaderActivity :
 		viewModel.onPause()
 	}
 
+	override fun isNsfwContent(): Flow<Boolean> = viewModel.isMangaNsfw
+
 	override fun onIdle() {
 		viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 	}
@@ -297,14 +299,6 @@ class ReaderActivity :
 			.show()
 	}
 
-	private fun setWindowSecure(isSecure: Boolean) {
-		if (isSecure) {
-			window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		} else {
-			window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-		}
-	}
-
 	private fun setKeepScreenOn(isKeep: Boolean) {
 		if (isKeep) {
 			window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

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

@@ -36,6 +36,17 @@ class ReaderControlDelegate(
 	}
 
 	fun onKeyDown(keyCode: Int): Boolean = when (keyCode) {
+
+		KeyEvent.KEYCODE_R -> {
+			listener.switchPageBy(1)
+			true
+		}
+
+		KeyEvent.KEYCODE_L -> {
+			listener.switchPageBy(-1)
+			true
+		}
+
 		KeyEvent.KEYCODE_VOLUME_UP -> if (settings.isReaderVolumeButtonsEnabled) {
 			listener.switchPageBy(-1)
 			true

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

@@ -11,7 +11,9 @@ import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.os.BatteryManager
+import android.os.Build
 import android.util.AttributeSet
+import android.view.RoundedCorner
 import android.view.View
 import android.view.WindowInsets
 import androidx.annotation.AttrRes
@@ -46,8 +48,10 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	private var insetLeft: Int = 0
 	private var insetRight: Int = 0
 	private var insetTop: Int = 0
-	private var cutoutInsetLeft = 0
-	private var cutoutInsetRight = 0
+	private val insetLeftFallback: Int
+	private val insetRightFallback: Int
+	private val insetTopFallback: Int
+	private val insetCornerFallback = getSystemUiDimensionOffset("rounded_corner_content_padding")
 	private val colorText = ColorUtils.setAlphaComponent(
 		context.getThemeColor(materialR.attr.colorOnSurface, Color.BLACK),
 		200,
@@ -80,14 +84,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 			paint.strokeWidth = getDimension(R.styleable.ReaderInfoBarView_android_strokeWidth, 2f)
 			paint.textSize = getDimension(R.styleable.ReaderInfoBarView_android_textSize, 16f)
 		}
-		val insetCorner = getSystemUiDimensionOffset("rounded_corner_content_padding")
-		val fallbackInset = resources.getDimensionPixelOffset(R.dimen.reader_bar_inset_fallback)
-		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start", fallbackInset) + insetCorner
-		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end", fallbackInset) + insetCorner
+		val insetStart = getSystemUiDimensionOffset("status_bar_padding_start")
+		val insetEnd = getSystemUiDimensionOffset("status_bar_padding_end")
 		val isRtl = layoutDirection == LAYOUT_DIRECTION_RTL
-		insetLeft = if (isRtl) insetEnd else insetStart
-		insetRight = if (isRtl) insetStart else insetEnd
-		insetTop = minOf(insetLeft, insetRight)
+		insetLeftFallback = if (isRtl) insetEnd else insetStart
+		insetRightFallback = if (isRtl) insetStart else insetEnd
+		insetTopFallback = minOf(insetLeftFallback, insetRightFallback)
 	}
 
 	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -110,12 +112,12 @@ class ReaderInfoBarView @JvmOverloads constructor(
 		paint.textAlign = Paint.Align.LEFT
 		canvas.drawTextOutline(
 			text,
-			(paddingLeft + insetLeft + cutoutInsetLeft).toFloat(),
+			(paddingLeft + insetLeft).toFloat(),
 			paddingTop + insetTop + ty,
 		)
 		if (isTimeVisible) {
 			paint.textAlign = Paint.Align.RIGHT
-			var endX = (width - paddingRight - insetRight - cutoutInsetRight).toFloat()
+			var endX = (width - paddingRight - insetRight).toFloat()
 			canvas.drawTextOutline(timeText, endX, paddingTop + insetTop + ty)
 			if (batteryText.isNotEmpty()) {
 				paint.getTextBounds(timeText, 0, timeText.length, textBounds)
@@ -221,15 +223,29 @@ class ReaderInfoBarView @JvmOverloads constructor(
 	}
 
 	private fun updateCutoutInsets(insetsCompat: WindowInsetsCompat?) {
-		val cutouts = (insetsCompat ?: return).displayCutout?.boundingRects.orEmpty()
-		cutoutInsetLeft = 0
-		cutoutInsetRight = 0
-		for (rect in cutouts) {
-			if (rect.left <= paddingLeft) {
-				cutoutInsetLeft += rect.width()
+		insetLeft = insetLeftFallback
+		insetRight = insetRightFallback
+		insetTop = insetTopFallback
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && insetsCompat != null) {
+			val nativeInsets = insetsCompat.toWindowInsets()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT)?.let { corner ->
+				insetLeft += corner.radius
 			}
-			if (rect.right >= width - paddingRight) {
-				cutoutInsetRight += rect.width()
+			nativeInsets?.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT)?.let { corner ->
+				insetRight += corner.radius
+			}
+		} else {
+			insetLeft += insetCornerFallback
+			insetRight += insetCornerFallback
+		}
+		insetsCompat?.displayCutout?.let { cutout ->
+			for (rect in cutout.boundingRects) {
+				if (rect.left <= paddingLeft) {
+					insetLeft += rect.width()
+				}
+				if (rect.right >= width - paddingRight) {
+					insetRight += rect.width()
+				}
 			}
 		}
 	}

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

@@ -32,13 +32,13 @@ import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.domain.BookmarksRepository
+import org.koitharu.kotatsu.core.model.findChapter
 import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.os.AppShortcutManager
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 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.prefs.ScreenshotsPolicy
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
@@ -70,7 +70,9 @@ private const val BOUNDS_PAGE_OFFSET = 2
 private const val PREFETCH_LIMIT = 10
 
 @HiltViewModel
-class ReaderViewModel @Inject constructor(
+class ReaderViewModel
+@Inject
+constructor(
 	savedStateHandle: SavedStateHandle,
 	private val dataRepository: MangaDataRepository,
 	private val historyRepository: HistoryRepository,
@@ -85,7 +87,6 @@ class ReaderViewModel @Inject constructor(
 	private val detectReaderModeUseCase: DetectReaderModeUseCase,
 	private val statsCollector: StatsCollector,
 ) : BaseViewModel() {
-
 	private val intent = MangaIntent(savedStateHandle)
 	private val preselectedBranch = savedStateHandle.get<String>(ReaderActivity.EXTRA_BRANCH)
 
@@ -105,9 +106,11 @@ class ReaderViewModel @Inject constructor(
 
 	val incognitoMode = if (savedStateHandle.get<Boolean>(ReaderActivity.EXTRA_INCOGNITO) == true) {
 		MutableStateFlow(true)
-	} else mangaFlow.map {
-		it != null && historyRepository.shouldSkip(it)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	} else {
+		mangaFlow.map {
+			it != null && historyRepository.shouldSkip(it)
+		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
+	}
 
 	val isPagesSheetEnabled = observeIsPagesSheetEnabled()
 
@@ -166,13 +169,7 @@ class ReaderViewModel @Inject constructor(
 		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null),
 	)
 
-	val isScreenshotsBlockEnabled = combine(
-		mangaFlow,
-		settings.observeAsFlow(AppSettings.KEY_SCREENSHOTS_POLICY) { screenshotsPolicy },
-	) { manga, policy ->
-		policy == ScreenshotsPolicy.BLOCK_ALL ||
-			(policy == ScreenshotsPolicy.BLOCK_NSFW && manga != null && manga.isNsfw)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, false)
+	val isMangaNsfw = mangaFlow.map { it?.isNsfw == true }
 
 	val isBookmarkAdded = currentState.flatMapLatest { state ->
 		val manga = mangaData.value?.toManga()
@@ -286,7 +283,9 @@ class ReaderViewModel @Inject constructor(
 			prevJob?.cancelAndJoin()
 			content.value = ReaderContent(emptyList(), null)
 			chaptersLoader.loadSingleChapter(id)
-			content.value = ReaderContent(chaptersLoader.snapshot(), ReaderState(id, page, 0))
+			val newState = ReaderState(id, page, 0)
+			content.value = ReaderContent(chaptersLoader.snapshot(), newState)
+			saveCurrentState(newState)
 		}
 	}
 
@@ -294,17 +293,27 @@ class ReaderViewModel @Inject constructor(
 		val prevJob = loadingJob
 		loadingJob = launchLoadingJob(Dispatchers.Default) {
 			prevJob?.cancelAndJoin()
-			val currentChapterId = currentState.requireValue().chapterId
-			val allChapters = checkNotNull(manga).allChapters
-			var index = allChapters.indexOfFirst { x -> x.id == currentChapterId }
-			if (index < 0) {
-				return@launchLoadingJob
+			val prevState = currentState.requireValue()
+			val newChapterId = if (delta != 0) {
+				val allChapters = checkNotNull(manga).allChapters
+				var index = allChapters.indexOfFirst { x -> x.id == prevState.chapterId }
+				if (index < 0) {
+					return@launchLoadingJob
+				}
+				index += delta
+				(allChapters.getOrNull(index) ?: return@launchLoadingJob).id
+			} else {
+				prevState.chapterId
 			}
-			index += delta
-			val newChapterId = (allChapters.getOrNull(index) ?: return@launchLoadingJob).id
 			content.value = ReaderContent(emptyList(), null)
 			chaptersLoader.loadSingleChapter(newChapterId)
-			content.value = ReaderContent(chaptersLoader.snapshot(), ReaderState(newChapterId, 0, 0))
+			val newState = ReaderState(
+				chapterId = newChapterId,
+				page = if (delta == 0) prevState.page else 0,
+				scroll = if (delta == 0) prevState.scroll else 0,
+			)
+			content.value = ReaderContent(chaptersLoader.snapshot(), newState)
+			saveCurrentState(newState)
 		}
 	}
 
@@ -385,9 +394,7 @@ class ReaderViewModel @Inject constructor(
 			val manga = details.toManga()
 			// obtain state
 			if (currentState.value == null) {
-				currentState.value = historyRepository.getOne(manga)?.let {
-					ReaderState(it)
-				} ?: ReaderState(manga, preselectedBranch ?: manga.getPreferredBranch(null))
+				currentState.value = getStateFromIntent(manga)
 			}
 			val mode = detectReaderModeUseCase.invoke(manga, currentState.value)
 			val branch = chaptersLoader.peekChapter(currentState.value?.chapterId ?: 0L)?.branch
@@ -484,4 +491,18 @@ class ReaderViewModel @Inject constructor(
 		.filter { it == AppSettings.KEY_PAGES_TAB || it == AppSettings.KEY_DETAILS_TAB || it == AppSettings.KEY_DETAILS_LAST_TAB }
 		.map { settings.defaultDetailsTab == TAB_PAGES }
 		.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, settings.defaultDetailsTab == TAB_PAGES)
+
+	private suspend fun getStateFromIntent(manga: Manga): ReaderState {
+		val history = historyRepository.getOne(manga)
+		val result = if (history != null) {
+			if (preselectedBranch != null && preselectedBranch != manga.findChapter(history.chapterId)?.branch) {
+				null
+			} else {
+				ReaderState(history)
+			}
+		} else {
+			null
+		}
+		return result ?: ReaderState(manga, preselectedBranch ?: manga.getPreferredBranch(null))
+	}
 }

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

@@ -0,0 +1,85 @@
+package org.koitharu.kotatsu.reader.ui.config
+
+import android.content.Context
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
+import org.koitharu.kotatsu.core.util.ext.mapToArray
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.SuspendLazy
+import kotlin.coroutines.resume
+
+class ImageServerDelegate(
+	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val mangaSource: MangaSource?,
+) {
+
+	private val repositoryLazy = SuspendLazy {
+		mangaRepositoryFactory.create(checkNotNull(mangaSource)) as RemoteMangaRepository
+	}
+
+	suspend fun isAvailable() = withContext(Dispatchers.Default) {
+		repositoryLazy.tryGet().map { repository ->
+			repository.getConfigKeys().any { it is ConfigKey.PreferredImageServer }
+		}.getOrDefault(false)
+	}
+
+	suspend fun getValue(): String? = withContext(Dispatchers.Default) {
+		repositoryLazy.tryGet().map { repository ->
+			val key = repository.getConfigKeys().firstNotNullOfOrNull { it as? ConfigKey.PreferredImageServer }
+			if (key != null) {
+				key.presetValues[repository.getConfig()[key]]
+			} else {
+				null
+			}
+		}.getOrNull()
+	}
+
+	suspend fun showDialog(context: Context): Boolean {
+		val repository = withContext(Dispatchers.Default) {
+			repositoryLazy.tryGet().getOrNull()
+		} ?: return false
+		val key = repository.getConfigKeys().firstNotNullOfOrNull {
+			it as? ConfigKey.PreferredImageServer
+		} ?: return false
+		val entries = key.presetValues.values.mapToArray {
+			it ?: context.getString(R.string.automatic)
+		}
+		val entryValues = key.presetValues.keys.toTypedArray()
+		val config = repository.getConfig()
+		val initialValue = config[key]
+		var currentValue = initialValue
+		val changed = suspendCancellableCoroutine { cont ->
+			val dialog = MaterialAlertDialogBuilder(context)
+				.setTitle(R.string.image_server)
+				.setCancelable(true)
+				.setSingleChoiceItems(entries, entryValues.indexOf(initialValue)) { _, i ->
+					currentValue = entryValues[i]
+				}.setNegativeButton(android.R.string.cancel) { dialog, _ ->
+					dialog.cancel()
+				}.setPositiveButton(android.R.string.ok) { _, _ ->
+					if (currentValue != initialValue) {
+						config[key] = currentValue
+						cont.resume(true)
+					} else {
+						cont.resume(false)
+					}
+				}.setOnCancelListener {
+					cont.resume(false)
+				}.create()
+			dialog.show()
+			cont.invokeOnCancellation {
+				dialog.cancel()
+			}
+		}
+		if (changed) {
+			repository.invalidateCache()
+		}
+		return changed
+	}
+}