Option to retry captcha resolving

Currently translated at 100.0% (476 of 476 strings)

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

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 575
-		versionName = '6.0.2'
+		versionCode = 576
+		versionName = '6.0.3'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
@@ -81,7 +81,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:3a76504380') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:2f7e704e21') {
 		exclude group: 'org.json', module: 'json'
 	}
 

app/src/main/AndroidManifest.xml

@@ -139,6 +139,7 @@
 		<activity
 			android:name="org.koitharu.kotatsu.browser.cloudflare.CloudFlareActivity"
 			android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+			android:autoRemoveFromRecents="true"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.sources.auth.SourceAuthActivity"

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

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.browser.cloudflare
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import android.webkit.CookieManager
 import androidx.activity.result.contract.ActivityResultContract
@@ -13,6 +14,7 @@ import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
 import okhttp3.Headers
+import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.WebViewBackPressedCallback
@@ -38,7 +40,13 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		if (!catchingWebViewUnavailability { setContentView(ActivityBrowserBinding.inflate(layoutInflater)) }) {
+		if (!catchingWebViewUnavailability {
+				setContentView(
+					ActivityBrowserBinding.inflate(
+						layoutInflater
+					)
+				)
+			}) {
 			return
 		}
 		supportActionBar?.run {
@@ -86,6 +94,11 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 		viewBinding.webView.restoreState(savedInstanceState)
 	}
 
+	override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+		menuInflater.inflate(R.menu.opt_captcha, menu)
+		return super.onCreateOptionsMenu(menu)
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		viewBinding.appbar.updatePadding(
 			top = insets.top,
@@ -104,6 +117,16 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 			true
 		}
 
+		R.id.action_retry -> {
+			viewBinding.webView.stopLoading()
+			val targetUrl = intent?.dataString?.toHttpUrlOrNull()
+			if (targetUrl != null) {
+				clearCfCookies(targetUrl)
+				viewBinding.webView.loadUrl(targetUrl.toString())
+			}
+			true
+		}
+
 		else -> super.onOptionsItemSelected(item)
 	}
 
@@ -141,7 +164,15 @@ class CloudFlareActivity : BaseActivity<ActivityBrowserBinding>(), CloudFlareCal
 
 	override fun onTitleChanged(title: CharSequence, subtitle: CharSequence?) {
 		setTitle(title)
-		supportActionBar?.subtitle = subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
+		supportActionBar?.subtitle =
+			subtitle?.toString()?.toHttpUrlOrNull()?.topPrivateDomain() ?: subtitle
+	}
+
+	private fun clearCfCookies(url: HttpUrl) {
+		cookieJar.removeCookies(url) { cookie ->
+			val name = cookie.name
+			name.startsWith("cf_") || name.startsWith("_cf") || name.startsWith("__cf")
+		}
 	}
 
 	class Contract : ActivityResultContract<Pair<String, Headers?>, TaggedActivityResult>() {

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

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.core.network.cookies
 
 import android.webkit.CookieManager
 import androidx.annotation.WorkerThread
+import androidx.core.util.Predicate
 import okhttp3.Cookie
 import okhttp3.HttpUrl
 import org.koitharu.kotatsu.core.util.ext.newBuilder
@@ -31,13 +32,16 @@ class AndroidCookieJar : MutableCookieJar {
 		}
 	}
 
-	override fun removeCookies(url: HttpUrl) {
+	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
 		val cookies = loadForRequest(url)
 		if (cookies.isEmpty()) {
 			return
 		}
 		val urlString = url.toString()
 		for (c in cookies) {
+			if (predicate != null && !predicate.test(c)) {
+				continue
+			}
 			val nc = c.newBuilder()
 				.expiresAt(System.currentTimeMillis() - 100000)
 				.build()

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

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.core.network.cookies
 
 import androidx.annotation.WorkerThread
+import androidx.core.util.Predicate
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
@@ -14,7 +15,7 @@ interface MutableCookieJar : CookieJar {
 	override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>)
 
 	@WorkerThread
-	fun removeCookies(url: HttpUrl)
+	fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?)
 
 	suspend fun clear(): Boolean
 }

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

@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import androidx.collection.ArrayMap
 import androidx.core.content.edit
+import androidx.core.util.Predicate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.Cookie
@@ -57,12 +58,14 @@ class PreferencesCookieJar(
 
 	@Synchronized
 	@WorkerThread
-	override fun removeCookies(url: HttpUrl) {
+	override fun removeCookies(url: HttpUrl, predicate: Predicate<Cookie>?) {
 		loadPersistent()
 		val toRemove = HashSet<String>()
 		for ((key, cookie) in cache) {
 			if (cookie.isExpired() || cookie.cookie.matches(url)) {
-				toRemove += key
+				if (predicate == null || predicate.test(cookie.cookie)) {
+					toRemove += key
+				}
 			}
 		}
 		if (toRemove.isNotEmpty()) {

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

@@ -5,20 +5,19 @@ import android.os.Build
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.core.content.ContextCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import androidx.viewbinding.ViewBinding
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.util.SystemUiController
 
 abstract class BaseFullscreenActivity<B : ViewBinding> :
 	BaseActivity<B>() {
 
-	private lateinit var insetsControllerCompat: WindowInsetsControllerCompat
+	protected lateinit var systemUiController: SystemUiController
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		with(window) {
-			insetsControllerCompat = WindowInsetsControllerCompat(this, decorView)
+			systemUiController = SystemUiController(this)
 			statusBarColor = Color.TRANSPARENT
 			navigationBarColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
 				ContextCompat.getColor(this@BaseFullscreenActivity, R.color.dim)
@@ -30,15 +29,7 @@ abstract class BaseFullscreenActivity<B : ViewBinding> :
 					WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 			}
 		}
-		insetsControllerCompat.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-		showSystemUI()
-	}
-
-	protected fun hideSystemUI() {
-		insetsControllerCompat.hide(WindowInsetsCompat.Type.systemBars())
-	}
-
-	protected fun showSystemUI() {
-		insetsControllerCompat.show(WindowInsetsCompat.Type.systemBars())
+		// insetsControllerCompat.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+		systemUiController.setSystemUiVisible(true)
 	}
 }

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

@@ -0,0 +1,60 @@
+package org.koitharu.kotatsu.core.ui.util
+
+import android.os.Build
+import android.view.View
+import android.view.Window
+import android.view.WindowInsets
+import android.view.WindowInsetsController
+import androidx.annotation.RequiresApi
+
+sealed class SystemUiController(
+	protected val window: Window,
+) {
+
+	abstract fun setSystemUiVisible(value: Boolean)
+
+	@RequiresApi(Build.VERSION_CODES.S)
+	private class Api30Impl(window: Window) : SystemUiController(window) {
+
+		private val insetsController = checkNotNull(window.decorView.windowInsetsController)
+
+		override fun setSystemUiVisible(value: Boolean) {
+			if (value) {
+				insetsController.show(WindowInsets.Type.systemBars())
+				insetsController.systemBarsBehavior = WindowInsetsController.BEHAVIOR_DEFAULT
+			} else {
+				insetsController.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+				insetsController.hide(WindowInsets.Type.systemBars())
+			}
+		}
+	}
+
+	@Suppress("DEPRECATION")
+	private class LegacyImpl(window: Window) : SystemUiController(window) {
+
+		override fun setSystemUiVisible(value: Boolean) {
+			window.decorView.systemUiVisibility = if (value) {
+				View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+						View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+						View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+			} else {
+				View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
+						View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
+						View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+						View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+						View.SYSTEM_UI_FLAG_FULLSCREEN or
+						View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+			}
+		}
+	}
+
+	companion object {
+
+		operator fun invoke(window: Window): SystemUiController =
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+				Api30Impl(window)
+			} else {
+				LegacyImpl(window)
+			}
+	}
+}

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

@@ -16,8 +16,10 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.fs.FileSequence
 import java.io.File
 import java.io.FileFilter
+import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
+import kotlin.io.path.readAttributes
 
 fun File.subdir(name: String) = File(this, name).also {
 	if (!it.exists()) it.mkdirs()
@@ -99,3 +101,10 @@ private suspend fun SequenceScope<File>.listFilesRecursiveImpl(root: File, filte
 fun File.children() = FileSequence(this)
 
 fun Sequence<File>.filterWith(filter: FileFilter): Sequence<File> = filter { f -> filter.accept(f) }
+
+val File.creationTime
+	get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+		toPath().readAttributes<BasicFileAttributes>().creationTime().toMillis()
+	} else {
+		lastModified()
+	}

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

@@ -27,6 +27,7 @@ import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 
 private const val MSG_NO_SPACE_LEFT = "No space left on device"
+private const val IMAGE_FORMAT_NO_SUPPORTED = "Image format not supported"
 
 fun Throwable.getDisplayMessage(resources: Resources): String = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
@@ -81,6 +82,7 @@ private fun getHttpDisplayMessage(statusCode: Int, resources: Resources): String
 private fun getDisplayMessage(msg: String?, resources: Resources): String? = when {
 	msg.isNullOrEmpty() -> null
 	msg.contains(MSG_NO_SPACE_LEFT) -> resources.getString(R.string.error_no_space_left)
+	msg.contains(IMAGE_FORMAT_NO_SUPPORTED) -> resources.getString(R.string.error_corrupted_file)
 	else -> null
 }
 

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

@@ -67,7 +67,7 @@ class FavouriteCategoriesActivity :
 			attachToRecyclerView(viewBinding.recyclerView)
 		}
 
-		viewModel.categories.observe(this, ::onCategoriesChanged)
+		viewModel.content.observe(this, ::onCategoriesChanged)
 		viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
 	}
 

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

@@ -1,21 +1,20 @@
 package org.koitharu.kotatsu.favourites.ui.categories
 
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.requireValue
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.domain.model.Cover
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
+import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.list.ui.model.LoadingState
 import org.koitharu.kotatsu.parsers.util.move
 import javax.inject.Inject
@@ -28,26 +27,17 @@ class FavouritesCategoriesViewModel @Inject constructor(
 
 	private var reorderJob: Job? = null
 
-	val categories = repository.observeCategoriesWithCovers()
-		.map { list ->
-			list.map { (category, covers) ->
-				CategoryListModel(
-					mangaCount = covers.size,
-					covers = covers.take(3),
-					category = category,
-					isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
-				)
-			}.ifEmpty {
-				listOf(
-					EmptyState(
-						icon = R.drawable.ic_empty_favourites,
-						textPrimary = R.string.text_empty_holder_primary,
-						textSecondary = R.string.empty_favourite_categories,
-						actionStringRes = 0,
-					),
-				)
-			}
-		}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
+	val content = MutableStateFlow<List<ListModel>>(listOf(LoadingState))
+
+	init {
+		launchJob(Dispatchers.Default) {
+			repository.observeCategoriesWithCovers()
+				.collectLatest {
+					reorderJob?.join()
+					updateContent(it)
+				}
+		}
+	}
 
 	fun deleteCategories(ids: Set<Long>) {
 		launchJob(Dispatchers.Default) {
@@ -59,14 +49,15 @@ class FavouritesCategoriesViewModel @Inject constructor(
 		settings.isAllFavouritesVisible = isVisible
 	}
 
-	fun isEmpty(): Boolean = categories.value.none { it is CategoryListModel }
+	fun isEmpty(): Boolean = content.value.none { it is CategoryListModel }
 
 	fun reorderCategories(oldPos: Int, newPos: Int) {
 		val prevJob = reorderJob
 		reorderJob = launchJob(Dispatchers.Default) {
 			prevJob?.join()
-			val snapshot = categories.requireValue().toMutableList()
+			val snapshot = content.requireValue().toMutableList()
 			snapshot.move(oldPos, newPos)
+			content.value = snapshot
 			val ids = snapshot.mapNotNullTo(ArrayList(snapshot.size)) {
 				(it as? CategoryListModel)?.category?.id
 			}
@@ -83,9 +74,29 @@ class FavouritesCategoriesViewModel @Inject constructor(
 	}
 
 	fun getCategories(ids: Set<Long>): ArrayList<FavouriteCategory> {
-		val items = categories.requireValue()
+		val items = content.requireValue()
 		return items.mapNotNullTo(ArrayList(ids.size)) { item ->
 			(item as? CategoryListModel)?.category?.takeIf { it.id in ids }
 		}
 	}
+
+	private fun updateContent(categories: Map<FavouriteCategory, List<Cover>>) {
+		content.value = categories.map { (category, covers) ->
+			CategoryListModel(
+				mangaCount = covers.size,
+				covers = covers.take(3),
+				category = category,
+				isTrackerEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources,
+			)
+		}.ifEmpty {
+			listOf(
+				EmptyState(
+					icon = R.drawable.ic_empty_favourites,
+					textPrimary = R.string.text_empty_holder_primary,
+					textSecondary = R.string.empty_favourite_categories,
+					actionStringRes = 0,
+				),
+			)
+		}
+	}
 }

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

@@ -5,6 +5,7 @@ import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import org.koitharu.kotatsu.core.util.AlphanumComparator
+import org.koitharu.kotatsu.core.util.ext.creationTime
 import org.koitharu.kotatsu.core.util.ext.listFilesRecursive
 import org.koitharu.kotatsu.core.util.ext.longHashCode
 import org.koitharu.kotatsu.core.util.ext.toListSorted
@@ -62,7 +63,7 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) {
 					name = f.nameWithoutExtension.toHumanReadable(),
 					number = i + 1,
 					source = MangaSource.LOCAL,
-					uploadDate = f.lastModified(),
+					uploadDate = f.creationTime,
 					url = f.toUri().toString(),
 					scanlator = null,
 					branch = null,

app/src/main/kotlin/org/koitharu/kotatsu/local/domain/model/LocalManga.kt

@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.local.domain.model
 
 import androidx.core.net.toFile
 import androidx.core.net.toUri
+import org.koitharu.kotatsu.core.util.ext.creationTime
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import java.io.File
@@ -15,7 +16,7 @@ data class LocalManga(
 		private set
 		get() {
 			if (field == -1L) {
-				field = file.lastModified()
+				field = file.creationTime
 			}
 			return field
 		}

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

@@ -44,6 +44,7 @@ import org.koitharu.kotatsu.core.util.GridTouchHelper
 import org.koitharu.kotatsu.core.util.IdlingDetector
 import org.koitharu.kotatsu.core.util.ShareHelper
 import org.koitharu.kotatsu.core.util.ext.hasGlobalPoint
+import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
 import org.koitharu.kotatsu.core.util.ext.isRtl
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
@@ -309,22 +310,20 @@ class ReaderActivity :
 
 	private fun setUiIsVisible(isUiVisible: Boolean) {
 		if (viewBinding.appbarTop.isVisible != isUiVisible) {
-			val transition = TransitionSet()
-				.setOrdering(TransitionSet.ORDERING_TOGETHER)
-				.addTransition(Slide(Gravity.TOP).addTarget(viewBinding.appbarTop))
-				.addTransition(Fade().addTarget(viewBinding.infoBar))
-			viewBinding.appbarBottom?.let { bottomBar ->
-				transition.addTransition(Slide(Gravity.BOTTOM).addTarget(bottomBar))
+			if (isAnimationsEnabled) {
+				val transition = TransitionSet()
+					.setOrdering(TransitionSet.ORDERING_TOGETHER)
+					.addTransition(Slide(Gravity.TOP).addTarget(viewBinding.appbarTop))
+					.addTransition(Fade().addTarget(viewBinding.infoBar))
+				viewBinding.appbarBottom?.let { bottomBar ->
+					transition.addTransition(Slide(Gravity.BOTTOM).addTarget(bottomBar))
+				}
+				TransitionManager.beginDelayedTransition(viewBinding.root, transition)
 			}
-			TransitionManager.beginDelayedTransition(viewBinding.root, transition)
 			viewBinding.appbarTop.isVisible = isUiVisible
 			viewBinding.appbarBottom?.isVisible = isUiVisible
 			viewBinding.infoBar.isGone = isUiVisible || (!viewModel.isInfoBarEnabled.value)
-			if (isUiVisible) {
-				showSystemUI()
-			} else {
-				hideSystemUI()
-			}
+			systemUiController.setSystemUiVisible(isUiVisible)
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourceSettingsViewModel.kt

@@ -49,7 +49,7 @@ class SourceSettingsViewModel @Inject constructor(
 				.scheme("https")
 				.host(repository.domain)
 				.build()
-			cookieJar.removeCookies(url)
+			cookieJar.removeCookies(url, null)
 			onActionDone.call(ReversibleAction(R.string.cookies_cleared, null))
 			loadUsername()
 		}

app/src/main/kotlin/org/koitharu/kotatsu/settings/sources/SourcesManageViewModel.kt

@@ -2,17 +2,12 @@ package org.koitharu.kotatsu.settings.sources
 
 import androidx.annotation.CheckResult
 import androidx.core.os.LocaleListCompat
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.getLocaleTitle
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -46,32 +41,39 @@ class SourcesManageViewModel @Inject constructor(
 	private val expandedGroups = MutableStateFlow(emptySet<String?>())
 	private var searchQuery = MutableStateFlow<String?>(null)
 	private var reorderJob: Job? = null
-
-	val content = combine(
-		repository.observeEnabledSources(),
-		expandedGroups,
-		searchQuery,
-		observeTip(),
-		settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) { isNsfwContentDisabled },
-	) { sources, groups, query, tip, noNsfw ->
-		buildList(sources, groups, query, tip, noNsfw)
-	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
-
+	val content = MutableStateFlow<List<SourceConfigItem>>(emptyList())
 	val onActionDone = MutableEventFlow<ReversibleAction>()
 
+	init {
+		launchJob(Dispatchers.Default) {
+			combine(
+				repository.observeEnabledSources(),
+				expandedGroups,
+				searchQuery,
+				observeTip(),
+				settings.observeAsFlow(AppSettings.KEY_DISABLE_NSFW) { isNsfwContentDisabled },
+			) { sources, groups, query, tip, noNsfw ->
+				buildList(sources, groups, query, tip, noNsfw)
+			}.collectLatest {
+				reorderJob?.join()
+				content.value = it
+			}
+		}
+	}
+
 	fun reorderSources(oldPos: Int, newPos: Int) {
 		val snapshot = content.value.toMutableList()
 		val prevJob = reorderJob
 		reorderJob = launchJob(Dispatchers.Default) {
-			prevJob?.cancelAndJoin()
 			if ((snapshot[oldPos] as? SourceConfigItem.SourceItem)?.isDraggable != true) {
 				return@launchJob
 			}
 			if ((snapshot[newPos] as? SourceConfigItem.SourceItem)?.isDraggable != true) {
 				return@launchJob
 			}
-			delay(100)
 			snapshot.move(oldPos, newPos)
+			content.value = snapshot
+			prevJob?.join()
 			val newSourcesList = snapshot.mapNotNull { x ->
 				if (x is SourceConfigItem.SourceItem && x.isDraggable) {
 					x.source

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

@@ -110,21 +110,26 @@ class Tracker @Inject constructor(
 	private fun compare(track: MangaTracking, manga: Manga, branch: String?): MangaUpdates.Success {
 		if (track.isEmpty()) {
 			// first check or manga was empty on last check
-			return MangaUpdates.Success(manga, emptyList(), isValid = false)
+			return MangaUpdates.Success(manga, emptyList(), isValid = false, channelId = null)
 		}
 		val chapters = requireNotNull(manga.getChapters(branch))
 		val newChapters = chapters.takeLastWhile { x -> x.id != track.lastChapterId }
 		return when {
 			newChapters.isEmpty() -> {
-				MangaUpdates.Success(manga, emptyList(), isValid = chapters.lastOrNull()?.id == track.lastChapterId)
+				MangaUpdates.Success(
+					manga = manga,
+					newChapters = emptyList(),
+					isValid = chapters.lastOrNull()?.id == track.lastChapterId,
+					channelId = null
+				)
 			}
 
 			newChapters.size == chapters.size -> {
-				MangaUpdates.Success(manga, emptyList(), isValid = false)
+				MangaUpdates.Success(manga, emptyList(), isValid = false, channelId = null)
 			}
 
 			else -> {
-				MangaUpdates.Success(manga, newChapters, isValid = true)
+				MangaUpdates.Success(manga, newChapters, isValid = true, channelId = null)
 			}
 		}
 	}

app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/model/MangaUpdates.kt

@@ -8,16 +8,17 @@ sealed interface MangaUpdates {
 
 	val manga: Manga
 
-	class Success(
+	data class Success(
 		override val manga: Manga,
 		val newChapters: List<MangaChapter>,
 		val isValid: Boolean,
+		val channelId: String?,
 	) : MangaUpdates {
 
 		fun isNotEmpty() = newChapters.isNotEmpty()
 	}
 
-	class Failure(
+	data class Failure(
 		override val manga: Manga,
 		val error: Throwable?,
 	) : MangaUpdates {

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

@@ -39,6 +39,7 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runInterruptible
@@ -148,19 +149,9 @@ class TrackWorker @AssistedInject constructor(
 						send(
 							runCatchingCancellable {
 								tracker.fetchUpdates(track, commit = true)
+									.copy(channelId = channelId)
 							}.onFailure { e ->
-								if (e is CloudFlareProtectedException) {
-									CaptchaNotifier(applicationContext).notify(e)
-								}
 								logger.log("checkUpdatesAsync", e)
-							}.onSuccess { updates ->
-								if (updates.isValid && updates.isNotEmpty()) {
-									showNotification(
-										manga = updates.manga,
-										channelId = channelId,
-										newChapters = updates.newChapters,
-									)
-								}
 							}.getOrElse { error ->
 								MangaUpdates.Failure(
 									manga = track.manga,
@@ -171,10 +162,33 @@ class TrackWorker @AssistedInject constructor(
 					}
 				}
 			}
+		}.onEach {
+			when (it) {
+				is MangaUpdates.Failure -> {
+					val e = it.error
+					if (e is CloudFlareProtectedException) {
+						CaptchaNotifier(applicationContext).notify(e)
+					}
+				}
+
+				is MangaUpdates.Success -> {
+					if (it.isValid && it.isNotEmpty()) {
+						showNotification(
+							manga = it.manga,
+							channelId = it.channelId,
+							newChapters = it.newChapters,
+						)
+					}
+				}
+			}
 		}.toList(ArrayList(tracks.size))
 	}
 
-	private suspend fun showNotification(manga: Manga, channelId: String?, newChapters: List<MangaChapter>) {
+	private suspend fun showNotification(
+		manga: Manga,
+		channelId: String?,
+		newChapters: List<MangaChapter>,
+	) {
 		if (newChapters.isEmpty() || channelId == null || !applicationContext.checkNotificationPermission()) {
 			return
 		}
@@ -239,7 +253,10 @@ class TrackWorker @AssistedInject constructor(
 
 	override suspend fun getForegroundInfo(): ForegroundInfo {
 		val title = applicationContext.getString(R.string.check_for_new_chapters)
-		val channel = NotificationChannelCompat.Builder(WORKER_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+		val channel = NotificationChannelCompat.Builder(
+			WORKER_CHANNEL_ID,
+			NotificationManagerCompat.IMPORTANCE_LOW
+		)
 			.setName(title)
 			.setShowBadge(false)
 			.setVibrationEnabled(false)
@@ -260,7 +277,11 @@ class TrackWorker @AssistedInject constructor(
 			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_DEFERRED)
 			.build()
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			ForegroundInfo(WORKER_NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+			ForegroundInfo(
+				WORKER_NOTIFICATION_ID,
+				notification,
+				ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+			)
 		} else {
 			ForegroundInfo(WORKER_NOTIFICATION_ID, notification)
 		}
@@ -320,7 +341,8 @@ class TrackWorker @AssistedInject constructor(
 		}
 
 		fun startNow() {
-			val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
+			val constraints =
+				Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
 			val request = OneTimeWorkRequestBuilder<TrackWorker>()
 				.setConstraints(constraints)
 				.addTag(TAG_ONESHOT)

app/src/main/res/menu/opt_captcha.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/action_retry"
+		android:title="@string/try_again"
+		app:showAsAction="never" />
+
+</menu>

app/src/main/res/values-be/strings.xml

@@ -471,4 +471,5 @@
     <string name="related_manga_summary">Паказаць спіс звязанай мангі. У некаторых выпадках ён можа быць недакладным або адсутнічаць</string>
     <string name="advanced">Пашыраныя</string>
     <string name="default_section">Раздзел па змаўчанні</string>
+    <string name="manga_list">Спіс мангі</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -330,7 +330,7 @@
     <string name="reader_control_ltr_summary">Нажатие на правый край или нажатие правой клавиши всегда переключает на следующую страницу</string>
     <string name="reader_control_ltr">Эргономичное управление режимом чтения</string>
     <string name="reset">Сбросить</string>
-    <string name="discard">Отменить</string>
+    <string name="discard">Отклонить</string>
     <string name="text_unsaved_changes_prompt">Сохранить или отменить несохранённые изменения\?</string>
     <string name="contrast">Контрастность</string>
     <string name="brightness">Яркость</string>

app/src/main/res/values-th/strings.xml

@@ -114,7 +114,7 @@
     <string name="computing_">กำลังคำนวน…</string>
     <string name="create_shortcut">สร้าง shortcut…</string>
     <string name="sort_order">เรียวตามลำดับ</string>
-    <string name="enable">เปิดการใช้งาน</string>
+    <string name="enable">เปิดใช้งาน</string>
     <string name="downloads_removed">การดาวน์โหลดชองคุณได้ถูกลบแล้ว</string>
     <string name="downloads_cancelled">การดาวน์โหลดของคุณได้ถูกยกเลิกแล้ว</string>
     <string name="downloaded">ดาวน์โหลดแล้ว</string>
@@ -215,7 +215,7 @@
     <string name="screenshots_block_nsfw">บล็อกบน NSFW</string>
     <string name="screenshots_block_all">บล็อกตลอด</string>
     <string name="suggestions">คําแนะนํา</string>
-    <string name="suggestions_enable">เปิดใช้งานคำแนะนำ</string>
+    <string name="suggestions_enable">เปิดใช้คำแนะนำ</string>
     <string name="manga_shelf">ชั้น</string>
     <string name="not_available">ไม่สามารถใช้ได้</string>
     <string name="backup_information">คุณสามารถสํารองข้อมูลประวัติและรายการโปรดและกู้คืน</string>
@@ -231,4 +231,42 @@
     <string name="about_app_translation">การแปล</string>
     <string name="auth_complete">ได้รับอนุญาต</string>
     <string name="default_mode">โหมดเริ่มต้น</string>
+    <string name="new_sources_text">มีแหล่งมังงะใหม่ให้เลือก</string>
+    <string name="crash_text">มีบางอย่างผิดพลาด. กรุณารายงานข้อผิดพลาดไปยังนักพัฒนาเพื่อแก้ไข</string>
+    <string name="reader_mode_hint">การตั้งค่าที่ตั้งไว้จะถูกบันทึกไว้สำหรับมังงะเรื่องนี้</string>
+    <string name="suggestions_summary">แนะนำมังงะตามความต้องการของคุณ</string>
+    <string name="text_suggestion_holder">เริ่มอ่านมังงะแล้วคุณจะได้รับการแนะนำมังงะตามความชอบของคุณ</string>
+    <string name="exclude_nsfw_from_suggestions">อย่าแนะนำมังงะ NSFW</string>
+    <string name="reset_filter">รีเซ็ตการกรอง</string>
+    <string name="onboard_text">เลือกภาษาที่คุณต้องการอ่านมังงะ คุณสามารถเปลี่ยนได้ในภายหลังในการตั้งค่า</string>
+    <string name="never">ไม่เคย</string>
+    <string name="only_using_wifi">ใช้ Wi-Fi เท่านั้น</string>
+    <string name="always">ตลอด</string>
+    <string name="preload_pages">โหลดหน้าล่วงหน้า</string>
+    <string name="nsfw">18+</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="text_delete_local_manga_batch">ลบรายการที่เลือกออกจากอุปกรณ์อย่างถาวรไหม\?</string>
+    <string name="removal_completed">การลบเสร็จสมบูรณ์</string>
+    <string name="download_slowdown_summary">ช่วยหลีกเลี่ยงการบล็อก IP ของคุณ</string>
+    <string name="canceled">ยกเลิก</string>
+    <string name="account_already_exists">บัญชีนี้มีอยู่แล้ว</string>
+    <string name="back">กลับ</string>
+    <string name="enabled">เปิดใช้งานแล้ว</string>
+    <string name="disabled">ปิดการใช้งานแล้ว</string>
+    <string name="sync_title">ซิงค์ข้อมูลของคุณ</string>
+    <string name="email_enter_hint">กรอกอีเมลของคุณเพื่อดำเนินการต่อ</string>
+    <string name="hide">ซ่อน</string>
+    <string name="notifications_enable">เปิดการแจ้งเตือน</string>
+    <string name="name">ชื่อ</string>
+    <string name="edit">แก้ไข</string>
+    <string name="undo">ย้อนกลับ</string>
+    <string name="disable_battery_optimization">ปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่</string>
+    <string name="disable_battery_optimization_summary">ช่วยในการตรวจสอบการอัปเดตพื้นหลัง</string>
+    <string name="send">ส่ง</string>
+    <string name="status_reading">กำลังอ่าน</string>
+    <string name="status_re_reading">อ่านซ้ำ</string>
+    <string name="status_completed">อ่านเสร็จแล้ว</string>
+    <string name="status_on_hold">พักไว้</string>
+    <string name="disable_all">ปิดการใช้งานทั้งหมด</string>
+    <string name="report">รีพอร์ต</string>
 </resources>

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

@@ -478,4 +478,5 @@
 	<string name="advanced">Advanced</string>
 	<string name="default_section">Default section</string>
 	<string name="manga_list">Manga list</string>
+	<string name="error_corrupted_file">Invalid data is returned or file is corrupted</string>
 </resources>