Fix crash on page loading

Currently translated at 100.0% (323 of 323 strings)

Co-authored-by: lowak <lowak@pm.me>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/sv/
Translation: Kotatsu/Strings

.editorconfig

@@ -15,5 +15,6 @@ disabled_rules=no-wildcard-imports,no-unused-imports
 ij_continuation_indent_size = 4
 
 [{*.kt,*.kts}]
+ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL

.gitignore

@@ -11,6 +11,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
+/.idea/kotlinc.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/androidTestResultsUserPreferences.xml
 /.idea/render.experimental.xml

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/kotlinc.xml

@@ -3,4 +3,7 @@
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.6.21" />
+  </component>
 </project>

app/build.gradle

@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 420
+		versionCode 430
-		versionName '3.4.8'
+		versionName '3.5'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -28,6 +28,8 @@ android {
 		// define this values in your local.properties file
 		buildConfigField 'String', 'SHIKIMORI_CLIENT_ID', "\"${localProperty('shikimori.clientId')}\""
 		buildConfigField 'String', 'SHIKIMORI_CLIENT_SECRET', "\"${localProperty('shikimori.clientSecret')}\""
+		resValue "string", "acra_login", "${localProperty('acra.login')}"
+		resValue "string", "acra_password", "${localProperty('acra.password')}"
 	}
 	buildTypes {
 		debug {
@@ -79,19 +81,19 @@ afterEvaluate {
 	}
 }
 dependencies {
-	implementation('com.github.KotatsuApp:kotatsu-parsers:85bfe42ddf') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:5cb953eb86') {
 		exclude group: 'org.json', module: 'json'
 	}
 
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 
 	implementation 'androidx.core:core-ktx:1.8.0'
-	implementation 'androidx.activity:activity-ktx:1.5.0'
+	implementation 'androidx.activity:activity-ktx:1.5.1'
-	implementation 'androidx.fragment:fragment-ktx:1.5.0'
+	implementation 'androidx.fragment:fragment-ktx:1.5.3'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-service:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-service:2.5.1'
-	implementation 'androidx.lifecycle:lifecycle-process:2.5.0'
+	implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -99,13 +101,13 @@ dependencies {
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha04'
-	implementation 'com.google.android.material:material:1.7.0-alpha03'
+	implementation 'com.google.android.material:material:1.7.0-rc01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
-	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.0'
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.5.1'
 
-	implementation 'androidx.room:room-runtime:2.4.2'
+	implementation 'androidx.room:room-runtime:2.4.3'
-	implementation 'androidx.room:room-ktx:2.4.2'
+	implementation 'androidx.room:room-ktx:2.4.3'
-	kapt 'androidx.room:room-compiler:2.4.2'
+	kapt 'androidx.room:room-compiler:2.4.3'
 
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 	implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
@@ -115,12 +117,12 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
 	implementation 'io.insert-koin:koin-android:3.2.0'
-	implementation 'io.coil-kt:coil-base:2.1.0'
+	implementation 'io.coil-kt:coil-base:2.2.1'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	implementation 'ch.acra:acra-mail:5.9.5'
+	implementation 'ch.acra:acra-http:5.9.6'
-	implementation 'ch.acra:acra-dialog:5.9.5'
+	implementation 'ch.acra:acra-dialog:5.9.6'
 
 	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
@@ -137,6 +139,6 @@ dependencies {
 	androidTestImplementation 'io.insert-koin:koin-test:3.2.0'
 	androidTestImplementation 'io.insert-koin:koin-test-junit4:3.2.0'
 
-	androidTestImplementation 'androidx.room:room-testing:2.4.2'
+	androidTestImplementation 'androidx.room:room-testing:2.4.3'
-	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
+	androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
 }

app/proguard-rules.pro

@@ -10,4 +10,6 @@
 }
 -keep public class ** extends org.koitharu.kotatsu.base.ui.BaseFragment
 -keep class org.koitharu.kotatsu.core.db.entity.* { *; }
--dontwarn okhttp3.internal.platform.ConscryptPlatform
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+-keep class org.koitharu.kotatsu.core.exceptions.* { *; }
+-keep class org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment

app/src/main/AndroidManifest.xml

@@ -111,6 +111,7 @@
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
+			android:stopWithTask="false"
 			android:foregroundServiceType="dataSync" />
 		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -8,9 +8,10 @@ import androidx.fragment.app.strictmode.FragmentStrictMode
 import androidx.room.InvalidationTracker
 import org.acra.ReportField
 import org.acra.config.dialog
-import org.acra.config.mailSender
+import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
 import org.koin.android.ext.android.get
 import org.koin.android.ext.android.getKoin
 import org.koin.android.ext.koin.androidContext
@@ -73,7 +74,7 @@ class KotatsuApp : Application() {
 				appWidgetModule,
 				suggestionsModule,
 				shikimoriModule,
-				bookmarksModule
+				bookmarksModule,
 			)
 		}
 	}
@@ -82,16 +83,25 @@ class KotatsuApp : Application() {
 		super.attachBaseContext(base)
 		initAcra {
 			buildConfigClass = BuildConfig::class.java
-			reportFormat = StringFormat.KEY_VALUE_LIST
+			reportFormat = StringFormat.JSON
+			excludeMatchingSharedPreferencesKeys = listOf(
+				"sources_\\w+",
+			)
+			httpSender {
+				uri = getString(R.string.url_error_report)
+				basicAuthLogin = getString(R.string.acra_login)
+				basicAuthPassword = getString(R.string.acra_password)
+				httpMethod = HttpSender.Method.POST
+			}
 			reportContent = listOf(
 				ReportField.PACKAGE_NAME,
 				ReportField.APP_VERSION_CODE,
 				ReportField.APP_VERSION_NAME,
 				ReportField.ANDROID_VERSION,
 				ReportField.PHONE_MODEL,
-				ReportField.CRASH_CONFIGURATION,
 				ReportField.STACK_TRACE,
-				ReportField.SHARED_PREFERENCES
+				ReportField.CRASH_CONFIGURATION,
+				ReportField.SHARED_PREFERENCES,
 			)
 			dialog {
 				text = getString(R.string.crash_text)
@@ -100,11 +110,6 @@ class KotatsuApp : Application() {
 				resIcon = R.drawable.ic_alert_outline
 				resTheme = android.R.style.Theme_Material_Light_Dialog_Alert
 			}
-			mailSender {
-				mailTo = getString(R.string.email_error_report)
-				reportAsFile = true
-				reportFileName = "stacktrace.txt"
-			}
 		}
 	}
 
@@ -129,7 +134,7 @@ class KotatsuApp : Application() {
 			StrictMode.ThreadPolicy.Builder()
 				.detectAll()
 				.penaltyLog()
-				.build()
+				.build(),
 		)
 		StrictMode.setVmPolicy(
 			StrictMode.VmPolicy.Builder()
@@ -138,7 +143,7 @@ class KotatsuApp : Application() {
 				.setClassInstanceLimit(PagesCache::class.java, 1)
 				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
 				.penaltyLog()
-				.build()
+				.build(),
 		)
 		FragmentStrictMode.defaultPolicy = FragmentStrictMode.Policy.Builder()
 			.penaltyDeath()

app/src/main/java/org/koitharu/kotatsu/base/domain/ReversibleHandle.kt

@@ -1,8 +1,12 @@
 package org.koitharu.kotatsu.base.domain
 
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 fun interface ReversibleHandle {
 
@@ -10,7 +14,13 @@ fun interface ReversibleHandle {
 }
 
 fun ReversibleHandle.reverseAsync() = processLifecycleScope.launch(Dispatchers.Default) {
-	reverse()
+	runCatchingCancellable {
+		withContext(NonCancellable) {
+			reverse()
+		}
+	}.onFailure {
+		it.printStackTraceDebug()
+	}
 }
 
 operator fun ReversibleHandle.plus(other: ReversibleHandle) = ReversibleHandle {

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt

@@ -10,6 +10,7 @@ import android.widget.Checkable
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.os.ParcelCompat
+import androidx.customview.view.AbsSavedState
 
 class CheckableImageView @JvmOverloads constructor(
 	context: Context,
@@ -73,7 +74,7 @@ class CheckableImageView @JvmOverloads constructor(
 		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
 	}
 
-	private class SavedState : BaseSavedState {
+	private class SavedState : AbsSavedState {
 
 		val isChecked: Boolean
 
@@ -81,7 +82,7 @@ class CheckableImageView @JvmOverloads constructor(
 			isChecked = checked
 		}
 
-		constructor(source: Parcel) : super(source) {
+		constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) {
 			isChecked = ParcelCompat.readBoolean(source)
 		}
 
@@ -91,9 +92,10 @@ class CheckableImageView @JvmOverloads constructor(
 		}
 
 		companion object {
+			@Suppress("unused")
 			@JvmField
 			val CREATOR: Creator<SavedState> = object : Creator<SavedState> {
-				override fun createFromParcel(`in`: Parcel) = SavedState(`in`)
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
 
 				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
 			}

app/src/main/java/org/koitharu/kotatsu/browser/cloudflare/CloudFlareDialog.kt

@@ -25,7 +25,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = FragmentCloudflareBinding.inflate(inflater, container, false)
 
 	@SuppressLint("SetJavaScriptEnabled")
@@ -49,6 +49,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onDestroyView() {
 		binding.webView.stopLoading()
+		binding.webView.destroy()
 		super.onDestroyView()
 	}
 
@@ -77,7 +78,7 @@ class CloudFlareDialog : AlertDialogFragment<FragmentCloudflareBinding>(), Cloud
 
 	override fun onCheckPassed() {
 		pendingResult.putBoolean(EXTRA_RESULT, true)
-		dismiss()
+		dismissAllowingStateLoss()
 	}
 
 	companion object {

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

@@ -7,6 +7,7 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.util.json.JSONIterator
 import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 private const val PAGE_SIZE = 10
 
@@ -84,7 +85,7 @@ class BackupRepository(private val db: MangaDatabase) {
 				JsonDeserializer(it).toTagEntity()
 			}
 			val history = JsonDeserializer(item).toHistoryEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.withTransaction {
 					db.tagsDao.upsert(tags)
 					db.mangaDao.upsert(manga, tags)
@@ -99,7 +100,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		val result = CompositeResult()
 		for (item in entry.data.JSONIterator()) {
 			val category = JsonDeserializer(item).toFavouriteCategoryEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.favouriteCategoriesDao.upsert(category)
 			}
 		}
@@ -115,7 +116,7 @@ class BackupRepository(private val db: MangaDatabase) {
 				JsonDeserializer(it).toTagEntity()
 			}
 			val favourite = JsonDeserializer(item).toFavouriteEntity()
-			result += runCatching {
+			result += runCatchingCancellable {
 				db.withTransaction {
 					db.tagsDao.upsert(tags)
 					db.mangaDao.upsert(manga, tags)

app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt

@@ -1,6 +1,34 @@
 package org.koitharu.kotatsu.core.model
 
+import androidx.core.os.LocaleListCompat
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import org.koitharu.kotatsu.parsers.util.toTitleCase
+import org.koitharu.kotatsu.utils.ext.iterator
 
-fun Collection<Manga>.ids() = mapToSet { it.id }
+fun Collection<Manga>.ids() = mapToSet { it.id }
+
+fun Manga.getPreferredBranch(history: MangaHistory?): String? {
+	val ch = chapters
+	if (ch.isNullOrEmpty()) {
+		return null
+	}
+	if (history != null) {
+		val currentChapter = ch.find { it.id == history.chapterId }
+		if (currentChapter != null) {
+			return currentChapter.branch
+		}
+	}
+	val groups = ch.groupBy { it.branch }
+	for (locale in LocaleListCompat.getAdjustedDefault()) {
+		var language = locale.getDisplayLanguage(locale).toTitleCase(locale)
+		if (groups.containsKey(language)) {
+			return language
+		}
+		language = locale.getDisplayName(locale).toTitleCase(locale)
+		if (groups.containsKey(language)) {
+			return language
+		}
+	}
+	return groups.maxByOrNull { it.value.size }?.key
+}

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

@@ -1,10 +1,18 @@
 package org.koitharu.kotatsu.core.model
 
+import java.util.*
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.toTitleCase
-import java.util.*
 
 fun MangaSource.getLocaleTitle(): String? {
 	val lc = Locale(locale ?: return null)
 	return lc.getDisplayLanguage(lc).toTitleCase(lc)
+}
+
+@Suppress("FunctionName")
+fun MangaSource(name: String): MangaSource? {
+	MangaSource.values().forEach {
+		if (it.name == name) return it
+	}
+	return null
 }

app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt

@@ -6,7 +6,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 
 // Limits to avoid TransactionTooLargeException
 private const val MAX_SAFE_SIZE = 1024 * 512 // Assume that 512 kb is safe parcel size
-private const val MAX_SAFE_CHAPTERS_COUNT = 40 // this is 100% safe
+private const val MAX_SAFE_CHAPTERS_COUNT = 32 // this is 100% safe
 
 class ParcelableManga(
 	val manga: Manga,

app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsUpdater.kt

@@ -6,6 +6,7 @@ import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
 import android.util.Size
+import androidx.annotation.RequiresApi
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
@@ -25,6 +26,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
 import org.koitharu.kotatsu.utils.ext.requireBitmap
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class ShortcutsUpdater(
 	private val context: Context,
@@ -37,10 +39,12 @@ class ShortcutsUpdater(
 	private var shortcutsUpdateJob: Job? = null
 
 	override fun onInvalidated(tables: MutableSet<String>) {
-		val prevJob = shortcutsUpdateJob
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-		shortcutsUpdateJob = processLifecycleScope.launch(Dispatchers.Default) {
+			val prevJob = shortcutsUpdateJob
-			prevJob?.join()
+			shortcutsUpdateJob = processLifecycleScope.launch(Dispatchers.Default) {
-			updateShortcutsImpl()
+				prevJob?.join()
+				updateShortcutsImpl()
+			}
 		}
 	}
 
@@ -48,7 +52,7 @@ class ShortcutsUpdater(
 		return ShortcutManagerCompat.requestPinShortcut(
 			context,
 			buildShortcutInfo(manga).build(),
-			null
+			null,
 		)
 	}
 
@@ -57,7 +61,8 @@ class ShortcutsUpdater(
 		return shortcutsUpdateJob?.join() != null
 	}
 
-	private suspend fun updateShortcutsImpl() = runCatching {
+	@RequiresApi(Build.VERSION_CODES.N_MR1)
+	private suspend fun updateShortcutsImpl() = runCatchingCancellable {
 		val manager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
 		val shortcuts = historyRepository.getList(0, manager.maxShortcutCountPerActivity)
 			.filter { x -> x.title.isNotEmpty() }
@@ -68,17 +73,17 @@ class ShortcutsUpdater(
 	}
 
 	private suspend fun buildShortcutInfo(manga: Manga): ShortcutInfoCompat.Builder {
-		val icon = runCatching {
+		val icon = runCatchingCancellable {
 			val bmp = coil.execute(
 				ImageRequest.Builder(context)
 					.data(manga.coverUrl)
 					.size(iconSize.width, iconSize.height)
-					.build()
+					.build(),
 			).requireBitmap()
 			ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
 		}.fold(
 			onSuccess = { IconCompat.createWithAdaptiveBitmap(it) },
-			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) }
+			onFailure = { IconCompat.createWithResource(context, R.drawable.ic_shortcut_default) },
 		)
 		mangaRepository.storeManga(manga)
 		return ShortcutInfoCompat.Builder(context, manga.id.toString())
@@ -87,7 +92,7 @@ class ShortcutsUpdater(
 			.setIcon(icon)
 			.setIntent(
 				ReaderActivity.newIntent(context, manga.id)
-					.setAction(ReaderActivity.ACTION_MANGA_READ)
+					.setAction(ReaderActivity.ACTION_MANGA_READ),
 			)
 	}
 

app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt

@@ -5,7 +5,7 @@ import coil.map.Mapper
 import coil.request.Options
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.core.model.MangaSource
 
 class FaviconMapper : Mapper<Uri, HttpUrl> {
 
@@ -13,7 +13,7 @@ class FaviconMapper : Mapper<Uri, HttpUrl> {
 		if (data.scheme != "favicon") {
 			return null
 		}
-		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
+		val mangaSource = MangaSource(data.schemeSpecificPart) ?: return null
 		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
 		return repo.getFaviconUrl().toHttpUrl()
 	}

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

@@ -14,9 +14,6 @@ import java.io.File
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.trySendBlocking
-import kotlinx.coroutines.flow.callbackFlow
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.network.DoHProvider
@@ -64,6 +61,9 @@ class AppSettings(context: Context) {
 	val readerPageSwitch: Set<String>
 		get() = prefs.getStringSet(KEY_READER_SWITCHERS, null) ?: setOf(PAGE_SWITCH_TAPS)
 
+	val isReaderTapsAdaptive: Boolean
+		get() = !prefs.getBoolean(KEY_READER_TAPS_LTR, false)
+
 	var isTrafficWarningEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
 		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
@@ -314,6 +314,7 @@ class AppSettings(context: Context) {
 		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
 		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
 		const val KEY_DOH = "doh"
+		const val KEY_READER_TAPS_LTR = "reader_taps_ltr"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"

app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt

@@ -12,6 +12,7 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import com.google.android.material.snackbar.Snackbar
+import kotlin.math.roundToInt
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -29,7 +30,6 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.RecyclerViewScrollCallback
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
-import kotlin.math.roundToInt
 
 class ChaptersFragment :
 	BaseFragment<FragmentChaptersBinding>(),
@@ -46,7 +46,7 @@ class ChaptersFragment :
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = FragmentChaptersBinding.inflate(inflater, container, false)
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -98,7 +98,7 @@ class ChaptersFragment :
 				manga = viewModel.manga.value ?: return,
 				state = ReaderState(item.chapter.id, 0, 0),
 			),
-			options.toBundle()
+			options.toBundle(),
 		)
 	}
 
@@ -128,7 +128,7 @@ class ChaptersFragment :
 						Snackbar.make(
 							binding.recyclerViewChapters,
 							R.string.chapters_will_removed_background,
-							Snackbar.LENGTH_LONG
+							Snackbar.LENGTH_LONG,
 						).show()
 					}
 				}
@@ -271,8 +271,8 @@ class ChaptersFragment :
 		}
 
 		override fun onPrepareMenu(menu: Menu) {
-			menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
+			menu.findItem(R.id.action_reversed)?.isChecked = viewModel.isChaptersReversed.value == true
-			menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
+			menu.findItem(R.id.action_search)?.isVisible = viewModel.isChaptersEmpty.value == false
 		}
 
 		override fun onMenuItemSelected(menuItem: MenuItem): Boolean = when (menuItem.itemId) {

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

@@ -105,7 +105,7 @@ class DetailsActivity :
 		Toast.makeText(
 			this,
 			getString(R.string._s_deleted_from_local_storage, manga.title),
-			Toast.LENGTH_SHORT
+			Toast.LENGTH_SHORT,
 		).show()
 		finishAfterTransition()
 	}
@@ -131,7 +131,7 @@ class DetailsActivity :
 					onActionClick = {
 						e.report("DetailsActivity::onError")
 						dismiss()
-					}
+					},
 				)
 			}
 			else -> {
@@ -142,14 +142,14 @@ class DetailsActivity :
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.snackbar.updatePadding(
-			bottom = insets.bottom
+			bottom = insets.bottom,
 		)
 		binding.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			topMargin = insets.top
 		}
 		binding.root.updatePadding(
 			left = insets.left,
-			right = insets.right
+			right = insets.right,
 		)
 	}
 
@@ -159,6 +159,7 @@ class DetailsActivity :
 			tab.removeBadge()
 		} else {
 			val badge = tab.orCreateBadge
+			badge.maxCharacterCount = 3
 			badge.number = newChapters
 			badge.isVisible = true
 		}
@@ -275,8 +276,8 @@ class DetailsActivity :
 					ReaderActivity.newIntent(
 						context = this@DetailsActivity,
 						manga = remoteManga,
-						state = ReaderState(chapterId, 0, 0)
+						state = ReaderState(chapterId, 0, 0),
-					)
+					),
 				)
 			}
 			setNeutralButton(R.string.download) { _, _ ->
@@ -350,8 +351,8 @@ class DetailsActivity :
 			dialogBuilder.setMessage(
 				getString(
 					R.string.large_manga_save_confirm,
-					resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount)
+					resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
-				)
+				),
 			).setPositiveButton(R.string.save) { _, _ ->
 				DownloadService.start(this, manga)
 			}

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

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.details.ui
 
 import android.app.ActivityOptions
 import android.os.Bundle
-import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.view.*
 import androidx.appcompat.widget.PopupMenu
@@ -10,18 +9,15 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toFile
 import androidx.core.net.toUri
-import androidx.core.text.parseAsHtml
 import androidx.core.view.MenuProvider
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.size.Scale
 import coil.util.CoilUtils
 import com.google.android.material.chip.Chip
 import kotlinx.coroutines.launch
-import org.koin.android.ext.android.get
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
@@ -33,6 +29,7 @@ import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.BookmarksAdapter
 import org.koitharu.kotatsu.core.model.MangaHistory
 import org.koitharu.kotatsu.databinding.FragmentDetailsBinding
+import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoBottomSheet
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesBottomSheet
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
@@ -49,6 +46,7 @@ import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.utils.FileSize
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 class DetailsFragment :
 	BaseFragment<FragmentDetailsBinding>(),
@@ -82,6 +80,7 @@ class DetailsFragment :
 		viewModel.bookmarks.observe(viewLifecycleOwner, ::onBookmarksChanged)
 		viewModel.scrobblingInfo.observe(viewLifecycleOwner, ::onScrobblingInfoChanged)
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
+		viewModel.chapters.observe(viewLifecycleOwner, ::onChaptersChanged)
 		addMenuProvider(DetailsMenuProvider())
 	}
 
@@ -126,18 +125,6 @@ class DetailsFragment :
 				else -> textViewState.isVisible = false
 			}
 
-			// Info containers
-			val chapters = manga.chapters
-			if (chapters.isNullOrEmpty()) {
-				infoLayout.textViewChapters.isVisible = false
-			} else {
-				infoLayout.textViewChapters.isVisible = true
-				infoLayout.textViewChapters.text = resources.getQuantityString(
-					R.plurals.chapters,
-					chapters.size,
-					chapters.size,
-				)
-			}
 			if (manga.hasRating) {
 				infoLayout.textViewRating.text = String.format("%.1f", manga.rating * 5)
 				infoLayout.ratingContainer.isVisible = true
@@ -164,14 +151,27 @@ class DetailsFragment :
 
 			infoLayout.textViewNsfw.isVisible = manga.isNsfw
 
-			// Buttons
-			buttonRead.isEnabled = !manga.chapters.isNullOrEmpty()
-
 			// Chips
 			bindTags(manga)
 		}
 	}
 
+	private fun onChaptersChanged(chapters: List<ChapterListItem>?) {
+		val infoLayout = binding.infoLayout
+		if (chapters.isNullOrEmpty()) {
+			infoLayout.textViewChapters.isVisible = false
+		} else {
+			infoLayout.textViewChapters.isVisible = true
+			infoLayout.textViewChapters.text = resources.getQuantityString(
+				R.plurals.chapters,
+				chapters.size,
+				chapters.size,
+			)
+		}
+		// Buttons
+		binding.buttonRead.isEnabled = !chapters.isNullOrEmpty()
+	}
+
 	private fun onDescriptionChanged(description: CharSequence?) {
 		if (description.isNullOrBlank()) {
 			binding.textViewDescription.setText(R.string.no_description)
@@ -266,7 +266,7 @@ class DetailsFragment :
 							context = context ?: return,
 							manga = manga,
 							branch = viewModel.selectedBranchValue,
-						)
+						),
 					)
 				}
 			}
@@ -276,14 +276,14 @@ class DetailsFragment :
 						context = v.context,
 						source = manga.source,
 						query = manga.author ?: return,
-					)
+					),
 				)
 			}
 			R.id.imageView_cover -> {
 				val options = ActivityOptions.makeScaleUpAnimation(v, 0, 0, v.width, v.height)
 				startActivity(
 					ImageActivity.newIntent(v.context, manga.largeCoverUrl.ifNullOrEmpty { manga.coverUrl }),
-					options.toBundle()
+					options.toBundle(),
 				)
 			}
 		}
@@ -309,8 +309,8 @@ class DetailsFragment :
 										c.chapter.branch == branch
 									}?.let { c ->
 										ReaderState(c.chapter.id, 0, 0)
-									}
+									},
-								)
+								),
 							)
 							true
 						}
@@ -343,7 +343,7 @@ class DetailsFragment :
 					icon = 0,
 					data = tag,
 				)
-			}
+			},
 		)
 	}
 
@@ -355,13 +355,22 @@ class DetailsFragment :
 		}
 		val request = ImageRequest.Builder(context ?: return)
 			.target(binding.imageViewCover)
+			.size(CoverSizeResolver(binding.imageViewCover))
 			.data(imageUrl)
 			.crossfade(true)
 			.referer(manga.publicUrl)
 			.lifecycle(viewLifecycleOwner)
-		lastResult?.drawable?.let {
+			.placeholderMemoryCacheKey(manga.coverUrl)
-			request.fallback(it)
+		val previousDrawable = lastResult?.drawable
-		} ?: request.fallback(R.drawable.ic_placeholder)
+		if (previousDrawable != null) {
+			request.fallback(previousDrawable)
+				.placeholder(previousDrawable)
+				.error(previousDrawable)
+		} else {
+			request.fallback(R.drawable.ic_placeholder)
+				.placeholder(R.drawable.ic_placeholder)
+				.error(R.drawable.ic_placeholder)
+		}
 		request.enqueueWith(coil)
 	}
 

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

@@ -1,11 +1,16 @@
 package org.koitharu.kotatsu.details.ui
 
 import android.text.Html
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
+import androidx.core.text.getSpans
 import androidx.core.text.parseAsHtml
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
+import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -33,7 +38,7 @@ import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import java.io.IOException
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class DetailsViewModel(
 	intent: MangaIntent,
@@ -91,8 +96,8 @@ class DetailsViewModel(
 			if (description.isNullOrEmpty()) {
 				emit(null)
 			} else {
-				emit(description.parseAsHtml())
+				emit(description.parseAsHtml().filterSpans())
-				emit(description.parseAsHtml(imageGetter = imageGetter))
+				emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
 			}
 		}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
@@ -110,7 +115,7 @@ class DetailsViewModel(
 
 	val selectedBranchIndex = combine(
 		branches.asFlow(),
-		delegate.selectedBranch
+		delegate.selectedBranch,
 	) { branches, selected ->
 		branches.indexOf(selected)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
@@ -161,7 +166,7 @@ class DetailsViewModel(
 			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
 			val original = localMangaRepository.getRemoteManga(manga)
 			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
-			runCatching {
+			runCatchingCancellable {
 				historyRepository.deleteOrSwap(manga, original)
 			}
 			onMangaRemoved.postCall(manga)
@@ -200,7 +205,7 @@ class DetailsViewModel(
 			reload()
 		} else {
 			viewModelScope.launch(Dispatchers.Default) {
-				runCatching {
+				runCatchingCancellable {
 					localMangaRepository.getDetails(downloadedManga)
 				}.onSuccess {
 					delegate.relatedManga.value = it
@@ -225,7 +230,7 @@ class DetailsViewModel(
 	fun unregisterScrobbling() {
 		launchJob(Dispatchers.Default) {
 			scrobbler.unregisterScrobbling(
-				mangaId = delegate.mangaId
+				mangaId = delegate.mangaId,
 			)
 		}
 	}
@@ -242,4 +247,13 @@ class DetailsViewModel(
 			it.chapter.name.contains(query, ignoreCase = true)
 		}
 	}
+
+	private fun Spanned.filterSpans(): CharSequence {
+		val spannable = SpannableString.valueOf(this)
+		val spans = spannable.getSpans<ForegroundColorSpan>()
+		for (span in spans) {
+			spannable.removeSpan(span)
+		}
+		return spannable.trim()
+	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/MangaDetailsDelegate.kt

@@ -1,11 +1,11 @@
 package org.koitharu.kotatsu.details.ui
 
-import androidx.core.os.LocaleListCompat
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.domain.MangaIntent
 import org.koitharu.kotatsu.core.model.MangaHistory
+import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
@@ -16,10 +16,8 @@ import org.koitharu.kotatsu.parsers.exception.NotFoundException
 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.mapToSet
-import org.koitharu.kotatsu.parsers.util.toTitleCase
-import org.koitharu.kotatsu.utils.ext.iterator
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class MangaDetailsDelegate(
 	private val intent: MangaIntent,
@@ -45,16 +43,11 @@ class MangaDetailsDelegate(
 		manga = MangaRepository(manga.source).getDetails(manga)
 		// find default branch
 		val hist = historyRepository.getOne(manga)
-		selectedBranch.value = if (hist != null) {
+		selectedBranch.value = manga.getPreferredBranch(hist)
-			val currentChapter = manga.chapters?.find { it.id == hist.chapterId }
-			if (currentChapter != null) currentChapter.branch else predictBranch(manga.chapters)
-		} else {
-			predictBranch(manga.chapters)
-		}
 		mangaData.value = manga
-		relatedManga.value = runCatching {
+		relatedManga.value = runCatchingCancellable {
 			if (manga.source == MangaSource.LOCAL) {
-				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatching null
+				val m = localMangaRepository.getRemoteManga(manga) ?: return@runCatchingCancellable null
 				MangaRepository(m.source).getDetails(m)
 			} else {
 				localMangaRepository.findSavedManga(manga)
@@ -91,7 +84,7 @@ class MangaDetailsDelegate(
 		val dateFormat = settings.getDateFormat()
 		val currentIndex = chapters.indexOfFirst { it.id == currentId }
 		val firstNewIndex = chapters.size - newCount
-		val downloadedIds = downloadedChapters?.mapToSet { it.id }
+		val downloadedIds = downloadedChapters?.mapTo(HashSet(downloadedChapters.size)) { it.id }
 		for (i in chapters.indices) {
 			val chapter = chapters[i]
 			if (chapter.branch != branch) {
@@ -106,6 +99,9 @@ class MangaDetailsDelegate(
 				dateFormat = dateFormat,
 			)
 		}
+		if (result.size < chapters.size / 2) {
+			result.trimToSize()
+		}
 		return result
 	}
 
@@ -161,24 +157,9 @@ class MangaDetailsDelegate(
 			}
 			result.sortBy { it.chapter.number }
 		}
+		if (result.size < sourceChapters.size / 2) {
+			result.trimToSize()
+		}
 		return result
 	}
-
-	private fun predictBranch(chapters: List<MangaChapter>?): String? {
-		if (chapters.isNullOrEmpty()) {
-			return null
-		}
-		val groups = chapters.groupBy { it.branch }
-		for (locale in LocaleListCompat.getAdjustedDefault()) {
-			var language = locale.getDisplayLanguage(locale).toTitleCase(locale)
-			if (groups.containsKey(language)) {
-				return language
-			}
-			language = locale.getDisplayName(locale).toTitleCase(locale)
-			if (groups.containsKey(language)) {
-				return language
-			}
-		}
-		return groups.maxByOrNull { it.value.size }?.key
-	}
 }

app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt

@@ -1,13 +1,24 @@
 package org.koitharu.kotatsu.details.ui.model
 
+import java.text.DateFormat
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 
 class ChapterListItem(
 	val chapter: MangaChapter,
 	val flags: Int,
-	val uploadDate: String?,
+	private val uploadDateMs: Long,
+	private val dateFormat: DateFormat,
 ) {
 
+	var uploadDate: String? = null
+		private set
+		get() {
+			if (field != null) return field
+			if (uploadDateMs == 0L) return null
+			field = dateFormat.format(uploadDateMs)
+			return field
+		}
+
 	val status: Int
 		get() = flags and MASK_STATUS
 
@@ -32,7 +43,8 @@ class ChapterListItem(
 
 		if (chapter != other.chapter) return false
 		if (flags != other.flags) return false
-		if (uploadDate != other.uploadDate) return false
+		if (uploadDateMs != other.uploadDateMs) return false
+		if (dateFormat != other.dateFormat) return false
 
 		return true
 	}
@@ -40,7 +52,8 @@ class ChapterListItem(
 	override fun hashCode(): Int {
 		var result = chapter.hashCode()
 		result = 31 * result + flags
-		result = 31 * result + (uploadDate?.hashCode() ?: 0)
+		result = 31 * result + uploadDateMs.hashCode()
+		result = 31 * result + dateFormat.hashCode()
 		return result
 	}
 
@@ -53,4 +66,4 @@ class ChapterListItem(
 		const val FLAG_DOWNLOADED = 32
 		const val MASK_STATUS = FLAG_UNREAD or FLAG_CURRENT
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/details/ui/model/ListModelConversionExt.kt

@@ -1,12 +1,12 @@
 package org.koitharu.kotatsu.details.ui.model
 
+import java.text.DateFormat
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_CURRENT
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_DOWNLOADED
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_MISSING
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_NEW
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem.Companion.FLAG_UNREAD
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import java.text.DateFormat
 
 fun MangaChapter.toListItem(
 	isCurrent: Boolean,
@@ -25,6 +25,7 @@ fun MangaChapter.toListItem(
 	return ChapterListItem(
 		chapter = this,
 		flags = flags,
-		uploadDate = if (uploadDate != 0L) dateFormat.format(uploadDate) else null
+		uploadDateMs = uploadDate,
+		dateFormat = dateFormat,
 	)
 }

app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt

@@ -6,11 +6,21 @@ import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.Scale
 import java.io.File
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runInterruptible
 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 org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.network.CommonHeaders
@@ -26,6 +36,7 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.progress.PausingProgressJob
 
 private const val MAX_FAILSAFE_ATTEMPTS = 2
@@ -43,10 +54,10 @@ class DownloadManager(
 ) {
 
 	private val coverWidth = context.resources.getDimensionPixelSize(
-		androidx.core.R.dimen.compat_notification_large_icon_max_width
+		androidx.core.R.dimen.compat_notification_large_icon_max_width,
 	)
 	private val coverHeight = context.resources.getDimensionPixelSize(
-		androidx.core.R.dimen.compat_notification_large_icon_max_height
+		androidx.core.R.dimen.compat_notification_large_icon_max_height,
 	)
 	private val semaphore = Semaphore(settings.downloadsParallelism)
 
@@ -56,105 +67,115 @@ class DownloadManager(
 		startId: Int,
 	): PausingProgressJob<DownloadState> {
 		val stateFlow = MutableStateFlow<DownloadState>(
-			DownloadState.Queued(startId = startId, manga = manga, cover = null)
+			DownloadState.Queued(startId = startId, manga = manga, cover = null),
 		)
 		val pausingHandle = PausingHandle()
-		val job = downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, pausingHandle, startId)
+		val job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(stateFlow)) {
+			try {
+				downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, pausingHandle, startId)
+			} catch (e: CancellationException) { // handle cancellation if not handled already
+				val state = stateFlow.value
+				if (state !is DownloadState.Cancelled) {
+					stateFlow.value = DownloadState.Cancelled(startId, state.manga, state.cover)
+				}
+				throw e
+			}
+		}
 		return PausingProgressJob(job, stateFlow, pausingHandle)
 	}
 
-	private fun downloadMangaImpl(
+	private suspend fun downloadMangaImpl(
 		manga: Manga,
 		chaptersIds: LongArray?,
 		outState: MutableStateFlow<DownloadState>,
 		pausingHandle: PausingHandle,
 		startId: Int,
-	): Job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(outState)) {
+	) {
 		@Suppress("NAME_SHADOWING")
 		var manga = manga
 		val chaptersIdsSet = chaptersIds?.toMutableSet()
 		val cover = loadCover(manga)
 		outState.value = DownloadState.Queued(startId, manga, cover)
-		localMangaRepository.lockManga(manga.id)
+		withMangaLock(manga) {
-		semaphore.acquire()
+			semaphore.withPermit {
-		coroutineContext[WakeLockNode]?.acquire()
+				outState.value = DownloadState.Preparing(startId, manga, null)
-		outState.value = DownloadState.Preparing(startId, manga, null)
+				val destination = localMangaRepository.getOutputDir()
-		val destination = localMangaRepository.getOutputDir()
+				checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
-		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
+				val tempFileName = "${manga.id}_$startId.tmp"
-		val tempFileName = "${manga.id}_$startId.tmp"
+				var output: CbzMangaOutput? = null
-		var output: CbzMangaOutput? = null
+				try {
-		try {
+					if (manga.source == MangaSource.LOCAL) {
-			if (manga.source == MangaSource.LOCAL) {
+						manga = localMangaRepository.getRemoteManga(manga)
-				manga = localMangaRepository.getRemoteManga(manga) ?: error("Cannot obtain remote manga instance")
+							?: error("Cannot obtain remote manga instance")
-			}
-			val repo = MangaRepository(manga.source)
-			outState.value = DownloadState.Preparing(startId, manga, cover)
-			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-			output = CbzMangaOutput.get(destination, data)
-			val coverUrl = data.largeCoverUrl ?: data.coverUrl
-			downloadFile(coverUrl, data.publicUrl, destination, tempFileName).let { file ->
-				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
-			}
-			val chapters = checkNotNull(
-				if (chaptersIdsSet == null) {
-					data.chapters
-				} else {
-					data.chapters?.filter { x -> chaptersIdsSet.remove(x.id) }
-				}
-			) { "Chapters list must not be null" }
-			check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
-			check(chaptersIdsSet.isNullOrEmpty()) {
-				"${chaptersIdsSet?.size} of ${chaptersIds?.size} requested chapters not found in manga"
-			}
-			for ((chapterIndex, chapter) in chapters.withIndex()) {
-				val pages = runFailsafe(outState, pausingHandle) {
-					repo.getPages(chapter)
-				}
-				for ((pageIndex, page) in pages.withIndex()) {
-					runFailsafe(outState, pausingHandle) {
-						val url = repo.getPageUrl(page)
-						val file = cache[url] ?: downloadFile(url, page.referer, destination, tempFileName)
-						output.addPage(
-							chapter = chapter,
-							file = file,
-							pageNumber = pageIndex,
-							ext = MimeTypeMap.getFileExtensionFromUrl(url)
-						)
 					}
-					outState.value = DownloadState.Progress(
+					val repo = MangaRepository(manga.source)
-						startId = startId,
+					outState.value = DownloadState.Preparing(startId, manga, cover)
-						manga = data,
+					val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-						cover = cover,
+					output = CbzMangaOutput.get(destination, data)
-						totalChapters = chapters.size,
+					val coverUrl = data.largeCoverUrl ?: data.coverUrl
-						currentChapter = chapterIndex,
+					downloadFile(coverUrl, data.publicUrl, destination, tempFileName).let { file ->
-						totalPages = pages.size,
+						output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
-						currentPage = pageIndex
+					}
-					)
+					val chapters = checkNotNull(
+						if (chaptersIdsSet == null) {
+							data.chapters
+						} else {
+							data.chapters?.filter { x -> chaptersIdsSet.remove(x.id) }
+						},
+					) { "Chapters list must not be null" }
+					check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
+					check(chaptersIdsSet.isNullOrEmpty()) {
+						"${chaptersIdsSet?.size} of ${chaptersIds?.size} requested chapters not found in manga"
+					}
+					for ((chapterIndex, chapter) in chapters.withIndex()) {
+						val pages = runFailsafe(outState, pausingHandle) {
+							repo.getPages(chapter)
+						}
+						for ((pageIndex, page) in pages.withIndex()) {
+							runFailsafe(outState, pausingHandle) {
+								val url = repo.getPageUrl(page)
+								val file = cache[url] ?: downloadFile(url, page.referer, destination, tempFileName)
+								output.addPage(
+									chapter = chapter,
+									file = file,
+									pageNumber = pageIndex,
+									ext = MimeTypeMap.getFileExtensionFromUrl(url),
+								)
+							}
+							outState.value = DownloadState.Progress(
+								startId = startId,
+								manga = data,
+								cover = cover,
+								totalChapters = chapters.size,
+								currentChapter = chapterIndex,
+								totalPages = pages.size,
+								currentPage = pageIndex,
+							)
 
-					if (settings.isDownloadsSlowdownEnabled) {
+							if (settings.isDownloadsSlowdownEnabled) {
-						delay(SLOWDOWN_DELAY)
+								delay(SLOWDOWN_DELAY)
+							}
+						}
+					}
+					outState.value = DownloadState.PostProcessing(startId, data, cover)
+					output.mergeWithExisting()
+					output.finish()
+					val localManga = localMangaRepository.getFromFile(output.file)
+					outState.value = DownloadState.Done(startId, data, cover, localManga)
+				} catch (e: CancellationException) {
+					outState.value = DownloadState.Cancelled(startId, manga, cover)
+					throw e
+				} catch (e: Throwable) {
+					e.printStackTraceDebug()
+					outState.value = DownloadState.Error(startId, manga, cover, e, false)
+				} finally {
+					withContext(NonCancellable) {
+						output?.closeQuietly()
+						output?.cleanup()
+						File(destination, tempFileName).deleteAwait()
 					}
 				}
 			}
-			outState.value = DownloadState.PostProcessing(startId, data, cover)
-			output.mergeWithExisting()
-			output.finalize()
-			val localManga = localMangaRepository.getFromFile(output.file)
-			outState.value = DownloadState.Done(startId, data, cover, localManga)
-		} catch (e: CancellationException) {
-			outState.value = DownloadState.Cancelled(startId, manga, cover)
-			throw e
-		} catch (e: Throwable) {
-			e.printStackTraceDebug()
-			outState.value = DownloadState.Error(startId, manga, cover, e, false)
-		} finally {
-			withContext(NonCancellable) {
-				output?.cleanup()
-				File(destination, tempFileName).deleteAwait()
-				coroutineContext[WakeLockNode]?.release()
-				semaphore.release()
-				localMangaRepository.unlockManga(manga.id)
-			}
 		}
 	}
 
@@ -203,27 +224,35 @@ class DownloadManager(
 
 	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) =
 		CoroutineExceptionHandler { _, throwable ->
+			throwable.printStackTraceDebug()
 			val prevValue = outState.value
 			outState.value = DownloadState.Error(
 				startId = prevValue.startId,
 				manga = prevValue.manga,
 				cover = prevValue.cover,
 				error = throwable,
-				canRetry = false
+				canRetry = false,
 			)
 		}
 
-	private suspend fun loadCover(manga: Manga) = runCatching {
+	private suspend fun loadCover(manga: Manga) = runCatchingCancellable {
 		imageLoader.execute(
 			ImageRequest.Builder(context)
 				.data(manga.coverUrl)
 				.referer(manga.publicUrl)
 				.size(coverWidth, coverHeight)
 				.scale(Scale.FILL)
-				.build()
+				.build(),
 		).drawable
 	}.getOrNull()
 
+	private suspend inline fun <T> withMangaLock(manga: Manga, block: () -> T) = try {
+		localMangaRepository.lockManga(manga.id)
+		block()
+	} finally {
+		localMangaRepository.unlockManga(manga.id)
+	}
+
 	class Factory(
 		private val context: Context,
 		private val imageLoader: ImageLoader,
@@ -240,7 +269,7 @@ class DownloadManager(
 			okHttp = okHttp,
 			cache = cache,
 			localMangaRepository = localMangaRepository,
-			settings = settings
+			settings = settings,
 		)
 	}
 }

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

@@ -108,34 +108,6 @@ sealed interface DownloadState {
 		}
 	}
 
-	@Deprecated("TODO: remove")
-	class WaitingForNetwork(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as WaitingForNetwork
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-
 	class Done(
 		override val startId: Int,
 		override val manga: Manga,

app/src/main/java/org/koitharu/kotatsu/download/domain/WakeLockNode.kt

@@ -1,25 +0,0 @@
-package org.koitharu.kotatsu.download.domain
-
-import android.os.PowerManager
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
-
-class WakeLockNode(
-	private val wakeLock: PowerManager.WakeLock,
-	private val timeout: Long,
-) : AbstractCoroutineContextElement(Key) {
-
-	init {
-		wakeLock.setReferenceCounted(true)
-	}
-
-	fun acquire() {
-		wakeLock.acquire(timeout)
-	}
-
-	fun release() {
-		wakeLock.release()
-	}
-
-	companion object Key : CoroutineContext.Key<WakeLockNode>
-}

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

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.download.ui
 
+import android.view.View
 import androidx.core.view.isVisible
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -9,21 +10,33 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.ItemDownloadBinding
+import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.utils.ext.*
-import org.koitharu.kotatsu.utils.progress.ProgressJob
 
 fun downloadItemAD(
 	scope: CoroutineScope,
 	coil: ImageLoader,
-) = adapterDelegateViewBinding<ProgressJob<DownloadState>, ProgressJob<DownloadState>, ItemDownloadBinding>(
+) = adapterDelegateViewBinding<DownloadItem, DownloadItem, ItemDownloadBinding>(
-	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) },
 ) {
-
 	var job: Job? = null
 	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
 
+	val clickListener = View.OnClickListener { v ->
+		when (v.id) {
+			R.id.button_cancel -> item.cancel()
+			R.id.button_resume -> item.resume()
+			else -> context.startActivity(
+				DetailsActivity.newIntent(context, item.progressValue.manga),
+			)
+		}
+	}
+	binding.buttonCancel.setOnClickListener(clickListener)
+	binding.buttonResume.setOnClickListener(clickListener)
+	itemView.setOnClickListener(clickListener)
+
 	bind {
 		job?.cancel()
 		job = item.progressAsFlow().onFirst { state ->
@@ -44,6 +57,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Done -> {
 					binding.textViewStatus.setText(R.string.download_complete)
@@ -51,6 +66,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = false
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Error -> {
 					binding.textViewStatus.setText(R.string.error_occurred)
@@ -59,6 +76,8 @@ fun downloadItemAD(
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
 					binding.textViewDetails.isVisible = true
+					binding.buttonCancel.isVisible = state.canRetry
+					binding.buttonResume.isVisible = state.canRetry
 				}
 				is DownloadState.PostProcessing -> {
 					binding.textViewStatus.setText(R.string.processing_)
@@ -66,6 +85,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Preparing -> {
 					binding.textViewStatus.setText(R.string.preparing_)
@@ -73,6 +94,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = true
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Progress -> {
 					binding.textViewStatus.setText(R.string.manga_downloading_)
@@ -83,6 +106,8 @@ fun downloadItemAD(
 					binding.textViewPercent.text = percentPattern.format((state.percent * 100f).format(1))
 					binding.textViewPercent.isVisible = true
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = true
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Queued -> {
 					binding.textViewStatus.setText(R.string.queued)
@@ -90,13 +115,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = false
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
-				}
+					binding.buttonCancel.isVisible = true
-				is DownloadState.WaitingForNetwork -> {
+					binding.buttonResume.isVisible = false
-					binding.textViewStatus.setText(R.string.waiting_for_network)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
 				}
 			}
 		}.launchIn(scope)

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

@@ -1,21 +1,23 @@
 package org.koitharu.kotatsu.download.ui
 
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
 import android.os.Bundle
+import android.os.IBinder
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.launch
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.koin.android.ext.android.get
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.databinding.ActivityDownloadsBinding
 import org.koitharu.kotatsu.download.ui.service.DownloadService
-import org.koitharu.kotatsu.utils.bindServiceWithLifecycle
 
 class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 
@@ -26,30 +28,63 @@ class DownloadsActivity : BaseActivity<ActivityDownloadsBinding>() {
 		val adapter = DownloadsAdapter(lifecycleScope, get())
 		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter
-		bindServiceWithLifecycle(
+		val connection = DownloadServiceConnection(adapter)
-			owner = this,
+		bindService(Intent(this, DownloadService::class.java), connection, 0)
-			service = Intent(this, DownloadService::class.java),
+		lifecycle.addObserver(connection)
-			flags = 0,
-		).service.flatMapLatest { binder ->
-			(binder as? DownloadService.DownloadBinder)?.downloads ?: flowOf(null)
-		}.onEach {
-			adapter.items = it?.toList().orEmpty()
-			binding.textViewHolder.isVisible = it.isNullOrEmpty()
-		}.launchIn(lifecycleScope)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.recyclerView.updatePadding(
 			left = insets.left,
 			right = insets.right,
-			bottom = insets.bottom
+			bottom = insets.bottom,
 		)
 		binding.toolbar.updatePadding(
 			left = insets.left,
-			right = insets.right
+			right = insets.right,
 		)
 	}
 
+	private inner class DownloadServiceConnection(
+		private val adapter: DownloadsAdapter,
+	) : ServiceConnection, DefaultLifecycleObserver {
+
+		private var collectJob: Job? = null
+
+		override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+			collectJob?.cancel()
+			val binder = (service as? DownloadService.DownloadBinder)
+			collectJob = if (binder == null) {
+				null
+			} else {
+				lifecycleScope.launch {
+					binder.downloads.collect {
+						setItems(it)
+					}
+				}
+			}
+		}
+
+		override fun onServiceDisconnected(name: ComponentName?) {
+			collectJob?.cancel()
+			collectJob = null
+			setItems(null)
+		}
+
+		override fun onDestroy(owner: LifecycleOwner) {
+			super.onDestroy(owner)
+			collectJob?.cancel()
+			collectJob = null
+			owner.lifecycle.removeObserver(this)
+			unbindService(this)
+		}
+
+		private fun setItems(items: Collection<DownloadItem>?) {
+			adapter.items = items?.toList().orEmpty()
+			binding.textViewHolder.isVisible = items.isNullOrEmpty()
+		}
+	}
+
 	companion object {
 
 		fun newIntent(context: Context) = Intent(context, DownloadsActivity::class.java)

app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt

@@ -5,12 +5,14 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import kotlinx.coroutines.CoroutineScope
 import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.utils.progress.ProgressJob
+import org.koitharu.kotatsu.utils.progress.PausingProgressJob
+
+typealias DownloadItem = PausingProgressJob<DownloadState>
 
 class DownloadsAdapter(
 	scope: CoroutineScope,
 	coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter<ProgressJob<DownloadState>>(DiffCallback()) {
+) : AsyncListDifferDelegationAdapter<DownloadItem>(DiffCallback()) {
 
 	init {
 		delegatesManager.addDelegate(downloadItemAD(scope, coil))
@@ -21,18 +23,18 @@ class DownloadsAdapter(
 		return items[position].progressValue.startId.toLong()
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<ProgressJob<DownloadState>>() {
+	private class DiffCallback : DiffUtil.ItemCallback<DownloadItem>() {
 
 		override fun areItemsTheSame(
-			oldItem: ProgressJob<DownloadState>,
+			oldItem: DownloadItem,
-			newItem: ProgressJob<DownloadState>,
+			newItem: DownloadItem,
 		): Boolean {
 			return oldItem.progressValue.startId == newItem.progressValue.startId
 		}
 
 		override fun areContentsTheSame(
-			oldItem: ProgressJob<DownloadState>,
+			oldItem: DownloadItem,
-			newItem: ProgressJob<DownloadState>,
+			newItem: DownloadItem,
 		): Boolean {
 			return oldItem.progressValue == newItem.progressValue
 		}

app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt

@@ -7,163 +7,307 @@ import android.app.PendingIntent
 import android.content.Context
 import android.os.Build
 import android.text.format.DateUtils
+import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.text.HtmlCompat
+import androidx.core.text.htmlEncode
+import androidx.core.text.parseAsHtml
+import androidx.core.util.forEach
+import androidx.core.util.isNotEmpty
+import androidx.core.util.size
 import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.download.ui.DownloadsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.util.ellipsize
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
-class DownloadNotification(private val context: Context, startId: Int) {
+class DownloadNotification(private val context: Context) {
+
+	private val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+	private val states = SparseArray<DownloadState>()
+	private val groupBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
 
-	private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
-	private val cancelAction = NotificationCompat.Action(
-		materialR.drawable.material_ic_clear_black_24dp,
-		context.getString(android.R.string.cancel),
-		PendingIntent.getBroadcast(
-			context,
-			startId * 2,
-			DownloadService.getCancelIntent(startId),
-			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-		)
-	)
-	private val retryAction = NotificationCompat.Action(
-		R.drawable.ic_restart_black,
-		context.getString(R.string.try_again),
-		PendingIntent.getBroadcast(
-			context,
-			startId * 2 + 1,
-			DownloadService.getResumeIntent(startId),
-			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-		)
-	)
 	private val listIntent = PendingIntent.getActivity(
 		context,
 		REQUEST_LIST,
 		DownloadsActivity.newIntent(context),
-		PendingIntentCompat.FLAG_IMMUTABLE
+		PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
 	init {
-		builder.setOnlyAlertOnce(true)
+		groupBuilder.setOnlyAlertOnce(true)
-		builder.setDefaults(0)
+		groupBuilder.setDefaults(0)
-		builder.color = ContextCompat.getColor(context, R.color.blue_primary)
+		groupBuilder.color = ContextCompat.getColor(context, R.color.blue_primary)
-		builder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
+		groupBuilder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
-		builder.setSilent(true)
+		groupBuilder.setSilent(true)
+		groupBuilder.setGroup(GROUP_ID)
+		groupBuilder.setContentIntent(listIntent)
+		groupBuilder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
+		groupBuilder.setGroupSummary(true)
+		groupBuilder.setContentTitle(context.getString(R.string.downloading_manga))
 	}
 
-	fun create(state: DownloadState, timeLeft: Long): Notification {
+	fun buildGroupNotification(): Notification {
-		builder.setContentTitle(state.manga.title)
+		val style = NotificationCompat.InboxStyle(groupBuilder)
-		builder.setContentText(context.getString(R.string.manga_downloading_))
+		var progress = 0f
-		builder.setProgress(1, 0, true)
+		var isAllDone = true
-		builder.setSmallIcon(android.R.drawable.stat_sys_download)
+		var isInProgress = false
-		builder.setContentIntent(listIntent)
+		groupBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-		builder.setStyle(null)
+		states.forEach { _, state ->
-		builder.setLargeIcon(state.cover?.toBitmap())
-		builder.clearActions()
-		builder.setVisibility(
 			if (state.manga.isNsfw) {
-				NotificationCompat.VISIBILITY_PRIVATE
+				groupBuilder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
-			} else {
-				NotificationCompat.VISIBILITY_PUBLIC
 			}
-		)
+			val summary = when (state) {
-		when (state) {
+				is DownloadState.Cancelled -> {
-			is DownloadState.Cancelled -> {
+					progress++
-				builder.setProgress(1, 0, true)
+					context.getString(R.string.cancelling_)
-				builder.setContentText(context.getString(R.string.cancelling_))
+				}
-				builder.setContentIntent(null)
+				is DownloadState.Done -> {
-				builder.setStyle(null)
+					progress++
-				builder.setOngoing(true)
+					context.getString(R.string.download_complete)
-			}
+				}
-			is DownloadState.Done -> {
+				is DownloadState.Error -> {
-				builder.setProgress(0, 0, false)
+					isAllDone = false
-				builder.setContentText(context.getString(R.string.download_complete))
+					context.getString(R.string.error)
-				builder.setContentIntent(createMangaIntent(context, state.localManga))
+				}
-				builder.setAutoCancel(true)
+				is DownloadState.PostProcessing -> {
-				builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
+					progress++
-				builder.setCategory(null)
+					isInProgress = true
-				builder.setStyle(null)
+					isAllDone = false
-				builder.setOngoing(false)
+					context.getString(R.string.processing_)
-			}
+				}
-			is DownloadState.Error -> {
+				is DownloadState.Preparing -> {
-				val message = state.error.getDisplayMessage(context.resources)
+					isAllDone = false
-				builder.setProgress(0, 0, false)
+					isInProgress = true
-				builder.setSmallIcon(android.R.drawable.stat_notify_error)
+					context.getString(R.string.preparing_)
-				builder.setSubText(context.getString(R.string.error))
+				}
-				builder.setContentText(message)
+				is DownloadState.Progress -> {
-				builder.setAutoCancel(!state.canRetry)
+					isAllDone = false
-				builder.setOngoing(state.canRetry)
+					isInProgress = true
-				builder.setCategory(NotificationCompat.CATEGORY_ERROR)
+					progress += state.percent
-				builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
+					context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
-				if (state.canRetry) {
+				}
-					builder.addAction(cancelAction)
+				is DownloadState.Queued -> {
-					builder.addAction(retryAction)
+					isAllDone = false
+					isInProgress = true
+					context.getString(R.string.queued)
 				}
 			}
-			is DownloadState.PostProcessing -> {
+			style.addLine(
-				builder.setProgress(1, 0, true)
+				context.getString(
-				builder.setContentText(context.getString(R.string.processing_))
+					R.string.download_summary_pattern,
-				builder.setStyle(null)
+					state.manga.title.ellipsize(16).htmlEncode(),
-				builder.setOngoing(true)
+					summary.htmlEncode(),
-			}
+				).parseAsHtml(HtmlCompat.FROM_HTML_MODE_LEGACY),
-			is DownloadState.Queued -> {
+			)
-				builder.setProgress(0, 0, false)
-				builder.setContentText(context.getString(R.string.queued))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.Preparing -> {
-				builder.setProgress(1, 0, true)
-				builder.setContentText(context.getString(R.string.preparing_))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.Progress -> {
-				builder.setProgress(state.max, state.progress, false)
-				if (timeLeft > 0L) {
-					val eta = DateUtils.getRelativeTimeSpanString(timeLeft, 0L, DateUtils.SECOND_IN_MILLIS)
-					builder.setContentText(eta)
-				} else {
-					val percent = (state.percent * 100).format()
-					builder.setContentText(context.getString(R.string.percent_string_pattern, percent))
-				}
-				builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
-			is DownloadState.WaitingForNetwork -> {
-				builder.setProgress(0, 0, false)
-				builder.setContentText(context.getString(R.string.waiting_for_network))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
 		}
-		return builder.build()
+		progress = if (isInProgress) {
+			progress / states.size.toFloat()
+		} else {
+			1f
+		}
+		style.setBigContentTitle(
+			context.getString(if (isAllDone) R.string.download_complete else R.string.downloading_manga),
+		)
+		groupBuilder.setContentText(context.resources.getQuantityString(R.plurals.items, states.size, states.size()))
+		groupBuilder.setNumber(states.size)
+		groupBuilder.setSmallIcon(
+			if (isInProgress) android.R.drawable.stat_sys_download else android.R.drawable.stat_sys_download_done,
+		)
+		groupBuilder.setAutoCancel(isAllDone)
+		when (progress) {
+			1f -> groupBuilder.setProgress(0, 0, false)
+			0f -> groupBuilder.setProgress(1, 0, true)
+			else -> groupBuilder.setProgress(100, (progress * 100f).toInt(), false)
+		}
+		return groupBuilder.build()
+	}
+
+	fun detach() {
+		if (states.isNotEmpty()) {
+			val notification = buildGroupNotification()
+			manager.notify(ID_GROUP_DETACHED, notification)
+		}
+		manager.cancel(ID_GROUP)
+	}
+
+	fun newItem(startId: Int) = Item(startId)
+
+	inner class Item(
+		private val startId: Int,
+	) {
+
+		private val builder = NotificationCompat.Builder(context, CHANNEL_ID)
+		private val cancelAction = NotificationCompat.Action(
+			materialR.drawable.material_ic_clear_black_24dp,
+			context.getString(android.R.string.cancel),
+			PendingIntent.getBroadcast(
+				context,
+				startId * 2,
+				DownloadService.getCancelIntent(startId),
+				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+			),
+		)
+		private val retryAction = NotificationCompat.Action(
+			R.drawable.ic_restart_black,
+			context.getString(R.string.try_again),
+			PendingIntent.getBroadcast(
+				context,
+				startId * 2 + 1,
+				DownloadService.getResumeIntent(startId),
+				PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+			),
+		)
+
+		init {
+			builder.setOnlyAlertOnce(true)
+			builder.setDefaults(0)
+			builder.color = ContextCompat.getColor(context, R.color.blue_primary)
+			builder.foregroundServiceBehavior = NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
+			builder.setSilent(true)
+			builder.setGroup(GROUP_ID)
+			builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
+		}
+
+		fun notify(state: DownloadState, timeLeft: Long) {
+			builder.setContentTitle(state.manga.title)
+			builder.setContentText(context.getString(R.string.manga_downloading_))
+			builder.setProgress(1, 0, true)
+			builder.setSmallIcon(android.R.drawable.stat_sys_download)
+			builder.setContentIntent(listIntent)
+			builder.setStyle(null)
+			builder.setLargeIcon(state.cover?.toBitmap())
+			builder.clearActions()
+			builder.setSubText(null)
+			builder.setShowWhen(false)
+			builder.setVisibility(
+				if (state.manga.isNsfw) {
+					NotificationCompat.VISIBILITY_PRIVATE
+				} else {
+					NotificationCompat.VISIBILITY_PUBLIC
+				},
+			)
+			when (state) {
+				is DownloadState.Cancelled -> {
+					builder.setProgress(1, 0, true)
+					builder.setContentText(context.getString(R.string.cancelling_))
+					builder.setContentIntent(null)
+					builder.setStyle(null)
+					builder.setOngoing(true)
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+				is DownloadState.Done -> {
+					builder.setProgress(0, 0, false)
+					builder.setContentText(context.getString(R.string.download_complete))
+					builder.setContentIntent(createMangaIntent(context, state.localManga))
+					builder.setAutoCancel(true)
+					builder.setSmallIcon(android.R.drawable.stat_sys_download_done)
+					builder.setCategory(null)
+					builder.setStyle(null)
+					builder.setOngoing(false)
+					builder.setShowWhen(true)
+					builder.setWhen(System.currentTimeMillis())
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+				is DownloadState.Error -> {
+					val message = state.error.getDisplayMessage(context.resources)
+					builder.setProgress(0, 0, false)
+					builder.setSmallIcon(android.R.drawable.stat_notify_error)
+					builder.setSubText(context.getString(R.string.error))
+					builder.setContentText(message)
+					builder.setAutoCancel(!state.canRetry)
+					builder.setOngoing(state.canRetry)
+					builder.setCategory(NotificationCompat.CATEGORY_ERROR)
+					builder.setShowWhen(true)
+					builder.setWhen(System.currentTimeMillis())
+					builder.setStyle(NotificationCompat.BigTextStyle().bigText(message))
+					if (state.canRetry) {
+						builder.addAction(cancelAction)
+						builder.addAction(retryAction)
+					}
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+				is DownloadState.PostProcessing -> {
+					builder.setProgress(1, 0, true)
+					builder.setContentText(context.getString(R.string.processing_))
+					builder.setStyle(null)
+					builder.setOngoing(true)
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+				is DownloadState.Queued -> {
+					builder.setProgress(0, 0, false)
+					builder.setContentText(context.getString(R.string.queued))
+					builder.setStyle(null)
+					builder.setOngoing(true)
+					builder.addAction(cancelAction)
+					builder.priority = NotificationCompat.PRIORITY_LOW
+				}
+				is DownloadState.Preparing -> {
+					builder.setProgress(1, 0, true)
+					builder.setContentText(context.getString(R.string.preparing_))
+					builder.setStyle(null)
+					builder.setOngoing(true)
+					builder.addAction(cancelAction)
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+				is DownloadState.Progress -> {
+					builder.setProgress(state.max, state.progress, false)
+					val percent = context.getString(R.string.percent_string_pattern, (state.percent * 100).format())
+					if (timeLeft > 0L) {
+						val eta = DateUtils.getRelativeTimeSpanString(timeLeft, 0L, DateUtils.SECOND_IN_MILLIS)
+						builder.setContentText(eta)
+						builder.setSubText(percent)
+					} else {
+						builder.setContentText(percent)
+					}
+					builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
+					builder.setStyle(null)
+					builder.setOngoing(true)
+					builder.addAction(cancelAction)
+					builder.priority = NotificationCompat.PRIORITY_DEFAULT
+				}
+			}
+			val notification = builder.build()
+			states.append(startId, state)
+			updateGroupNotification()
+			manager.notify(TAG, startId, notification)
+		}
+
+		fun dismiss() {
+			manager.cancel(TAG, startId)
+			states.remove(startId)
+			updateGroupNotification()
+		}
+	}
+
+	private fun updateGroupNotification() {
+		val notification = buildGroupNotification()
+		manager.notify(ID_GROUP, notification)
 	}
 
 	private fun createMangaIntent(context: Context, manga: Manga) = PendingIntent.getActivity(
 		context,
 		manga.hashCode(),
 		DetailsActivity.newIntent(context, manga),
-		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+		PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
 	companion object {
 
+		private const val TAG = "download"
 		private const val CHANNEL_ID = "download"
+		private const val GROUP_ID = "downloads"
 		private const val REQUEST_LIST = 6
+		const val ID_GROUP = 9999
+		private const val ID_GROUP_DETACHED = 9998
 
 		fun createChannel(context: Context) {
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -172,7 +316,7 @@ class DownloadNotification(private val context: Context, startId: Int) {
 					val channel = NotificationChannel(
 						CHANNEL_ID,
 						context.getString(R.string.downloads),
-						NotificationManager.IMPORTANCE_LOW
+						NotificationManager.IMPORTANCE_LOW,
 					)
 					channel.enableVibration(false)
 					channel.enableLights(false)

app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt

@@ -8,13 +8,16 @@ import android.os.Binder
 import android.os.IBinder
 import android.os.PowerManager
 import android.widget.Toast
+import androidx.annotation.MainThread
+import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
 import org.koin.android.ext.android.get
 import org.koin.core.context.GlobalContext
 import org.koitharu.kotatsu.BuildConfig
@@ -25,7 +28,6 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.download.domain.WakeLockNode
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.connectivityManager
 import org.koitharu.kotatsu.utils.ext.throttle
@@ -36,23 +38,23 @@ import org.koitharu.kotatsu.utils.progress.TimeLeftEstimator
 class DownloadService : BaseService() {
 
 	private lateinit var downloadManager: DownloadManager
-	private lateinit var notificationSwitcher: ForegroundNotificationSwitcher
+	private lateinit var downloadNotification: DownloadNotification
+	private lateinit var wakeLock: PowerManager.WakeLock
 
 	private val jobs = LinkedHashMap<Int, PausingProgressJob<DownloadState>>()
 	private val jobCount = MutableStateFlow(0)
 	private val controlReceiver = ControlReceiver()
-	private var binder: DownloadBinder? = null
 
 	override fun onCreate() {
 		super.onCreate()
 		isRunning = true
-		notificationSwitcher = ForegroundNotificationSwitcher(this)
+		downloadNotification = DownloadNotification(this)
-		val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
+		wakeLock = (applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
 			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-		downloadManager = get<DownloadManager.Factory>().create(
+		wakeLock.acquire(TimeUnit.HOURS.toMillis(8))
-			coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1))
+		downloadManager = get<DownloadManager.Factory>().create(lifecycleScope)
-		)
 		DownloadNotification.createChannel(this)
+		startForeground(DownloadNotification.ID_GROUP, downloadNotification.buildGroupNotification())
 		val intentFilter = IntentFilter()
 		intentFilter.addAction(ACTION_DOWNLOAD_CANCEL)
 		intentFilter.addAction(ACTION_DOWNLOAD_RESUME)
@@ -68,24 +70,19 @@ class DownloadService : BaseService() {
 			jobCount.value = jobs.size
 			START_REDELIVER_INTENT
 		} else {
-			stopSelf(startId)
+			stopSelfIfIdle()
 			START_NOT_STICKY
 		}
 	}
 
 	override fun onBind(intent: Intent): IBinder {
 		super.onBind(intent)
-		return binder ?: DownloadBinder(this).also { binder = it }
+		return DownloadBinder(this)
-	}
-
-	override fun onUnbind(intent: Intent?): Boolean {
-		binder = null
-		return super.onUnbind(intent)
 	}
 
 	override fun onDestroy() {
 		unregisterReceiver(controlReceiver)
-		binder = null
+		wakeLock.release()
 		isRunning = false
 		super.onDestroy()
 	}
@@ -103,10 +100,10 @@ class DownloadService : BaseService() {
 	private fun listenJob(job: ProgressJob<DownloadState>) {
 		lifecycleScope.launch {
 			val startId = job.progressValue.startId
-			val notification = DownloadNotification(this@DownloadService, startId)
+			val notificationItem = downloadNotification.newItem(startId)
 			try {
 				val timeLeftEstimator = TimeLeftEstimator()
-				notificationSwitcher.notify(startId, notification.create(job.progressValue, -1L))
+				notificationItem.notify(job.progressValue, -1L)
 				job.progressAsFlow()
 					.onEach { state ->
 						if (state is DownloadState.Progress) {
@@ -119,26 +116,27 @@ class DownloadService : BaseService() {
 					.whileActive()
 					.collect { state ->
 						val timeLeft = timeLeftEstimator.getEstimatedTimeLeft()
-						notificationSwitcher.notify(startId, notification.create(state, timeLeft))
+						notificationItem.notify(state, timeLeft)
 					}
 				job.join()
 			} finally {
 				(job.progressValue as? DownloadState.Done)?.let {
 					sendBroadcast(
 						Intent(ACTION_DOWNLOAD_COMPLETE)
-							.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
+							.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false)),
 					)
 				}
-				notificationSwitcher.detach(
+				if (job.isCancelled) {
-					startId,
+					notificationItem.dismiss()
-					if (job.isCancelled) {
+					if (jobs.remove(startId) != null) {
-						null
+						jobCount.value = jobs.size
-					} else {
-						notification.create(job.progressValue, -1L)
 					}
-				)
+				} else {
-				stopSelf(startId)
+					notificationItem.notify(job.progressValue, -1L)
+				}
 			}
+		}.invokeOnCompletion {
+			stopSelfIfIdle()
 		}
 	}
 
@@ -150,14 +148,25 @@ class DownloadService : BaseService() {
 	private val DownloadState.isTerminal: Boolean
 		get() = this is DownloadState.Done || this is DownloadState.Cancelled || (this is DownloadState.Error && !canRetry)
 
+	@MainThread
+	private fun stopSelfIfIdle() {
+		if (jobs.any { (_, job) -> job.isActive }) {
+			return
+		}
+		downloadNotification.detach()
+		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+		stopSelf()
+	}
+
 	inner class ControlReceiver : BroadcastReceiver() {
 
 		override fun onReceive(context: Context, intent: Intent?) {
 			when (intent?.action) {
 				ACTION_DOWNLOAD_CANCEL -> {
 					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
-					jobs.remove(cancelId)?.cancel()
+					jobs[cancelId]?.cancel()
-					jobCount.value = jobs.size
+					// jobs.remove(cancelId)?.cancel()
+					// jobCount.value = jobs.size
 				}
 				ACTION_DOWNLOAD_RESUME -> {
 					val cancelId = intent.getIntExtra(EXTRA_CANCEL_ID, 0)
@@ -167,10 +176,25 @@ class DownloadService : BaseService() {
 		}
 	}
 
-	class DownloadBinder(private val service: DownloadService) : Binder() {
+	class DownloadBinder(service: DownloadService) : Binder(), DefaultLifecycleObserver {
 
-		val downloads: Flow<Collection<ProgressJob<DownloadState>>>
+		private var downloadsStateFlow = MutableStateFlow<List<PausingProgressJob<DownloadState>>>(emptyList())
-			get() = service.jobCount.mapLatest { service.jobs.values }
+
+		init {
+			service.lifecycle.addObserver(this)
+			service.jobCount.onEach {
+				downloadsStateFlow.value = service.jobs.values.toList()
+			}.launchIn(service.lifecycleScope)
+		}
+
+		override fun onDestroy(owner: LifecycleOwner) {
+			owner.lifecycle.removeObserver(this)
+			downloadsStateFlow.value = emptyList()
+			super.onDestroy(owner)
+		}
+
+		val downloads
+			get() = downloadsStateFlow.asStateFlow()
 	}
 
 	companion object {

app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt

@@ -1,62 +0,0 @@
-package org.koitharu.kotatsu.download.ui.service
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.Service
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.util.SparseArray
-import androidx.core.app.ServiceCompat
-import androidx.core.util.isEmpty
-import androidx.core.util.size
-
-private const val DEFAULT_DELAY = 500L
-
-class ForegroundNotificationSwitcher(
-	private val service: Service,
-) {
-
-	private val notificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-	private val notifications = SparseArray<Notification>()
-	private val handler = Handler(Looper.getMainLooper())
-
-	@Synchronized
-	fun notify(startId: Int, notification: Notification) {
-		if (notifications.isEmpty()) {
-			service.startForeground(startId, notification)
-		} else {
-			notificationManager.notify(startId, notification)
-		}
-		notifications[startId] = notification
-	}
-
-	@Synchronized
-	fun detach(startId: Int, notification: Notification?) {
-		notifications.remove(startId)
-		if (notifications.isEmpty()) {
-			ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_DETACH)
-		}
-		val nextIndex = notifications.size - 1
-		if (nextIndex >= 0) {
-			val nextStartId = notifications.keyAt(nextIndex)
-			val nextNotification = notifications.valueAt(nextIndex)
-			service.startForeground(nextStartId, nextNotification)
-		}
-		handler.postDelayed(NotifyRunnable(startId, notification), DEFAULT_DELAY)
-	}
-
-	private inner class NotifyRunnable(
-		private val startId: Int,
-		private val notification: Notification?,
-	) : Runnable {
-
-		override fun run() {
-			if (notification != null) {
-				notificationManager.notify(startId, notification)
-			} else {
-				notificationManager.cancel(startId)
-			}
-		}
-	}
-}

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

@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class FavouritesListViewModel(
 	private val categoryId: Long,
@@ -45,7 +46,7 @@ class FavouritesListViewModel(
 		} else {
 			repository.observeAll(categoryId)
 		},
-		createListModeFlow()
+		createListModeFlow(),
 	) { list, mode ->
 		when {
 			list.isEmpty() -> listOf(
@@ -58,8 +59,9 @@ class FavouritesListViewModel(
 						R.string.favourites_category_empty
 					},
 					actionStringRes = 0,
-				)
+				),
 			)
+
 			else -> list.toUi(mode, this)
 		}
 	}.catch {

app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListMenuProvider.kt

@@ -5,9 +5,9 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
+import com.google.android.material.R as materialR
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
-import com.google.android.material.R as materialR
 
 class HistoryListMenuProvider(
 	private val context: Context,
@@ -38,6 +38,6 @@ class HistoryListMenuProvider(
 	}
 
 	override fun onPrepareMenu(menu: Menu) {
-		menu.findItem(R.id.action_history_grouping).isChecked = viewModel.isGroupingEnabled.value == true
+		menu.findItem(R.id.action_history_grouping)?.isChecked = viewModel.isGroupingEnabled.value == true
 	}
 }

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt

@@ -1,13 +1,16 @@
 @file:SuppressLint("UnsafeOptInUsageError")
+
 package org.koitharu.kotatsu.list.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.View
+import androidx.annotation.CheckResult
 import androidx.core.view.doOnNextLayout
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.badge.BadgeUtils
 import org.koitharu.kotatsu.R
 
+@CheckResult
 fun View.bindBadge(badge: BadgeDrawable?, counter: Int): BadgeDrawable? {
 	return if (counter > 0) {
 		val badgeDrawable = badge ?: initBadge(this)

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/EmptyStateListAD.kt

@@ -1,23 +1,31 @@
 package org.koitharu.kotatsu.list.ui.adapter
 
+import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
 import org.koitharu.kotatsu.list.ui.model.EmptyState
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.utils.ext.disposeImageRequest
+import org.koitharu.kotatsu.utils.ext.enqueueWith
+import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.setTextAndVisible
 
 fun emptyStateListAD(
+	coil: ImageLoader,
 	listener: MangaListListener,
 ) = adapterDelegateViewBinding<EmptyState, ListModel, ItemEmptyStateBinding>(
-	{ inflater, parent -> ItemEmptyStateBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemEmptyStateBinding.inflate(inflater, parent, false) },
 ) {
-
 	binding.buttonRetry.setOnClickListener { listener.onEmptyActionClick() }
 
 	bind {
-		binding.icon.setImageResource(item.icon)
+		binding.icon.newImageRequest(item.icon)?.enqueueWith(coil)
 		binding.textPrimary.setText(item.textPrimary)
 		binding.textSecondary.setTextAndVisible(item.textSecondary)
 		binding.buttonRetry.setTextAndVisible(item.actionStringRes)
 	}
+
+	onViewRecycled {
+		binding.icon.disposeImageRequest()
+	}
 }

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.utils.ext.disposeImageRequest
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun mangaGridItemAD(
 	coil: ImageLoader,
@@ -24,9 +25,8 @@ fun mangaGridItemAD(
 	clickListener: OnListItemClickListener<Manga>,
 	sizeResolver: ItemSizeResolver?,
 ) = adapterDelegateViewBinding<MangaGridModel, ListModel, ItemMangaGridBinding>(
-	{ inflater, parent -> ItemMangaGridBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemMangaGridBinding.inflate(inflater, parent, false) },
 ) {
-
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -46,6 +46,7 @@ fun mangaGridItemAD(
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
 		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
 			referer(item.manga.publicUrl)
+			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_placeholder)

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListAdapter.kt

@@ -4,9 +4,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.core.ui.DateTimeAgo
 import org.koitharu.kotatsu.list.ui.model.*
-import kotlin.jvm.internal.Intrinsics
 
 class MangaListAdapter(
 	coil: ImageLoader,
@@ -24,7 +24,7 @@ class MangaListAdapter(
 			.addDelegate(ITEM_TYPE_DATE, relatedDateItemAD())
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
 			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
-			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(listener))
+			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, listener))
 			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD())
 			.addDelegate(ITEM_TYPE_FILTER, currentFilterAD(listener))
 			.addDelegate(ITEM_TYPE_HEADER_FILTER, listHeaderWithFilterAD(listener))

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import org.koitharu.kotatsu.utils.ext.*
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -12,15 +11,16 @@ import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListDetailedModel
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.image.CoverSizeResolver
 
 fun mangaListDetailedItemAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Manga>,
 ) = adapterDelegateViewBinding<MangaListDetailedModel, ListModel, ItemMangaListDetailsBinding>(
-	{ inflater, parent -> ItemMangaListDetailsBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemMangaListDetailsBinding.inflate(inflater, parent, false) },
 ) {
-
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -36,6 +36,7 @@ fun mangaListDetailedItemAD(
 		binding.progressView.setPercent(item.progress, MangaListAdapter.PAYLOAD_PROGRESS in payloads)
 		binding.imageViewCover.newImageRequest(item.coverUrl)?.run {
 			referer(item.manga.publicUrl)
+			size(CoverSizeResolver(binding.imageViewCover))
 			placeholder(R.drawable.ic_placeholder)
 			fallback(R.drawable.ic_placeholder)
 			error(R.drawable.ic_placeholder)
@@ -45,7 +46,7 @@ fun mangaListDetailedItemAD(
 		}
 		binding.textViewRating.textAndVisible = item.rating
 		binding.textViewTags.text = item.tags
-		itemView.bindBadge(badge, item.counter)
+		badge = itemView.bindBadge(badge, item.counter)
 	}
 
 	onViewRecycled {

app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt

@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.list.ui.adapter
 
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
-import org.koitharu.kotatsu.utils.ext.*
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
@@ -11,15 +10,15 @@ import org.koitharu.kotatsu.databinding.ItemMangaListBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.MangaListModel
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.utils.ext.*
 
 fun mangaListItemAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Manga>,
 ) = adapterDelegateViewBinding<MangaListModel, ListModel, ItemMangaListBinding>(
-	{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) }
+	{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) },
 ) {
-
 	var badge: BadgeDrawable? = null
 
 	itemView.setOnClickListener {
@@ -41,7 +40,7 @@ fun mangaListItemAD(
 			lifecycle(lifecycleOwner)
 			enqueueWith(coil)
 		}
-		itemView.bindBadge(badge, item.counter)
+		badge = itemView.bindBadge(badge, item.counter)
 	}
 
 	onViewRecycled {

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

@@ -6,15 +6,22 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.update
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import java.text.Collator
-import java.util.*
+import java.util.Locale
+import java.util.TreeSet
 
 class FilterCoordinator(
 	private val repository: RemoteMangaRepository,
@@ -152,7 +159,7 @@ class FilterCoordinator(
 	}
 
 	private fun loadTagsAsync() = coroutineScope.async(Dispatchers.Default, CoroutineStart.LAZY) {
-		runCatching {
+		runCatchingCancellable {
 			repository.getTags()
 		}.onFailure { error ->
 			error.printStackTraceDebug()
@@ -203,4 +210,4 @@ class FilterCoordinator(
 			return collator?.compare(t1, t2) ?: compareValues(t1, t2)
 		}
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt

@@ -1,6 +1,8 @@
 package org.koitharu.kotatsu.local.domain
 
 import androidx.annotation.WorkerThread
+import java.io.File
+import java.util.zip.ZipFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.Closeable
@@ -11,8 +13,6 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.readText
-import java.io.File
-import java.util.zip.ZipFile
 
 class CbzMangaOutput(
 	val file: File,
@@ -62,7 +62,7 @@ class CbzMangaOutput(
 		index.addChapter(chapter)
 	}
 
-	suspend fun finalize() {
+	suspend fun finish() {
 		runInterruptible(Dispatchers.IO) {
 			output.put(ENTRY_NAME_INDEX, index.toString())
 			output.finish()
@@ -89,7 +89,7 @@ class CbzMangaOutput(
 					otherIndex = MangaIndex(
 						zip.getInputStream(entry).use {
 							it.reader().readText()
-						}
+						},
 					)
 				} else {
 					output.copyEntryFrom(zip, entry)

app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt

@@ -8,19 +8,31 @@ import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import java.io.File
-import java.io.IOException
+import java.util.Enumeration
-import java.util.*
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
 import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.withContext
+import okio.IOException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.data.MangaIndex
 import org.koitharu.kotatsu.local.data.TempFileFilter
-import org.koitharu.kotatsu.parsers.model.*
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.toCamelCase
 import org.koitharu.kotatsu.utils.AlphanumComparator
 import org.koitharu.kotatsu.utils.CompositeMutex
@@ -28,6 +40,7 @@ import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.longHashCode
 import org.koitharu.kotatsu.utils.ext.readText
 import org.koitharu.kotatsu.utils.ext.resolveName
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 private const val MAX_PARALLELISM = 4
 
@@ -48,6 +61,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 					x.altTitle?.contains(query, ignoreCase = true) == true
 			}
 		}
+		list.sortWith(compareBy(AlphanumComparator()) { x -> x.title })
 		return list
 	}
 
@@ -61,6 +75,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 				x.tags.containsAll(tags)
 			}
 		}
+		list.sortWith(compareBy(AlphanumComparator()) { x -> x.title })
 		return list
 	}
 
@@ -68,6 +83,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)) {
 			"Manga is not local or saved"
 		}
+
 		else -> getFromFile(Uri.parse(manga.url).toFile())
 	}
 
@@ -86,7 +102,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 				entries.filter { x ->
 					!x.isDirectory && x.name.substringBeforeLast(
 						File.separatorChar,
-						""
+						"",
 					) == parent
 				}
 			}
@@ -138,11 +154,11 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 				url = fileUri,
 				coverUrl = zipUri(
 					file,
-					entryName = index.getCoverEntry() ?: findFirstImageEntry(zip.entries())?.name.orEmpty()
+					entryName = index.getCoverEntry() ?: findFirstImageEntry(zip.entries())?.name.orEmpty(),
 				),
 				chapters = info.chapters?.map { c ->
 					c.copy(url = fileUri, source = MangaSource.LOCAL)
-				}
+				},
 			)
 		}
 		// fallback
@@ -211,7 +227,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 					return@runInterruptible info.copy2(
 						source = MangaSource.LOCAL,
 						url = fileUri,
-						chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
+						chapters = info.chapters?.map { c -> c.copy(url = fileUri) },
 					)
 				}
 			}
@@ -224,7 +240,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		context: CoroutineContext,
 	): Deferred<Manga?> = async(context) {
 		runInterruptible {
-			runCatching { getFromFile(file) }.getOrNull()
+			runCatchingCancellable { getFromFile(file) }.getOrNull()
 		}
 	}
 
@@ -288,7 +304,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		locks.lock(id)
 	}
 
-	suspend fun unlockManga(id: Long) {
+	fun unlockManga(id: Long) {
 		locks.unlock(id)
 	}
 

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.local.ui
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -10,6 +11,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okio.IOException
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.download.ui.service.DownloadService
@@ -21,8 +23,8 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.progress.Progress
-import java.io.IOException
 
 class LocalListViewModel(
 	private val repository: LocalMangaRepository,
@@ -40,7 +42,7 @@ class LocalListViewModel(
 	override val content = combine(
 		mangaList,
 		createListModeFlow(),
-		listError
+		listError,
 	) { list, mode, error ->
 		when {
 			error != null -> listOf(error.toErrorState(canRetry = true))
@@ -51,8 +53,9 @@ class LocalListViewModel(
 					textPrimary = R.string.text_local_holder_primary,
 					textSecondary = R.string.text_local_holder_secondary,
 					actionStringRes = R.string._import,
-				)
+				),
 			)
+
 			else -> ArrayList<ListModel>(list.size + 1).apply {
 				add(headerModel)
 				list.toUi(this, mode)
@@ -60,7 +63,7 @@ class LocalListViewModel(
 		}
 	}.asLiveDataDistinct(
 		viewModelScope.coroutineContext + Dispatchers.Default,
-		listOf(LoadingState)
+		listOf(LoadingState),
 	)
 
 	init {
@@ -97,7 +100,7 @@ class LocalListViewModel(
 				for (manga in itemsToRemove) {
 					val original = repository.getRemoteManga(manga)
 					repository.delete(manga) || throw IOException("Unable to delete file")
-					runCatching {
+					runCatchingCancellable {
 						historyRepository.deleteOrSwap(manga, original)
 					}
 					mangaList.update { list ->
@@ -113,6 +116,8 @@ class LocalListViewModel(
 		try {
 			listError.value = null
 			mangaList.value = repository.getList(0, null, null)
+		} catch (e: CancellationException) {
+			throw e
 		} catch (e: Throwable) {
 			listError.value = e
 		}
@@ -121,7 +126,7 @@ class LocalListViewModel(
 	private fun cleanup() {
 		if (!DownloadService.isRunning) {
 			viewModelScope.launch {
-				runCatching {
+				runCatchingCancellable {
 					repository.cleanup()
 				}.onFailure { error ->
 					error.printStackTraceDebug()

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

@@ -12,19 +12,24 @@ import androidx.appcompat.view.ActionMode
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
 import androidx.transition.TransitionManager
+import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -59,7 +64,6 @@ import org.koitharu.kotatsu.tracker.ui.FeedFragment
 import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.VoiceInputContract
 import org.koitharu.kotatsu.utils.ext.*
-import com.google.android.material.R as materialR
 
 private const val TAG_PRIMARY = "primary"
 private const val TAG_SEARCH = "search"
@@ -94,10 +98,10 @@ class MainActivity :
 				it,
 				binding.toolbar,
 				R.string.open_menu,
-				R.string.close_menu
+				R.string.close_menu,
 			).apply {
 				setHomeAsUpIndicator(
-					ContextCompat.getDrawable(this@MainActivity, materialR.drawable.abc_ic_ab_back_material)
+					ContextCompat.getDrawable(this@MainActivity, materialR.drawable.abc_ic_ab_back_material),
 				)
 				setToolbarNavigationClickListener {
 					binding.searchView.hideKeyboard()
@@ -429,7 +433,12 @@ class MainActivity :
 	}
 
 	private fun onFirstStart() {
-		lifecycleScope.launchWhenResumed {
+		lifecycleScope.launch(Dispatchers.Main) { // not a default `Main.immediate` dispatcher
+			val settings = get<AppSettings>()
+			when {
+				!settings.isSourcesSelected -> OnboardDialogFragment.showWelcome(supportFragmentManager)
+				settings.newSources.isNotEmpty() -> NewSourcesDialogFragment.show(supportFragmentManager)
+			}
 			val isUpdateSupported = withContext(Dispatchers.Default) {
 				TrackWorker.setup(applicationContext)
 				SuggestionsWorker.setup(applicationContext)
@@ -438,11 +447,6 @@ class MainActivity :
 			if (isUpdateSupported) {
 				AppUpdateChecker(this@MainActivity).checkIfNeeded()
 			}
-			val settings = get<AppSettings>()
-			when {
-				!settings.isSourcesSelected -> OnboardDialogFragment.showWelcome(supportFragmentManager)
-				settings.newSources.isNotEmpty() -> NewSourcesDialogFragment.show(supportFragmentManager)
-			}
 		}
 	}
 
@@ -469,7 +473,7 @@ class MainActivity :
 		val drawer = drawer ?: return
 		val isLocked = actionModeDelegate.isActionModeStarted || isSearchOpened
 		drawer.setDrawerLockMode(
-			if (isLocked) DrawerLayout.LOCK_MODE_LOCKED_CLOSED else DrawerLayout.LOCK_MODE_UNLOCKED
+			if (isLocked) DrawerLayout.LOCK_MODE_LOCKED_CLOSED else DrawerLayout.LOCK_MODE_UNLOCKED,
 		)
 		drawerToggle?.isDrawerIndicatorEnabled = !isLocked
 	}

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.content.Intent
 import android.os.Bundle
+import org.acra.dialog.CrashReportDialog
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
 class AppProtectHelper(private val settings: AppSettings) : Application.ActivityLifecycleCallbacks {
@@ -11,7 +12,7 @@ class AppProtectHelper(private val settings: AppSettings) : Application.Activity
 	private var isUnlocked = settings.appPassword.isNullOrEmpty()
 
 	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-		if (activity !is ProtectActivity && !isUnlocked) {
+		if (!isUnlocked && activity !is ProtectActivity && activity !is CrashReportDialog) {
 			val sourceIntent = Intent(activity, activity.javaClass)
 			activity.intent?.let {
 				sourceIntent.putExtras(it)

app/src/main/java/org/koitharu/kotatsu/main/ui/protect/ProtectActivity.kt

@@ -46,7 +46,10 @@ class ProtectActivity :
 			startActivity(intent)
 			finishAfterTransition()
 		}
+	}
 
+	override fun onStart() {
+		super.onStart()
 		if (!useFingerprint()) {
 			binding.editPassword.requestFocus()
 		}

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

@@ -6,9 +6,22 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.collection.LongSparseArray
 import androidx.collection.set
-import kotlinx.coroutines.*
+import java.io.File
+import java.util.LinkedList
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.zip.ZipFile
+import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.OkHttpClient
@@ -26,18 +39,15 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.connectivityManager
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.progress.ProgressDeferred
-import java.io.File
-import java.util.*
-import java.util.concurrent.atomic.AtomicInteger
-import java.util.zip.ZipFile
 
 private const val PROGRESS_UNDEFINED = -1f
 private const val PREFETCH_LIMIT_DEFAULT = 10
 
 class PageLoader : KoinComponent, Closeable {
 
-	val loaderScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+	val loaderScope = CoroutineScope(SupervisorJob() + InternalErrorHandler() + Dispatchers.Default)
 
 	private val okHttp = get<OkHttpClient>()
 	private val cache = get<PagesCache>()
@@ -194,4 +204,13 @@ class PageLoader : KoinComponent, Closeable {
 		val deferred = CompletableDeferred(file)
 		return ProgressDeferred(deferred, emptyProgressFlow)
 	}
+
+	private class InternalErrorHandler :
+		AbstractCoroutineContextElement(CoroutineExceptionHandler),
+		CoroutineExceptionHandler {
+
+		override fun handleException(context: CoroutineContext, exception: Throwable) {
+			exception.printStackTraceDebug()
+		}
+	}
 }

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

@@ -19,6 +19,7 @@ import androidx.transition.TransitionManager
 import androidx.transition.TransitionSet
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -47,7 +48,6 @@ import org.koitharu.kotatsu.utils.GridTouchHelper
 import org.koitharu.kotatsu.utils.ScreenOrientationHelper
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.*
-import java.util.concurrent.TimeUnit
 
 class ReaderActivity :
 	BaseFullscreenActivity<ActivityReaderBinding>(),
@@ -67,6 +67,9 @@ class ReaderActivity :
 		)
 	}
 
+	override val readerMode: ReaderMode?
+		get() = readerManager.currentMode
+
 	private lateinit var touchHelper: GridTouchHelper
 	private lateinit var orientationHelper: ScreenOrientationHelper
 	private lateinit var controlDelegate: ReaderControlDelegate
@@ -82,7 +85,7 @@ class ReaderActivity :
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		touchHelper = GridTouchHelper(this, this)
 		orientationHelper = ScreenOrientationHelper(this)
-		controlDelegate = ReaderControlDelegate(lifecycleScope, get(), this)
+		controlDelegate = ReaderControlDelegate(get(), this, this)
 		binding.toolbarBottom.inflateMenu(R.menu.opt_reader_bottom)
 		binding.toolbarBottom.setOnMenuItemClickListener(::onOptionsItemSelected)
 		insetsDelegate.interceptingWindowInsetsListener = this
@@ -146,7 +149,7 @@ class ReaderActivity :
 				ChaptersBottomSheet.show(
 					supportFragmentManager,
 					viewModel.manga?.chapters.orEmpty(),
-					viewModel.getCurrentState()?.chapterId ?: 0L
+					viewModel.getCurrentState()?.chapterId ?: 0L,
 				)
 			}
 			R.id.action_screen_rotate -> {
@@ -210,7 +213,7 @@ class ReaderActivity :
 		val resolveTextId = ExceptionResolver.getResolveStringId(e)
 		if (resolveTextId != 0) {
 			dialog.setPositiveButton(resolveTextId, listener)
-		} else {
+		} else if (e.isReportable()) {
 			dialog.setPositiveButton(R.string.report, listener)
 		}
 		dialog.show()
@@ -317,12 +320,12 @@ class ReaderActivity :
 		binding.appbarTop.updatePadding(
 			top = systemBars.top,
 			right = systemBars.right,
-			left = systemBars.left
+			left = systemBars.left,
 		)
 		binding.appbarBottom?.updatePadding(
 			bottom = systemBars.bottom,
 			right = systemBars.right,
-			left = systemBars.left
+			left = systemBars.left,
 		)
 		return WindowInsetsCompat.Builder(insets)
 			.setInsets(WindowInsetsCompat.Type.systemBars(), Insets.NONE)

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

@@ -1,33 +1,39 @@
 package org.koitharu.kotatsu.reader.ui
 
+import android.content.SharedPreferences
 import android.view.KeyEvent
 import android.view.SoundEffectConstants
 import android.view.View
-import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.DefaultLifecycleObserver
-import kotlinx.coroutines.Dispatchers
+import androidx.lifecycle.LifecycleOwner
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.utils.GridTouchHelper
 
 class ReaderControlDelegate(
-	scope: LifecycleCoroutineScope,
+	private val settings: AppSettings,
-	settings: AppSettings,
+	private val listener: OnInteractionListener,
-	private val listener: OnInteractionListener
+	owner: LifecycleOwner,
-) {
+) : DefaultLifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private var isTapSwitchEnabled: Boolean = true
 	private var isVolumeKeysSwitchEnabled: Boolean = false
+	private var isReaderTapsAdaptive: Boolean = true
 
 	init {
-		settings.observeAsFlow(AppSettings.KEY_READER_SWITCHERS) { readerPageSwitch }
+		owner.lifecycle.addObserver(this)
-			.flowOn(Dispatchers.Default)
+		settings.subscribe(this)
-			.onEach {
+		updateSettings()
-				isTapSwitchEnabled = AppSettings.PAGE_SWITCH_TAPS in it
+	}
-				isVolumeKeysSwitchEnabled = AppSettings.PAGE_SWITCH_VOLUME_KEYS in it
+
-			}.launchIn(scope)
+	override fun onDestroy(owner: LifecycleOwner) {
+		settings.unsubscribe(this)
+		owner.lifecycle.removeObserver(this)
+		super.onDestroy(owner)
+	}
+
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		updateSettings()
 	}
 
 	fun onGridTouch(area: Int, view: View) {
@@ -41,7 +47,7 @@ class ReaderControlDelegate(
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_UP)
 			}
 			GridTouchHelper.AREA_LEFT -> if (isTapSwitchEnabled) {
-				listener.switchPageBy(-1)
+				listener.switchPageBy(if (isReaderTapsReversed()) 1 else -1)
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_LEFT)
 			}
 			GridTouchHelper.AREA_BOTTOM -> if (isTapSwitchEnabled) {
@@ -49,7 +55,7 @@ class ReaderControlDelegate(
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_DOWN)
 			}
 			GridTouchHelper.AREA_RIGHT -> if (isTapSwitchEnabled) {
-				listener.switchPageBy(1)
+				listener.switchPageBy(if (isReaderTapsReversed()) -1 else 1)
 				view.playSoundEffect(SoundEffectConstants.NAVIGATION_RIGHT)
 			}
 		}
@@ -72,17 +78,25 @@ class ReaderControlDelegate(
 		KeyEvent.KEYCODE_PAGE_DOWN,
 		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN,
 		KeyEvent.KEYCODE_DPAD_DOWN,
-		KeyEvent.KEYCODE_DPAD_RIGHT -> {
+		-> {
 			listener.switchPageBy(1)
 			true
 		}
+		KeyEvent.KEYCODE_DPAD_RIGHT -> {
+			listener.switchPageBy(if (isReaderTapsReversed()) -1 else 1)
+			true
+		}
 		KeyEvent.KEYCODE_PAGE_UP,
 		KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP,
 		KeyEvent.KEYCODE_DPAD_UP,
-		KeyEvent.KEYCODE_DPAD_LEFT -> {
+		-> {
 			listener.switchPageBy(-1)
 			true
 		}
+		KeyEvent.KEYCODE_DPAD_LEFT -> {
+			listener.switchPageBy(if (isReaderTapsReversed()) 1 else -1)
+			true
+		}
 		KeyEvent.KEYCODE_DPAD_CENTER -> {
 			listener.toggleUiVisibility()
 			true
@@ -97,8 +111,21 @@ class ReaderControlDelegate(
 			)
 	}
 
+	private fun updateSettings() {
+		val switch = settings.readerPageSwitch
+		isTapSwitchEnabled = AppSettings.PAGE_SWITCH_TAPS in switch
+		isVolumeKeysSwitchEnabled = AppSettings.PAGE_SWITCH_VOLUME_KEYS in switch
+		isReaderTapsAdaptive = settings.isReaderTapsAdaptive
+	}
+
+	private fun isReaderTapsReversed(): Boolean {
+		return isReaderTapsAdaptive && listener.readerMode == ReaderMode.REVERSED
+	}
+
 	interface OnInteractionListener {
 
+		val readerMode: ReaderMode?
+
 		fun switchPageBy(delta: Int)
 
 		fun toggleUiVisibility()

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

@@ -6,6 +6,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import java.util.Date
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.R
@@ -31,7 +32,7 @@ import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
 import org.koitharu.kotatsu.utils.ext.processLifecycleScope
-import java.util.*
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 private const val BOUNDS_PAGE_OFFSET = 2
 private const val PAGES_TRIM_THRESHOLD = 120
@@ -69,7 +70,7 @@ class ReaderViewModel(
 			mangaName = manga?.title,
 			chapterName = chapter?.name,
 			chapterNumber = chapter?.number ?: 0,
-			chaptersTotal = chapters.size()
+			chaptersTotal = chapters.size(),
 		)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, null)
 
@@ -80,7 +81,7 @@ class ReaderViewModel(
 	val readerAnimation = settings.observeAsLiveData(
 		context = viewModelScope.coroutineContext + Dispatchers.Default,
 		key = AppSettings.KEY_READER_ANIMATION,
-		valueProducer = { readerAnimation }
+		valueProducer = { readerAnimation },
 	)
 
 	val isScreenshotsBlockEnabled = combine(
@@ -123,12 +124,12 @@ class ReaderViewModel(
 			val manga = checkNotNull(mangaData.value)
 			dataRepository.savePreferences(
 				manga = manga,
-				mode = newMode
+				mode = newMode,
 			)
 			readerMode.value = newMode
 			content.value?.run {
 				content.value = copy(
-					state = getCurrentState()
+					state = getCurrentState(),
 				)
 			}
 		}
@@ -358,7 +359,7 @@ class ReaderViewModel(
 			?: manga.chapters?.randomOrNull()
 			?: error("There are no chapters in this manga")
 		val pages = repo.getPages(chapter)
-		return runCatching {
+		return runCatchingCancellable {
 			val isWebtoon = MangaUtils.determineMangaIsWebtoon(pages)
 			if (isWebtoon) ReaderMode.WEBTOON else defaultMode
 		}.onSuccess {
@@ -389,7 +390,7 @@ class ReaderViewModel(
  */
 private fun HistoryRepository.saveStateAsync(manga: Manga, state: ReaderState, percent: Float): Job {
 	return processLifecycleScope.launch(Dispatchers.Default) {
-		runCatching {
+		runCatchingCancellable {
 			addOrUpdate(
 				manga = manga,
 				chapterId = state.chapterId,

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BasePageHolder.kt

@@ -13,7 +13,7 @@ abstract class BasePageHolder<B : ViewBinding>(
 	protected val binding: B,
 	loader: PageLoader,
 	settings: AppSettings,
-	exceptionResolver: ExceptionResolver
+	exceptionResolver: ExceptionResolver,
 ) : RecyclerView.ViewHolder(binding.root), PageHolderDelegate.Callback {
 
 	@Suppress("LeakingThis")
@@ -37,6 +37,14 @@ abstract class BasePageHolder<B : ViewBinding>(
 
 	protected abstract fun onBind(data: ReaderPage)
 
+	@CallSuper
+	open fun onAttachedToWindow() {
+	}
+
+	@CallSuper
+	open fun onDetachedFromWindow() {
+	}
+
 	@CallSuper
 	open fun onRecycled() {
 		delegate.onRecycle()

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt

@@ -4,12 +4,12 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.utils.ext.resetTransformations
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 @Suppress("LeakingThis")
 abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
@@ -35,6 +35,16 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 		super.onViewRecycled(holder)
 	}
 
+	override fun onViewAttachedToWindow(holder: H) {
+		super.onViewAttachedToWindow(holder)
+		holder.onAttachedToWindow()
+	}
+
+	override fun onViewDetachedFromWindow(holder: H) {
+		super.onViewDetachedFromWindow(holder)
+		holder.onDetachedFromWindow()
+	}
+
 	open fun getItem(position: Int): ReaderPage = differ.currentList[position]
 
 	open fun getItemOrNull(position: Int) = differ.currentList.getOrNull(position)
@@ -45,7 +55,7 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 
 	final override fun onCreateViewHolder(
 		parent: ViewGroup,
-		viewType: Int
+		viewType: Int,
 	): H = onCreateViewHolder(parent, loader, settings, exceptionResolver)
 
 	suspend fun setItems(items: List<ReaderPage>) = suspendCoroutine<Unit> { cont ->
@@ -58,7 +68,7 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 		parent: ViewGroup,
 		loader: PageLoader,
 		settings: AppSettings,
-		exceptionResolver: ExceptionResolver
+		exceptionResolver: ExceptionResolver,
 	): H
 
 	private class DiffCallback : DiffUtil.ItemCallback<ReaderPage>() {
@@ -70,6 +80,5 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 		override fun areContentsTheSame(oldItem: ReaderPage, newItem: ReaderPage): Boolean {
 			return oldItem == newItem
 		}
-
 	}
 }

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt

@@ -3,24 +3,30 @@ package org.koitharu.kotatsu.reader.ui.pager
 import android.net.Uri
 import androidx.core.net.toUri
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import kotlinx.coroutines.*
+import java.io.File
+import java.io.IOException
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
-import java.io.File
-import java.io.IOException
 
 class PageHolderDelegate(
 	private val loader: PageLoader,
 	private val settings: AppSettings,
 	private val callback: Callback,
-	private val exceptionResolver: ExceptionResolver
+	private val exceptionResolver: ExceptionResolver,
 ) : SubsamplingScaleImageView.DefaultOnImageEventListener() {
 
 	private val scope = loader.loaderScope + Dispatchers.Main.immediate
@@ -88,6 +94,8 @@ class PageHolderDelegate(
 				loader.convertInPlace(file)
 				state = State.CONVERTED
 				callback.onImageReady(file.toUri())
+			} catch (ce: CancellationException) {
+				throw ce
 			} catch (e2: Throwable) {
 				e.addSuppressed(e2)
 				state = State.ERROR
@@ -110,7 +118,7 @@ class PageHolderDelegate(
 			callback.onImageReady(file.toUri())
 		} catch (e: CancellationException) {
 			throw e
-		} catch (e: Exception) {
+		} catch (e: Throwable) {
 			state = State.ERROR
 			error = e
 			callback.onError(e)

app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt

@@ -25,11 +25,11 @@ class WebtoonHolder(
 	View.OnClickListener {
 
 	private var scrollToRestore = 0
+	private val goneOnInvisibleListener = GoneOnInvisibleListener(bindingInfo.progressBar)
 
 	init {
 		binding.ssiv.setOnImageEventListener(delegate)
 		bindingInfo.buttonRetry.setOnClickListener(this)
-		GoneOnInvisibleListener(bindingInfo.progressBar).attach()
 	}
 
 	override fun onBind(data: ReaderPage) {
@@ -41,6 +41,16 @@ class WebtoonHolder(
 		binding.ssiv.recycle()
 	}
 
+	override fun onAttachedToWindow() {
+		super.onAttachedToWindow()
+		goneOnInvisibleListener.attach()
+	}
+
+	override fun onDetachedFromWindow() {
+		super.onDetachedFromWindow()
+		goneOnInvisibleListener.detach()
+	}
+
 	override fun onLoadingStarted() {
 		bindingInfo.layoutError.isVisible = false
 		bindingInfo.progressBar.showCompat()

app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt

@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.ext.setTextColorAttr
 
 fun pageThumbnailAD(
@@ -69,7 +70,7 @@ fun pageThumbnailAD(
 			text = (item.number).toString()
 		}
 		job = scope.launch {
-			val drawable = runCatching {
+			val drawable = runCatchingCancellable {
 				loadPageThumbnail(item)
 			}.getOrNull()
 			binding.imageViewThumb.setImageDrawable(drawable)

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

@@ -2,10 +2,16 @@ package org.koitharu.kotatsu.remotelist.ui
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.base.ui.widgets.ChipsView
@@ -16,7 +22,14 @@ import org.koitharu.kotatsu.list.ui.filter.FilterCoordinator
 import org.koitharu.kotatsu.list.ui.filter.FilterItem
 import org.koitharu.kotatsu.list.ui.filter.FilterState
 import org.koitharu.kotatsu.list.ui.filter.OnFilterChangedListener
-import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.list.ui.model.CurrentFilterModel
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListHeader
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorFooter
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
@@ -132,6 +145,8 @@ class RemoteListViewModel(
 					mangaList.value = mangaList.value?.plus(list) ?: list
 				}
 				hasNextPage.value = list.isNotEmpty()
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				e.printStackTraceDebug()
 				listError.value = e

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

@@ -3,15 +3,20 @@ package org.koitharu.kotatsu.scrobbling.domain
 import androidx.collection.LongSparseArray
 import androidx.collection.getOrElse
 import androidx.core.text.parseAsHtml
-import java.util.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.scrobbling.data.ScrobblingEntity
-import org.koitharu.kotatsu.scrobbling.domain.model.*
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerManga
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerMangaInfo
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblerService
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingInfo
+import org.koitharu.kotatsu.scrobbling.domain.model.ScrobblingStatus
 import org.koitharu.kotatsu.utils.ext.findKeyByValue
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import java.util.EnumMap
 
 abstract class Scrobbler(
 	protected val db: MangaDatabase,
@@ -47,7 +52,7 @@ abstract class Scrobbler(
 
 	private suspend fun ScrobblingEntity.toScrobblingInfo(mangaId: Long): ScrobblingInfo? {
 		val mangaInfo = infoCache.getOrElse(targetId) {
-			runCatching {
+			runCatchingCancellable {
 				getMangaInfo(targetId)
 			}.onFailure {
 				it.printStackTraceDebug()
@@ -72,9 +77,9 @@ abstract class Scrobbler(
 }
 
 suspend fun Scrobbler.tryScrobble(mangaId: Long, chapter: MangaChapter): Boolean {
-	return runCatching {
+	return runCatchingCancellable {
 		scrobble(mangaId, chapter)
 	}.onFailure {
 		it.printStackTraceDebug()
 	}.isSuccess
-}
+}

app/src/main/java/org/koitharu/kotatsu/scrobbling/shikimori/data/ShikimoriInterceptor.kt

@@ -10,10 +10,13 @@ private const val USER_AGENT_SHIKIMORI = "Kotatsu"
 class ShikimoriInterceptor(private val storage: ShikimoriStorage) : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request().newBuilder()
+		val sourceRequest = chain.request()
+		val request = sourceRequest.newBuilder()
 		request.header(CommonHeaders.USER_AGENT, USER_AGENT_SHIKIMORI)
-		storage.accessToken?.let {
+		if (!sourceRequest.url.pathSegments.contains("oauth")) {
-			request.header(CommonHeaders.AUTHORIZATION, "Bearer $it")
+			storage.accessToken?.let {
+				request.header(CommonHeaders.AUTHORIZATION, "Bearer $it")
+			}
 		}
 		val response = chain.proceed(request.build())
 		if (!response.isSuccessful && !response.isRedirect) {
@@ -21,4 +24,4 @@ class ShikimoriInterceptor(private val storage: ShikimoriStorage) : Interceptor
 		}
 		return response
 	}
-}
+}

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

@@ -40,13 +40,14 @@ class ShikimoriRepository(
 
 	suspend fun authorize(code: String?) {
 		val body = FormBody.Builder()
-		body.add("grant_type", "authorization_code")
 		body.add("client_id", BuildConfig.SHIKIMORI_CLIENT_ID)
 		body.add("client_secret", BuildConfig.SHIKIMORI_CLIENT_SECRET)
 		if (code != null) {
+			body.add("grant_type", "authorization_code")
 			body.add("redirect_uri", REDIRECT_URI)
 			body.add("code", code)
 		} else {
+			body.add("grant_type", "refresh_token")
 			body.add("refresh_token", checkNotNull(storage.refreshToken))
 		}
 		val request = Request.Builder()

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

@@ -19,6 +19,7 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.util.levenshteinDistance
 import org.koitharu.kotatsu.search.ui.MangaSuggestionsProvider
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 class MangaSearchRepository(
 	private val settings: AppSettings,
@@ -30,7 +31,7 @@ class MangaSearchRepository(
 	fun globalSearch(query: String, concurrency: Int = DEFAULT_CONCURRENCY): Flow<Manga> =
 		settings.getMangaSources(includeHidden = false).asFlow()
 			.flatMapMerge(concurrency) { source ->
-				runCatching {
+				runCatchingCancellable {
 					MangaRepository(source).getList(
 						offset = 0,
 						query = query,
@@ -63,7 +64,7 @@ class MangaSearchRepository(
 			SUGGESTION_PROJECTION,
 			"${SearchManager.SUGGEST_COLUMN_QUERY} LIKE ?",
 			arrayOf("%$query%"),
-			"date DESC"
+			"date DESC",
 		)?.use { cursor ->
 			val count = minOf(cursor.count, limit)
 			if (count == 0) {
@@ -113,7 +114,7 @@ class MangaSearchRepository(
 			SUGGESTION_PROJECTION,
 			null,
 			arrayOfNulls(1),
-			null
+			null,
 		)?.use { cursor -> cursor.count } ?: 0
 	}
 

app/src/main/java/org/koitharu/kotatsu/search/ui/SearchViewModel.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.search.ui
 
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -9,14 +10,20 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
-import org.koitharu.kotatsu.list.ui.model.*
+import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.list.ui.model.LoadingFooter
+import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.list.ui.model.toErrorFooter
+import org.koitharu.kotatsu.list.ui.model.toErrorState
+import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 
 class SearchViewModel(
 	private val repository: MangaRepository,
 	private val query: String,
-	settings: AppSettings
+	settings: AppSettings,
 ) : MangaListViewModel(settings) {
 
 	private val mangaList = MutableStateFlow<List<Manga>?>(null)
@@ -28,7 +35,7 @@ class SearchViewModel(
 		mangaList,
 		createListModeFlow(),
 		listError,
-		hasNextPage
+		hasNextPage,
 	) { list, mode, error, hasNext ->
 		when {
 			list.isNullOrEmpty() && error != null -> listOf(error.toErrorState(canRetry = true))
@@ -39,8 +46,9 @@ class SearchViewModel(
 					textPrimary = R.string.nothing_found,
 					textSecondary = R.string.text_search_holder_secondary,
 					actionStringRes = 0,
-				)
+				),
 			)
+
 			else -> {
 				val result = ArrayList<ListModel>(list.size + 1)
 				list.toUi(result, mode)
@@ -88,6 +96,8 @@ class SearchViewModel(
 					mangaList.value = mangaList.value?.plus(list) ?: list
 				}
 				hasNextPage.value = list.isNotEmpty()
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				listError.value = e
 			}

app/src/main/java/org/koitharu/kotatsu/search/ui/multi/MultiSearchViewModel.kt

@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 
 private const val MAX_PARALLELISM = 4
 private const val MIN_HAS_MORE_ITEMS = 8
@@ -48,8 +49,9 @@ class MultiSearchViewModel(
 						textSecondary = R.string.text_search_holder_secondary,
 						actionStringRes = 0,
 					)
-				}
+				},
 			)
+
 			loading -> list + LoadingFooter
 			else -> list
 		}
@@ -81,6 +83,8 @@ class MultiSearchViewModel(
 				loadingData.value = true
 				query.postValue(q)
 				searchImpl(q)
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Throwable) {
 				listError.value = e
 			} finally {
@@ -94,7 +98,7 @@ class MultiSearchViewModel(
 		val dispatcher = Dispatchers.Default.limitedParallelism(MAX_PARALLELISM)
 		val deferredList = sources.map { source ->
 			async(dispatcher) {
-				runCatching {
+				runCatchingCancellable {
 					val list = MangaRepository(source).getList(offset = 0, query = q)
 						.toUi(ListMode.GRID)
 					if (list.isNotEmpty()) {

app/src/main/java/org/koitharu/kotatsu/search/ui/multi/adapter/MultiSearchAdapter.kt

@@ -5,12 +5,12 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.list.ui.MangaSelectionDecoration
 import org.koitharu.kotatsu.list.ui.adapter.*
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchListModel
-import kotlin.jvm.internal.Intrinsics
 
 class MultiSearchAdapter(
 	lifecycleOwner: LifecycleOwner,
@@ -33,11 +33,11 @@ class MultiSearchAdapter(
 					selectionDecoration = selectionDecoration,
 					listener = listener,
 					itemClickListener = itemClickListener,
-				)
+				),
 			)
 			.addDelegate(loadingStateAD())
 			.addDelegate(loadingFooterAD())
-			.addDelegate(emptyStateListAD(listener))
+			.addDelegate(emptyStateListAD(coil, listener))
 			.addDelegate(errorStateListAD(listener))
 	}
 

app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt

@@ -8,6 +8,12 @@ import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread
 import androidx.core.net.toUri
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
@@ -20,12 +26,7 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.utils.FileSize
 import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
-import java.io.ByteArrayInputStream
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
-import java.util.concurrent.TimeUnit
 
 class AppUpdateChecker(private val activity: ComponentActivity) {
 
@@ -41,7 +42,7 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 		null
 	}
 
-	suspend fun checkNow() = runCatching {
+	suspend fun checkNow() = runCatchingCancellable {
 		val version = repo.getLatestVersion()
 		val newVersionId = VersionId(version.name)
 		val currentVersionId = VersionId(BuildConfig.VERSION_NAME)

app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt

@@ -7,6 +7,7 @@ import android.view.View
 import androidx.preference.Preference
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.get
 import org.koin.android.ext.android.inject
@@ -65,18 +66,22 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				clearCache(preference, CacheDir.PAGES)
 				true
 			}
+
 			AppSettings.KEY_THUMBS_CACHE_CLEAR -> {
 				clearCache(preference, CacheDir.THUMBS)
 				true
 			}
+
 			AppSettings.KEY_COOKIES_CLEAR -> {
 				clearCookies()
 				true
 			}
+
 			AppSettings.KEY_SEARCH_HISTORY_CLEAR -> {
 				clearSearchHistory(preference)
 				true
 			}
+
 			AppSettings.KEY_UPDATES_FEED_CLEAR -> {
 				viewLifecycleScope.launch {
 					trackerRepo.clearLogs()
@@ -85,11 +90,12 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 					Snackbar.make(
 						view ?: return@launch,
 						R.string.updates_feed_cleared,
-						Snackbar.LENGTH_SHORT
+						Snackbar.LENGTH_SHORT,
 					).show()
 				}
 				true
 			}
+
 			AppSettings.KEY_SHIKIMORI -> {
 				if (!shikimoriRepository.isAuthorized) {
 					launchShikimoriAuth()
@@ -98,6 +104,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 					super.onPreferenceTreeClick(preference)
 				}
 			}
+
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
@@ -110,6 +117,8 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				storageManager.clearCache(cache)
 				val size = storageManager.computeCacheSize(cache)
 				preference.summary = FileSize.BYTES.format(ctx, size)
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Exception) {
 				preference.summary = e.getDisplayMessage(ctx.resources)
 			} finally {
@@ -136,7 +145,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 					Snackbar.make(
 						view ?: return@launch,
 						R.string.search_history_cleared,
-						Snackbar.LENGTH_SHORT
+						Snackbar.LENGTH_SHORT,
 					).show()
 				}
 			}.show()
@@ -154,7 +163,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 					Snackbar.make(
 						listView ?: return@launch,
 						R.string.cookies_cleared,
-						Snackbar.LENGTH_SHORT
+						Snackbar.LENGTH_SHORT,
 					).show()
 				}
 			}.show()

app/src/main/java/org/koitharu/kotatsu/settings/SettingsHeadersFragment.kt

@@ -33,7 +33,7 @@ class SettingsHeadersFragment : PreferenceHeaderFragmentCompat(), SlidingPaneLay
 
 	fun setTitle(title: CharSequence?) {
 		currentTitle = title
-		if (slidingPaneLayout.isOpen) {
+		if (slidingPaneLayout.width != 0 && slidingPaneLayout.isOpen) {
 			activity?.title = title
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsFragment.kt

@@ -2,6 +2,8 @@ package org.koitharu.kotatsu.settings
 
 import android.os.Bundle
 import android.view.View
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
@@ -16,7 +18,13 @@ import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity
-import org.koitharu.kotatsu.utils.ext.*
+import org.koitharu.kotatsu.utils.ext.awaitViewLifecycle
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
+import org.koitharu.kotatsu.utils.ext.serializableArgument
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+import org.koitharu.kotatsu.utils.ext.withArgs
 
 class SourceSettingsFragment : BasePreferenceFragment(0) {
 
@@ -47,7 +55,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 		super.onViewCreated(view, savedInstanceState)
 		findPreference<Preference>(KEY_AUTH)?.run {
 			if (isVisible) {
-				loadUsername(this)
+				loadUsername(viewLifecycleOwner, this)
 			}
 		}
 	}
@@ -58,12 +66,13 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 				startActivity(SourceAuthActivity.newIntent(preference.context, source))
 				true
 			}
+
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
 
-	private fun loadUsername(preference: Preference) = viewLifecycleScope.launch {
+	private fun loadUsername(owner: LifecycleOwner, preference: Preference) = owner.lifecycleScope.launch {
-		runCatching {
+		runCatchingCancellable {
 			preference.summary = null
 			withContext(Dispatchers.Default) {
 				requireNotNull(repository?.getAuthProvider()?.getUsername())
@@ -83,17 +92,19 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
 					).setAction(ExceptionResolver.getResolveStringId(error)) { resolveError(error) }
 						.show()
 				}
+
 				else -> preference.summary = error.getDisplayMessage(preference.context.resources)
 			}
 			error.printStackTraceDebug()
 		}
 	}
 
-	private fun resolveError(error: Throwable): Unit {
+	private fun resolveError(error: Throwable) {
 		viewLifecycleScope.launch {
 			if (exceptionResolver.resolve(error)) {
 				val pref = findPreference<Preference>(KEY_AUTH) ?: return@launch
-				loadUsername(pref)
+				val lifecycleOwner = awaitViewLifecycle()
+				loadUsername(lifecycleOwner, pref)
 			}
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupDialogFragment.kt

@@ -9,14 +9,14 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import java.io.File
+import java.io.FileOutputStream
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.AlertDialogFragment
 import org.koitharu.kotatsu.databinding.DialogProgressBinding
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.progress.Progress
-import java.io.File
-import java.io.FileOutputStream
 
 class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 
@@ -24,7 +24,7 @@ class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 
 	private var backup: File? = null
 	private val saveFileContract = registerForActivityResult(
-		ActivityResultContracts.CreateDocument("*/*")
+		ActivityResultContracts.CreateDocument("*/*"),
 	) { uri ->
 		val file = backup
 		if (uri != null && file != null) {
@@ -88,6 +88,8 @@ class BackupDialogFragment : AlertDialogFragment<DialogProgressBinding>() {
 			}
 			Toast.makeText(requireContext(), R.string.backup_saved, Toast.LENGTH_LONG).show()
 			dismiss()
+		} catch (e: InterruptedException) {
+			throw e
 		} catch (e: Exception) {
 			onError(e)
 		}

app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt

@@ -41,7 +41,7 @@ class OnboardDialogFragment :
 	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
 		builder
 			.setPositiveButton(R.string.done, this)
-			.setCancelable(true)
+			.setCancelable(false)
 		if (isWelcome) {
 			builder.setTitle(R.string.welcome)
 		} else {

app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt

@@ -3,15 +3,16 @@ package org.koitharu.kotatsu.settings.onboard
 import androidx.collection.ArraySet
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
+import java.util.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.mapToSet
-import java.util.*
 
 class OnboardViewModel(
 	private val settings: AppSettings,
@@ -27,7 +28,7 @@ class OnboardViewModel(
 
 	init {
 		if (settings.isSourcesSelected) {
-			selectedLocales.removeAll(settings.hiddenSources.mapToSet { x -> MangaSource.valueOf(x).locale })
+			selectedLocales.removeAll(settings.hiddenSources.mapNotNullToSet { x -> MangaSource(x)?.locale })
 		} else {
 			val deviceLocales = LocaleListCompat.getDefault().mapToSet { x ->
 				x.language
@@ -66,7 +67,7 @@ class OnboardViewModel(
 			SourceLocale(
 				key = key,
 				title = locale?.getDisplayLanguage(locale)?.toTitleCase(locale),
-				isChecked = key in selectedLocales
+				isChecked = key in selectedLocales,
 			)
 		}.sortedWith(SourceLocaleComparator())
 	}

app/src/main/java/org/koitharu/kotatsu/settings/utils/SliderPreference.kt

@@ -5,8 +5,8 @@ import android.content.res.TypedArray
 import android.os.Parcel
 import android.os.Parcelable
 import android.util.AttributeSet
-import android.view.View
 import androidx.core.content.withStyledAttributes
+import androidx.customview.view.AbsSavedState
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.google.android.material.slider.Slider
@@ -40,11 +40,11 @@ class SliderPreference @JvmOverloads constructor(
 			attrs,
 			R.styleable.SliderPreference,
 			defStyleAttr,
-			defStyleRes
+			defStyleRes,
 		) {
 			valueFrom = getFloat(
 				R.styleable.SliderPreference_android_valueFrom,
-				valueFrom.toFloat()
+				valueFrom.toFloat(),
 			).toInt()
 			valueTo =
 				getFloat(R.styleable.SliderPreference_android_valueTo, valueTo.toFloat()).toInt()
@@ -117,7 +117,7 @@ class SliderPreference @JvmOverloads constructor(
 		}
 	}
 
-	private class SavedState : View.BaseSavedState {
+	private class SavedState : AbsSavedState {
 
 		val valueFrom: Int
 		val valueTo: Int
@@ -134,7 +134,7 @@ class SliderPreference @JvmOverloads constructor(
 			this.currentValue = currentValue
 		}
 
-		constructor(source: Parcel) : super(source) {
+		constructor(source: Parcel, classLoader: ClassLoader?) : super(source, classLoader) {
 			valueFrom = source.readInt()
 			valueTo = source.readInt()
 			currentValue = source.readInt()
@@ -148,9 +148,10 @@ class SliderPreference @JvmOverloads constructor(
 		}
 
 		companion object {
+			@Suppress("unused")
 			@JvmField
 			val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
-				override fun createFromParcel(`in`: Parcel) = SavedState(`in`)
+				override fun createFromParcel(`in`: Parcel) = SavedState(`in`, SavedState::class.java.classLoader)
 
 				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
 			}

app/src/main/java/org/koitharu/kotatsu/suggestions/ui/SuggestionsWorker.kt

@@ -8,6 +8,8 @@ import androidx.annotation.FloatRange
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.work.*
+import java.util.concurrent.TimeUnit
+import kotlin.math.pow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -24,8 +26,6 @@ import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import org.koitharu.kotatsu.utils.ext.asArrayList
 import org.koitharu.kotatsu.utils.ext.trySetForeground
-import java.util.concurrent.TimeUnit
-import kotlin.math.pow
 
 class SuggestionsWorker(appContext: Context, params: WorkerParameters) :
 	CoroutineWorker(appContext, params), KoinComponent {
@@ -47,7 +47,7 @@ class SuggestionsWorker(appContext: Context, params: WorkerParameters) :
 			val channel = NotificationChannel(
 				WORKER_CHANNEL_ID,
 				title,
-				NotificationManager.IMPORTANCE_LOW
+				NotificationManager.IMPORTANCE_LOW,
 			)
 			channel.setShowBadge(false)
 			channel.enableVibration(false)
@@ -118,7 +118,7 @@ class SuggestionsWorker(appContext: Context, params: WorkerParameters) :
 		}.map { manga ->
 			MangaSuggestion(
 				manga = manga,
-				relevance = computeRelevance(manga.tags, allTags)
+				relevance = computeRelevance(manga.tags, allTags),
 			)
 		}.sortedBy { it.relevance }.take(LIMIT)
 		suggestionRepository.replace(suggestions)

app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt

@@ -14,7 +14,7 @@ val trackerModule
 		factory { TrackingRepository(get()) }
 		factory { TrackerNotificationChannels(androidContext(), get()) }
 
-		factory { Tracker(get(), get(), get()) }
+		factory { Tracker(get(), get(), get(), get()) }
 
 		viewModel { FeedViewModel(get()) }
 	}

app/src/main/java/org/koitharu/kotatsu/tracker/domain/Tracker.kt

@@ -1,8 +1,10 @@
 package org.koitharu.kotatsu.tracker.domain
 
 import androidx.annotation.VisibleForTesting
+import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.domain.model.MangaTracking
 import org.koitharu.kotatsu.tracker.domain.model.MangaUpdates
@@ -12,6 +14,7 @@ import org.koitharu.kotatsu.tracker.work.TrackingItem
 class Tracker(
 	private val settings: AppSettings,
 	private val repository: TrackingRepository,
+	private val historyRepository: HistoryRepository,
 	private val channels: TrackerNotificationChannels,
 ) {
 
@@ -68,7 +71,7 @@ class Tracker(
 
 	suspend fun fetchUpdates(track: MangaTracking, commit: Boolean): MangaUpdates {
 		val manga = MangaRepository(track.manga.source).getDetails(track.manga)
-		val updates = compare(track, manga)
+		val updates = compare(track, manga, getBranch(manga))
 		if (commit) {
 			repository.saveUpdates(updates)
 		}
@@ -78,7 +81,7 @@ class Tracker(
 	@VisibleForTesting
 	suspend fun checkUpdates(manga: Manga, commit: Boolean): MangaUpdates {
 		val track = repository.getTrack(manga)
-		val updates = compare(track, manga)
+		val updates = compare(track, manga, getBranch(manga))
 		if (commit) {
 			repository.saveUpdates(updates)
 		}
@@ -90,25 +93,30 @@ class Tracker(
 		repository.deleteTrack(mangaId)
 	}
 
+	private suspend fun getBranch(manga: Manga): String? {
+		val history = historyRepository.getOne(manga)
+		return manga.getPreferredBranch(history)
+	}
+
 	/**
 	 * The main functionality of tracker: check new chapters in [manga] comparing to the [track]
 	 */
-	private fun compare(track: MangaTracking, manga: Manga): MangaUpdates {
+	private fun compare(track: MangaTracking, manga: Manga, branch: String?): MangaUpdates {
 		if (track.isEmpty()) {
 			// first check or manga was empty on last check
 			return MangaUpdates(manga, emptyList(), isValid = false)
 		}
-		val chapters = requireNotNull(manga.chapters)
+		val chapters = requireNotNull(manga.getChapters(branch))
 		val newChapters = chapters.takeLastWhile { x -> x.id != track.lastChapterId }
 		return when {
 			newChapters.isEmpty() -> {
-				return MangaUpdates(manga, emptyList(), isValid = chapters.lastOrNull()?.id == track.lastChapterId)
+				MangaUpdates(manga, emptyList(), isValid = chapters.lastOrNull()?.id == track.lastChapterId)
 			}
 			newChapters.size == chapters.size -> {
-				return MangaUpdates(manga, emptyList(), isValid = false)
+				MangaUpdates(manga, emptyList(), isValid = false)
 			}
 			else -> {
-				return MangaUpdates(manga, newChapters, isValid = true)
+				MangaUpdates(manga, newChapters, isValid = true)
 			}
 		}
 	}

app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt

@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.main.ui.AppBarOwner
+import org.koitharu.kotatsu.main.ui.MainActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.tracker.ui.adapter.FeedAdapter
@@ -25,6 +26,7 @@ import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.ext.addMenuProvider
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
+import org.koitharu.kotatsu.utils.ext.resolveDp
 
 class FeedFragment :
 	BaseFragment<FragmentFeedBinding>(),
@@ -39,7 +41,7 @@ class FeedFragment :
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
-		container: ViewGroup?
+		container: ViewGroup?,
 	) = FragmentFeedBinding.inflate(inflater, container, false)
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -54,7 +56,7 @@ class FeedFragment :
 			paddingVertical = resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
 			val decoration = TypedSpacingItemDecoration(
 				FeedAdapter.ITEM_TYPE_FEED to 0,
-				fallbackSpacing = spacing
+				fallbackSpacing = spacing,
 			)
 			addItemDecoration(decoration)
 		}
@@ -77,12 +79,25 @@ class FeedFragment :
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
-		binding.recyclerView.updatePadding(
+		binding.root.updatePadding(
-			top = headerHeight + paddingVertical,
+			left = insets.left,
-			left = insets.left + paddingHorizontal,
+			right = insets.right,
-			right = insets.right + paddingHorizontal,
-			bottom = insets.bottom + paddingVertical,
 		)
+		if (activity is MainActivity) {
+			binding.recyclerView.updatePadding(
+				top = headerHeight,
+				bottom = insets.bottom,
+			)
+			binding.swipeRefreshLayout.setProgressViewOffset(
+				true,
+				headerHeight + resources.resolveDp(-72),
+				headerHeight + resources.resolveDp(10),
+			)
+		} else {
+			binding.recyclerView.updatePadding(
+				bottom = insets.bottom,
+			)
+		}
 	}
 
 	override fun onRetryClick(error: Throwable) = Unit
@@ -101,7 +116,7 @@ class FeedFragment :
 		Snackbar.make(
 			binding.recyclerView,
 			R.string.updates_feed_cleared,
-			Snackbar.LENGTH_LONG
+			Snackbar.LENGTH_LONG,
 		).show()
 	}
 
@@ -109,7 +124,7 @@ class FeedFragment :
 		Snackbar.make(
 			binding.recyclerView,
 			e.getDisplayMessage(resources),
-			Snackbar.LENGTH_SHORT
+			Snackbar.LENGTH_SHORT,
 		).show()
 	}
 

app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt

@@ -16,12 +16,13 @@ import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.tracker.domain.model.TrackingLogItem
 import org.koitharu.kotatsu.tracker.ui.model.toFeedItem
+import org.koitharu.kotatsu.tracker.work.TrackWorker
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.daysDiff
 
 class FeedViewModel(
-	private val repository: TrackingRepository
+	private val repository: TrackingRepository,
 ) : BaseViewModel() {
 
 	private val logList = MutableStateFlow<List<TrackingLogItem>?>(null)
@@ -32,7 +33,7 @@ class FeedViewModel(
 	val onFeedCleared = SingleLiveEvent<Unit>()
 	val content = combine(
 		logList.filterNotNull(),
-		hasNextPage
+		hasNextPage,
 	) { list, isHasNextPage ->
 		buildList(list.size + 2) {
 			if (list.isEmpty()) {
@@ -43,7 +44,7 @@ class FeedViewModel(
 						textPrimary = R.string.text_empty_holder_primary,
 						textSecondary = R.string.text_feed_holder,
 						actionStringRes = 0,
-					)
+					),
 				)
 			} else {
 				list.mapListTo(this)
@@ -54,7 +55,7 @@ class FeedViewModel(
 		}
 	}.asLiveDataDistinct(
 		viewModelScope.coroutineContext + Dispatchers.Default,
-		listOf(header, LoadingState)
+		listOf(header, LoadingState),
 	)
 
 	init {

app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedAdapter.kt

@@ -4,11 +4,11 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
+import kotlin.jvm.internal.Intrinsics
 import org.koitharu.kotatsu.core.ui.DateTimeAgo
 import org.koitharu.kotatsu.list.ui.adapter.*
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
-import kotlin.jvm.internal.Intrinsics
 
 class FeedAdapter(
 	coil: ImageLoader,
@@ -23,7 +23,7 @@ class FeedAdapter(
 			.addDelegate(ITEM_TYPE_LOADING_STATE, loadingStateAD())
 			.addDelegate(ITEM_TYPE_ERROR_FOOTER, errorFooterAD(listener))
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
-			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(listener))
+			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(coil, listener))
 			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD())
 			.addDelegate(ITEM_TYPE_DATE_HEADER, relatedDateItemAD())
 	}

app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt

@@ -27,6 +27,7 @@ import org.koitharu.kotatsu.tracker.domain.Tracker
 import org.koitharu.kotatsu.tracker.domain.model.MangaUpdates
 import org.koitharu.kotatsu.utils.PendingIntentCompat
 import org.koitharu.kotatsu.utils.ext.referer
+import org.koitharu.kotatsu.utils.ext.runCatchingCancellable
 import org.koitharu.kotatsu.utils.ext.toBitmapOrNull
 import org.koitharu.kotatsu.utils.ext.trySetForeground
 
@@ -80,7 +81,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 		val deferredList = coroutineScope {
 			tracks.map { (track, channelId) ->
 				async(dispatcher) {
-					runCatching {
+					runCatchingCancellable {
 						tracker.fetchUpdates(track, commit = true)
 					}.onSuccess { updates ->
 						if (updates.isValid && updates.isNotEmpty()) {

app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt

@@ -1,13 +1,13 @@
 package org.koitharu.kotatsu.utils
 
+import java.util.*
+import kotlin.coroutines.coroutineContext
+import kotlin.coroutines.resume
 import kotlinx.coroutines.CancellableContinuation
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import java.util.*
-import kotlin.coroutines.resume
 
 class CompositeMutex<T : Any> : Set<T> {
 
@@ -34,7 +34,7 @@ class CompositeMutex<T : Any> : Set<T> {
 	}
 
 	suspend fun lock(element: T) {
-		while (currentCoroutineContext().isActive) {
+		while (coroutineContext.isActive) {
 			waitForRemoval(element)
 			mutex.withLock {
 				if (data[element] == null) {
@@ -45,11 +45,9 @@ class CompositeMutex<T : Any> : Set<T> {
 		}
 	}
 
-	suspend fun unlock(element: T) {
+	fun unlock(element: T) {
-		val continuations = mutex.withLock {
+		val continuations = checkNotNull(data.remove(element)) {
-			checkNotNull(data.remove(element)) {
+			"CompositeMutex is not locked for $element"
-				"CompositeMutex is not locked for $element"
-			}
 		}
 		continuations.forEach { c ->
 			if (c.isActive) {

app/src/main/java/org/koitharu/kotatsu/utils/GoneOnInvisibleListener.kt

@@ -19,5 +19,10 @@ class GoneOnInvisibleListener(
 
 	fun attach() {
 		view.viewTreeObserver.addOnGlobalLayoutListener(this)
+		onGlobalLayout()
 	}
-}
+
+	fun detach() {
+		view.viewTreeObserver.removeOnGlobalLayoutListener(this)
+	}
+}

app/src/main/java/org/koitharu/kotatsu/utils/GridTouchHelper.kt

@@ -7,7 +7,7 @@ import kotlin.math.roundToInt
 
 class GridTouchHelper(
 	context: Context,
-	private val listener: OnGridTouchListener
+	private val listener: OnGridTouchListener,
 ) : GestureDetector.SimpleOnGestureListener() {
 
 	private val detector = GestureDetector(context, this)
@@ -16,7 +16,7 @@ class GridTouchHelper(
 	private var isDispatching = false
 
 	init {
-		detector.setIsLongpressEnabled(false)
+		detector.setIsLongpressEnabled(true)
 		detector.setOnDoubleTapListener(this)
 	}
 
@@ -46,7 +46,7 @@ class GridTouchHelper(
 				}
 				2 -> AREA_RIGHT
 				else -> return false
-			}
+			},
 		)
 		return true
 	}
@@ -66,4 +66,4 @@ class GridTouchHelper(
 
 		fun onProcessTouch(rawX: Int, rawY: Int): Boolean
 	}
-}
+}

app/src/main/java/org/koitharu/kotatsu/utils/LifecycleAwareServiceConnection.kt

@@ -1,45 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import android.app.Activity
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.IBinder
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-class LifecycleAwareServiceConnection(
-	private val host: Activity,
-) : ServiceConnection, DefaultLifecycleObserver {
-
-	private val serviceStateFlow = MutableStateFlow<IBinder?>(null)
-
-	val service: StateFlow<IBinder?>
-		get() = serviceStateFlow
-
-	override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-		serviceStateFlow.value = service
-	}
-
-	override fun onServiceDisconnected(name: ComponentName?) {
-		serviceStateFlow.value = null
-	}
-
-	override fun onDestroy(owner: LifecycleOwner) {
-		super.onDestroy(owner)
-		host.unbindService(this)
-	}
-}
-
-fun Activity.bindServiceWithLifecycle(
-	owner: LifecycleOwner,
-	service: Intent,
-	flags: Int
-): LifecycleAwareServiceConnection {
-	val connection = LifecycleAwareServiceConnection(this)
-	bindService(service, connection, flags)
-	owner.lifecycle.addObserver(connection)
-	return connection
-}

app/src/main/java/org/koitharu/kotatsu/utils/PausingDispatcher.kt

@@ -1,50 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import androidx.annotation.MainThread
-import java.util.concurrent.ConcurrentLinkedQueue
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Runnable
-
-class PausingDispatcher(
-	private val dispatcher: CoroutineDispatcher,
-) : CoroutineDispatcher() {
-
-	@Volatile
-	private var isPaused = false
-	private val queue = ConcurrentLinkedQueue<Task>()
-
-	override fun isDispatchNeeded(context: CoroutineContext): Boolean {
-		return isPaused || super.isDispatchNeeded(context)
-	}
-
-	override fun dispatch(context: CoroutineContext, block: Runnable) {
-		if (isPaused) {
-			queue.add(Task(context, block))
-		} else {
-			dispatcher.dispatch(context, block)
-		}
-	}
-
-	@MainThread
-	fun pause() {
-		isPaused = true
-	}
-
-	@MainThread
-	fun resume() {
-		if (!isPaused) {
-			return
-		}
-		isPaused = false
-		while (true) {
-			val task = queue.poll() ?: break
-			dispatcher.dispatch(task.context, task.block)
-		}
-	}
-
-	private class Task(
-		val context: CoroutineContext,
-		val block: Runnable,
-	)
-}

app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt

@@ -29,7 +29,7 @@ val Context.activityManager: ActivityManager?
 
 fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
 
-suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatching {
+suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatchingCancellable {
 	val info = getForegroundInfo()
 	setForeground(info)
 }.isSuccess

app/src/main/java/org/koitharu/kotatsu/utils/ext/CoilExt.kt

@@ -9,6 +9,7 @@ import coil.request.ImageResult
 import coil.request.SuccessResult
 import coil.util.CoilUtils
 import com.google.android.material.progressindicator.BaseProgressIndicator
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.utils.progress.ImageRequestIndicatorListener
 
@@ -45,9 +46,28 @@ fun ImageResult.toBitmapOrNull() = when (this) {
 }
 
 fun ImageRequest.Builder.referer(referer: String): ImageRequest.Builder {
-	return setHeader(CommonHeaders.REFERER, referer)
+	if (referer.isEmpty()) {
+		return this
+	}
+	try {
+		setHeader(CommonHeaders.REFERER, referer)
+	} catch (e: IllegalArgumentException) {
+		val baseUrl = referer.baseUrl()
+		if (baseUrl != null) {
+			setHeader(CommonHeaders.REFERER, baseUrl)
+		}
+	}
+	return this
 }
 
 fun ImageRequest.Builder.indicator(indicator: BaseProgressIndicator<*>): ImageRequest.Builder {
 	return listener(ImageRequestIndicatorListener(indicator))
+}
+
+private fun String.baseUrl(): String? {
+	return (this.toHttpUrlOrNull()?.newBuilder("/") ?: return null)
+		.username("")
+		.password("")
+		.build()
+		.toString()
 }

app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt

@@ -7,8 +7,12 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
 import androidx.lifecycle.coroutineScope
 import java.io.Serializable
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
 
 inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 	val b = Bundle(size)
@@ -49,4 +53,20 @@ fun DialogFragment.showAllowStateLoss(manager: FragmentManager, tag: String?) {
 
 fun Fragment.addMenuProvider(provider: MenuProvider) {
 	requireActivity().addMenuProvider(provider, viewLifecycleOwner, Lifecycle.State.RESUMED)
+}
+
+suspend fun Fragment.awaitViewLifecycle(): LifecycleOwner = suspendCancellableCoroutine { cont ->
+	val liveData = viewLifecycleOwnerLiveData
+	val observer = object : Observer<LifecycleOwner> {
+		override fun onChanged(result: LifecycleOwner?) {
+			if (result != null) {
+				liveData.removeObserver(this)
+				cont.resume(result)
+			}
+		}
+	}
+	liveData.observeForever(observer)
+	cont.invokeOnCancellation {
+		liveData.removeObserver(observer)
+	}
 }

app/src/main/java/org/koitharu/kotatsu/utils/ext/ThrowableExt.kt

@@ -2,40 +2,70 @@ package org.koitharu.kotatsu.utils.ext
 
 import android.content.ActivityNotFoundException
 import android.content.res.Resources
+import androidx.collection.arraySetOf
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import kotlinx.coroutines.CancellationException
 import okio.FileNotFoundException
 import org.acra.ktx.sendWithAcra
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.exceptions.*
+import org.koitharu.kotatsu.core.exceptions.CaughtException
+import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
+import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
+import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
+import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
 import org.koitharu.kotatsu.parsers.exception.ContentUnavailableException
 import org.koitharu.kotatsu.parsers.exception.NotFoundException
 import org.koitharu.kotatsu.parsers.exception.ParseException
-import java.net.SocketTimeoutException
 
 fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
 	is CloudFlareProtectedException -> resources.getString(R.string.captcha_required)
 	is ActivityNotFoundException,
-	is UnsupportedOperationException -> resources.getString(R.string.operation_not_supported)
+	is UnsupportedOperationException,
+	-> resources.getString(R.string.operation_not_supported)
+
 	is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)
 	is FileNotFoundException -> resources.getString(R.string.file_not_found)
 	is EmptyHistoryException -> resources.getString(R.string.history_is_empty)
 	is ContentUnavailableException -> message
 	is ParseException -> shortMessage
-	is SocketTimeoutException -> resources.getString(R.string.network_error)
+	is UnknownHostException,
+	is SocketTimeoutException,
+	-> resources.getString(R.string.network_error)
+
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	is NotFoundException -> resources.getString(R.string.not_found_404)
 	else -> localizedMessage
 } ?: resources.getString(R.string.error_occurred)
 
 fun Throwable.isReportable(): Boolean {
-	if (this !is Exception) {
+	return this is Error || this.javaClass in reportableExceptions
-		return true
-	}
-	return this is ParseException || this is IllegalArgumentException ||
-		this is IllegalStateException || this.javaClass == RuntimeException::class.java
 }
 
 fun Throwable.report(message: String?) {
-	CaughtException(this, message).sendWithAcra()
+	val exception = CaughtException(this, message)
+	exception.sendWithAcra()
+}
+
+private val reportableExceptions = arraySetOf<Class<*>>(
+	ParseException::class.java,
+	RuntimeException::class.java,
+	IllegalStateException::class.java,
+	IllegalArgumentException::class.java,
+	ConcurrentModificationException::class.java,
+	UnsupportedOperationException::class.java,
+)
+
+inline fun <R> runCatchingCancellable(block: () -> R): Result<R> {
+	return try {
+		Result.success(block())
+	} catch (e: InterruptedException) {
+		throw e
+	} catch (e: CancellationException) {
+		throw e
+	} catch (e: Throwable) {
+		Result.failure(e)
+	}
 }

app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt

@@ -114,7 +114,8 @@ fun <T> RecyclerView.ViewHolder.getItem(clazz: Class<T>): T? {
 
 fun Slider.setValueRounded(newValue: Float) {
 	val step = stepSize
-	value = (newValue / step).roundToInt() * step
+	val roundedValue = (newValue / step).roundToInt() * step
+	value = roundedValue.coerceIn(valueFrom, valueTo)
 }
 
 val RecyclerView.isScrolledToTop: Boolean

app/src/main/java/org/koitharu/kotatsu/utils/image/CoverSizeResolver.kt

@@ -0,0 +1,83 @@
+package org.koitharu.kotatsu.utils.image
+
+import android.view.View
+import android.view.View.OnLayoutChangeListener
+import android.view.ViewGroup
+import android.widget.ImageView
+import coil.size.Dimension
+import coil.size.Size
+import coil.size.SizeResolver
+import kotlin.coroutines.resume
+import kotlin.math.roundToInt
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+
+private const val ASPECT_RATIO_HEIGHT = 18f
+private const val ASPECT_RATIO_WIDTH = 13f
+
+class CoverSizeResolver(
+	private val imageView: ImageView,
+) : SizeResolver {
+
+	override suspend fun size(): Size {
+		getSize()?.let { return it }
+		return suspendCancellableCoroutine { cont ->
+			val layoutListener = LayoutListener(cont)
+			imageView.addOnLayoutChangeListener(layoutListener)
+			cont.invokeOnCancellation {
+				imageView.removeOnLayoutChangeListener(layoutListener)
+			}
+		}
+	}
+
+	private fun getSize(): Size? {
+		val lp = imageView.layoutParams
+		var width = getDimension(lp.width, imageView.width, imageView.paddingLeft + imageView.paddingRight)
+		var height = getDimension(lp.height, imageView.height, imageView.paddingTop + imageView.paddingBottom)
+		if (width == null && height == null) {
+			return null
+		}
+		if (height == null && width != null) {
+			height = Dimension((width.px * ASPECT_RATIO_HEIGHT / ASPECT_RATIO_WIDTH).roundToInt())
+		} else if (width == null && height != null) {
+			width = Dimension((height.px * ASPECT_RATIO_WIDTH / ASPECT_RATIO_HEIGHT).roundToInt())
+		}
+		return Size(checkNotNull(width), checkNotNull(height))
+	}
+
+	private fun getDimension(paramSize: Int, viewSize: Int, paddingSize: Int): Dimension.Pixels? {
+		if (paramSize == ViewGroup.LayoutParams.WRAP_CONTENT) {
+			return null
+		}
+		val insetParamSize = paramSize - paddingSize
+		if (insetParamSize > 0) {
+			return Dimension(insetParamSize)
+		}
+		val insetViewSize = viewSize - paddingSize
+		if (insetViewSize > 0) {
+			return Dimension(insetViewSize)
+		}
+		return null
+	}
+
+	private inner class LayoutListener(
+		private val continuation: CancellableContinuation<Size>,
+	) : OnLayoutChangeListener {
+
+		override fun onLayoutChange(
+			v: View,
+			left: Int,
+			top: Int,
+			right: Int,
+			bottom: Int,
+			oldLeft: Int,
+			oldTop: Int,
+			oldRight: Int,
+			oldBottom: Int,
+		) {
+			val size = getSize() ?: return
+			v.removeOnLayoutChangeListener(this)
+			continuation.resume(size)
+		}
+	}
+}

app/src/main/java/org/koitharu/kotatsu/utils/image/TrimTransformation.kt

@@ -1,11 +1,15 @@
 package org.koitharu.kotatsu.utils.image
 
 import android.graphics.Bitmap
-import androidx.core.graphics.get
+import androidx.annotation.ColorInt
+import androidx.core.graphics.*
 import coil.size.Size
 import coil.transform.Transformation
+import kotlin.math.abs
 
-class TrimTransformation : Transformation {
+class TrimTransformation(
+	private val tolerance: Int = 20,
+) : Transformation {
 
 	override val cacheKey: String = javaClass.name
 
@@ -20,7 +24,7 @@ class TrimTransformation : Transformation {
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (input[x, y] != prevColor) {
+				if (!isColorTheSame(input[x, y], prevColor)) {
 					isColBlank = false
 					break
 				}
@@ -39,7 +43,7 @@ class TrimTransformation : Transformation {
 			var isColBlank = true
 			val prevColor = input[x, 0]
 			for (y in 1 until input.height) {
-				if (input[x, y] != prevColor) {
+				if (!isColorTheSame(input[x, y], prevColor)) {
 					isColBlank = false
 					break
 				}
@@ -55,7 +59,7 @@ class TrimTransformation : Transformation {
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (input[x, y] != prevColor) {
+				if (!isColorTheSame(input[x, y], prevColor)) {
 					isRowBlank = false
 					break
 				}
@@ -71,7 +75,7 @@ class TrimTransformation : Transformation {
 			var isRowBlank = true
 			val prevColor = input[0, y]
 			for (x in 1 until input.width) {
-				if (input[x, y] != prevColor) {
+				if (!isColorTheSame(input[x, y], prevColor)) {
 					isRowBlank = false
 					break
 				}
@@ -93,4 +97,11 @@ class TrimTransformation : Transformation {
 	override fun equals(other: Any?) = other is TrimTransformation
 
 	override fun hashCode() = javaClass.hashCode()
+
+	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
+	}
 }

app/src/main/res/layout/activity_details.xml

@@ -29,6 +29,9 @@
 				android:layout_height="match_parent"
 				android:layout_gravity="center_horizontal"
 				android:background="@null"
+				android:clipChildren="false"
+				android:clipToPadding="false"
+				android:paddingHorizontal="@dimen/margin_normal"
 				app:tabGravity="center"
 				app:tabMode="scrollable" />
 

app/src/main/res/layout/activity_downloads.xml

@@ -48,7 +48,6 @@
 		android:gravity="center"
 		android:text="@string/text_downloads_holder"
 		android:textAppearance="?attr/textAppearanceBody2"
-		android:visibility="gone"
 		tools:visibility="visible" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/dialog_onboard.xml

@@ -23,6 +23,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
+		android:scrollIndicators="top|bottom"
 		android:scrollbars="vertical"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_source_locale" />

app/src/main/res/layout/item_download.xml

@@ -77,10 +77,10 @@
 		android:id="@+id/textView_percent"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="8dp"
 		android:textAppearance="?attr/textAppearanceBodyMedium"
 		app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
 		app:layout_constraintEnd_toEndOf="parent"
-		android:layout_marginEnd="8dp"
 		tools:text="25%" />
 
 	<TextView
@@ -98,4 +98,30 @@
 		app:layout_constraintTop_toBottomOf="@id/textView_status"
 		tools:text="@tools:sample/lorem[3]" />
 
+	<Button
+		android:id="@+id/button_cancel"
+		style="?buttonBarButtonStyle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:text="@android:string/cancel"
+		android:visibility="gone"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/textView_details"
+		tools:visibility="visible" />
+
+
+	<Button
+		android:id="@+id/button_resume"
+		style="?buttonBarButtonStyle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:text="@string/try_again"
+		android:visibility="gone"
+		app:layout_constraintEnd_toStartOf="@id/button_cancel"
+		app:layout_constraintTop_toBottomOf="@id/textView_details"
+		tools:visibility="visible" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_feed.xml

@@ -12,10 +12,9 @@
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
 		android:layout_width="42dp"
-		android:layout_height="0dp"
+		android:layout_height="42dp"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintDimensionRatio="h,1:1"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"

app/src/main/res/layout/item_manga_list.xml

@@ -12,10 +12,9 @@
 	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
 		android:layout_width="42dp"
-		android:layout_height="0dp"
+		android:layout_height="42dp"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintDimensionRatio="h,1:1"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"

app/src/main/res/layout/item_recent.xml

@@ -6,4 +6,4 @@
 	android:layout_width="@dimen/widget_cover_width"
 	android:layout_height="@dimen/widget_cover_height"
 	android:scaleType="centerCrop"
-	tools:ignore="ContentDescription" />
+	tools:ignore="ContentDescription" />