Fix recursive sync

Currently translated at 82.0% (357 of 435 strings)

Co-authored-by: qrynill <tryvseu@tuta.io>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/nn/
Translation: Kotatsu/Strings

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 552
-		versionName '5.2'
+		versionCode 555
+		versionName '5.2.3'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -79,7 +79,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:f732582d55') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:86a82970fc') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -104,6 +104,7 @@ dependencies {
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.6.1'
 
+	// TODO https://issuetracker.google.com/issues/254846063
 	implementation 'androidx.work:work-runtime-ktx:2.8.1'
 	//noinspection GradleDependency
 	implementation('com.google.guava:guava:32.0.0-android') {

app/src/main/AndroidManifest.xml

@@ -188,8 +188,7 @@
 		<service
 			android:name="org.koitharu.kotatsu.sync.ui.favourites.FavouritesSyncService"
 			android:exported="false"
-			android:label="@string/favourites"
-			android:process=":sync">
+			android:label="@string/favourites">
 			<intent-filter>
 				<action android:name="android.content.SyncAdapter" />
 			</intent-filter>
@@ -200,8 +199,7 @@
 		<service
 			android:name="org.koitharu.kotatsu.sync.ui.history.HistorySyncService"
 			android:exported="false"
-			android:label="@string/history"
-			android:process=":sync">
+			android:label="@string/history">
 			<intent-filter>
 				<action android:name="android.content.SyncAdapter" />
 			</intent-filter>

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

@@ -12,6 +12,7 @@ import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ACRA
 import org.acra.ReportField
 import org.acra.config.dialog
 import org.acra.config.httpSender
@@ -19,6 +20,7 @@ import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 import org.acra.sender.HttpSender
 import org.koitharu.kotatsu.core.db.MangaDatabase
+import org.koitharu.kotatsu.core.os.AppValidator
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.WorkServiceStopHelper
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
@@ -26,6 +28,7 @@ import org.koitharu.kotatsu.local.data.LocalMangaRepository
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.settings.work.WorkScheduleManager
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -46,8 +49,15 @@ class KotatsuApp : Application(), Configuration.Provider {
 	@Inject
 	lateinit var workerFactory: HiltWorkerFactory
 
+	@Inject
+	lateinit var appValidator: AppValidator
+
+	@Inject
+	lateinit var workScheduleManager: WorkScheduleManager
+
 	override fun onCreate() {
 		super.onCreate()
+		ACRA.errorReporter.putCustomData("isOriginalApp", appValidator.isOriginalApp.toString())
 		if (BuildConfig.DEBUG) {
 			enableStrictMode()
 		}
@@ -57,6 +67,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 		processLifecycleScope.launch(Dispatchers.Default) {
 			setupDatabaseObservers()
 		}
+		workScheduleManager.init()
 		WorkServiceStopHelper(applicationContext).setup()
 	}
 
@@ -90,6 +101,7 @@ class KotatsuApp : Application(), Configuration.Provider {
 				ReportField.CUSTOM_DATA,
 				ReportField.SHARED_PREFERENCES,
 			)
+
 			dialog {
 				text = getString(R.string.crash_text)
 				title = getString(R.string.error_occurred)

app/src/main/kotlin/org/koitharu/kotatsu/core/github/AppUpdateRepository.kt

@@ -1,9 +1,5 @@
 package org.koitharu.kotatsu.core.github
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -14,28 +10,22 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.network.BaseHttpClient
+import org.koitharu.kotatsu.core.os.AppValidator
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.asArrayList
 import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.parsers.util.await
-import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.parsers.util.json.mapJSONNotNull
 import org.koitharu.kotatsu.parsers.util.parseJsonArray
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
-import java.io.ByteArrayInputStream
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
 import javax.inject.Inject
 import javax.inject.Singleton
 
-private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
 private const val CONTENT_TYPE_APK = "application/vnd.android.package-archive"
 
 @Singleton
 class AppUpdateRepository @Inject constructor(
-	@ApplicationContext private val context: Context,
+	private val appValidator: AppValidator,
 	private val settings: AppSettings,
 	@BaseHttpClient private val okHttp: OkHttpClient,
 ) {
@@ -85,7 +75,7 @@ class AppUpdateRepository @Inject constructor(
 	}
 
 	fun isUpdateSupported(): Boolean {
-		return BuildConfig.DEBUG || getCertificateSHA1Fingerprint() == CERT_SHA1
+		return BuildConfig.DEBUG || appValidator.isOriginalApp
 	}
 
 	suspend fun getCurrentVersionChangelog(): String? {
@@ -94,22 +84,6 @@ class AppUpdateRepository @Inject constructor(
 		return available.find { x -> x.versionId == currentVersion }?.description
 	}
 
-	@Suppress("DEPRECATION")
-	@SuppressLint("PackageManagerGetSignatures")
-	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
-		val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
-		val signatures = requireNotNull(packageInfo?.signatures)
-		val cert: ByteArray = signatures.first().toByteArray()
-		val input: InputStream = ByteArrayInputStream(cert)
-		val cf = CertificateFactory.getInstance("X509")
-		val c = cf.generateCertificate(input) as X509Certificate
-		val md: MessageDigest = MessageDigest.getInstance("SHA1")
-		val publicKey: ByteArray = md.digest(c.encoded)
-		return publicKey.byte2HexFormatted()
-	}.onFailure { error ->
-		error.printStackTraceDebug()
-	}.getOrNull()
-
 	private inline fun JSONArray.find(predicate: (JSONObject) -> Boolean): JSONObject? {
 		val size = length()
 		for (i in 0 until size) {

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

@@ -41,6 +41,10 @@ class ParcelableManga(
 		return 0
 	}
 
+	override fun toString(): String {
+		return "ParcelableManga(manga=$manga, withChapters=$withChapters)"
+	}
+
 	companion object CREATOR : Parcelable.Creator<ParcelableManga> {
 		override fun createFromParcel(parcel: Parcel): ParcelableManga {
 			return ParcelableManga(parcel)

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

@@ -23,6 +23,10 @@ class ParcelableMangaChapters(
 		return 0
 	}
 
+	override fun toString(): String {
+		return "ParcelableMangaChapters(chapters=$chapters)"
+	}
+
 	companion object CREATOR : Parcelable.Creator<ParcelableMangaChapters> {
 		override fun createFromParcel(parcel: Parcel): ParcelableMangaChapters {
 			return ParcelableMangaChapters(parcel)

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

@@ -23,6 +23,10 @@ class ParcelableMangaPages(
 		return 0
 	}
 
+	override fun toString(): String {
+		return "ParcelableMangaPages(pages=$pages)"
+	}
+
 	companion object CREATOR : Parcelable.Creator<ParcelableMangaPages> {
 		override fun createFromParcel(parcel: Parcel): ParcelableMangaPages {
 			return ParcelableMangaPages(parcel)

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

@@ -24,6 +24,10 @@ class ParcelableMangaTags(
 		return 0
 	}
 
+	override fun toString(): String {
+		return "ParcelableMangaTags(tags=$tags)"
+	}
+
 	companion object CREATOR : Parcelable.Creator<ParcelableMangaTags> {
 		override fun createFromParcel(parcel: Parcel): ParcelableMangaTags {
 			return ParcelableMangaTags(parcel)

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

@@ -13,13 +13,13 @@ private const val SERVER_CLOUDFLARE = "cloudflare"
 class CloudFlareInterceptor : Interceptor {
 
 	override fun intercept(chain: Interceptor.Chain): Response {
-		val request = chain.request()
-		val response = chain.proceed(request)
+		val response = chain.proceed(chain.request())
 		if (response.code == HTTP_FORBIDDEN || response.code == HTTP_UNAVAILABLE) {
 			if (response.header(HEADER_SERVER)?.startsWith(SERVER_CLOUDFLARE) == true) {
+				val request = response.request
 				response.closeQuietly()
 				throw CloudFlareProtectedException(
-					url = response.request.url.toString(),
+					url = request.url.toString(),
 					headers = request.headers,
 				)
 			}

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

@@ -0,0 +1,46 @@
+package org.koitharu.kotatsu.core.os
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import dagger.hilt.android.qualifiers.ApplicationContext
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
+import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppValidator @Inject constructor(
+	@ApplicationContext private val context: Context,
+) {
+
+	val isOriginalApp by lazy {
+		getCertificateSHA1Fingerprint() == CERT_SHA1
+	}
+
+	@Suppress("DEPRECATION")
+	@SuppressLint("PackageManagerGetSignatures")
+	private fun getCertificateSHA1Fingerprint(): String? = runCatching {
+		val packageInfo = context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES)
+		val signatures = requireNotNull(packageInfo?.signatures)
+		val cert: ByteArray = signatures.first().toByteArray()
+		val input: InputStream = ByteArrayInputStream(cert)
+		val cf = CertificateFactory.getInstance("X509")
+		val c = cf.generateCertificate(input) as X509Certificate
+		val md: MessageDigest = MessageDigest.getInstance("SHA1")
+		val publicKey: ByteArray = md.digest(c.encoded)
+		return publicKey.byte2HexFormatted()
+	}.onFailure { error ->
+		error.printStackTraceDebug()
+	}.getOrNull()
+
+	private companion object {
+
+		private const val CERT_SHA1 = "2C:19:C7:E8:07:61:2B:8E:94:51:1B:FD:72:67:07:64:5D:C2:58:AE"
+	}
+}

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

@@ -13,6 +13,7 @@ import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import java.util.WeakHashMap
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,31 +21,40 @@ import javax.inject.Singleton
 class AcraScreenLogger @Inject constructor() : FragmentLifecycleCallbacks(), DefaultActivityLifecycleCallbacks {
 
 	private val timeFormat = SimpleDateFormat.getTimeInstance(DateFormat.DEFAULT, Locale.ROOT)
+	private val keys = WeakHashMap<Any, String>()
 
 	override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
 		super.onFragmentAttached(fm, f, context)
-		ACRA.errorReporter.putCustomData(f.key(), "${time()}: ${f.arguments}")
+		ACRA.errorReporter.putCustomData(f.key(), f.arguments.contentToString())
 	}
 
 	override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
 		super.onFragmentDetached(fm, f)
 		ACRA.errorReporter.removeCustomData(f.key())
+		keys.remove(f)
 	}
 
 	override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
 		super.onActivityCreated(activity, savedInstanceState)
-		ACRA.errorReporter.putCustomData(activity.key(), "${time()}: ${activity.intent}")
+		ACRA.errorReporter.putCustomData(activity.key(), activity.intent.extras.contentToString())
 		(activity as? FragmentActivity)?.supportFragmentManager?.registerFragmentLifecycleCallbacks(this, true)
 	}
 
 	override fun onActivityDestroyed(activity: Activity) {
 		super.onActivityDestroyed(activity)
 		ACRA.errorReporter.removeCustomData(activity.key())
+		keys.remove(activity)
 	}
 
-	private fun Activity.key() = "Activity[${javaClass.simpleName}]"
-
-	private fun Fragment.key() = "Fragment[${javaClass.simpleName}]"
+	private fun Any.key() = keys.getOrPut(this) {
+		"${time()}: ${javaClass.simpleName}"
+	}
 
 	private fun time() = timeFormat.format(Date())
+
+	@Suppress("DEPRECATION")
+	private fun Bundle?.contentToString() = this?.keySet()?.joinToString { k ->
+		val v = get(k)
+		"$k=$v"
+	} ?: toString()
 }

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

@@ -61,6 +61,10 @@ class WorkManagerHelper(
 		return workManagerImpl.getWorkInfoById(id).await()
 	}
 
+	suspend fun getUniqueWorkInfoByName(name: String): List<WorkInfo> {
+		return workManagerImpl.getWorkInfosForUniqueWork(name).await().orEmpty()
+	}
+
 	suspend fun updateWork(request: WorkRequest): WorkManager.UpdateResult {
 		return workManagerImpl.updateWork(request).await()
 	}

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

@@ -6,6 +6,7 @@ import android.app.ActivityManager.MemoryInfo
 import android.app.ActivityOptions
 import android.content.Context
 import android.content.Context.ACTIVITY_SERVICE
+import android.content.Context.POWER_SERVICE
 import android.content.ContextWrapper
 import android.content.OperationApplicationException
 import android.content.SharedPreferences
@@ -17,6 +18,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.os.PowerManager
 import android.provider.Settings
 import android.view.View
 import android.view.ViewPropertyAnimator
@@ -51,6 +53,9 @@ import kotlin.math.roundToLong
 val Context.activityManager: ActivityManager?
 	get() = getSystemService(ACTIVITY_SERVICE) as? ActivityManager
 
+val Context.powerManager: PowerManager?
+	get() = getSystemService(POWER_SERVICE) as? PowerManager
+
 fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
 
 suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatchingCancellable {
@@ -141,6 +146,10 @@ fun Context.isLowRamDevice(): Boolean {
 	return activityManager?.isLowRamDevice ?: false
 }
 
+fun Context.isPowerSaveMode(): Boolean {
+	return powerManager?.isPowerSaveMode == true
+}
+
 val Context.ramAvailable: Long
 	get() {
 		val result = MemoryInfo()

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

@@ -9,8 +9,8 @@ import android.os.Parcel
 import android.os.Parcelable
 import androidx.core.content.IntentCompat
 import androidx.core.os.BundleCompat
+import androidx.core.os.ParcelCompat
 import androidx.lifecycle.SavedStateHandle
-import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaTags
 import java.io.Serializable
 
 // https://issuetracker.google.com/issues/240585930
@@ -36,11 +36,11 @@ inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String):
 }
 
 inline fun <reified T : Parcelable> Parcel.readParcelableCompat(): T? {
-	return readParcelable(ParcelableMangaTags::class.java.classLoader) as T?
+	return ParcelCompat.readParcelable(this, T::class.java.classLoader, T::class.java)
 }
 
 inline fun <reified T : Serializable> Parcel.readSerializableCompat(): T? {
-	return readSerializable() as T?
+	return ParcelCompat.readSerializable(this, T::class.java.classLoader, T::class.java)
 }
 
 inline fun <reified T : Serializable> Bundle.requireSerializable(key: String): T {
@@ -49,12 +49,6 @@ inline fun <reified T : Serializable> Bundle.requireSerializable(key: String): T
 	}
 }
 
-inline fun <reified T : Parcelable> Bundle.requireParcelable(key: String): T {
-	return checkNotNull(getParcelableCompat(key)) {
-		"Parcelable of type \"${T::class.java.name}\" not found at \"$key\""
-	}
-}
-
 fun <T> SavedStateHandle.require(key: String): T {
 	return checkNotNull(get(key)) {
 		"Value $key not found in SavedStateHandle or has a wrong type"

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

@@ -18,6 +18,14 @@ fun <T> Flow<T>.observe(owner: LifecycleOwner, collector: FlowCollector<T>) {
 	}
 }
 
+fun <T> Flow<T>.observe(owner: LifecycleOwner, minState: Lifecycle.State, collector: FlowCollector<T>) {
+	owner.lifecycleScope.launch {
+		owner.lifecycle.repeatOnLifecycle(minState) {
+			collect(collector)
+		}
+	}
+}
+
 fun <T> Flow<Event<T>?>.observeEvent(owner: LifecycleOwner, collector: FlowCollector<T>) {
 	owner.lifecycleScope.launch {
 		owner.lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {

app/src/main/kotlin/org/koitharu/kotatsu/details/service/MangaPrefetchService.kt

@@ -10,12 +10,13 @@ import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaChapters
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.ui.CoroutineIntentService
 import org.koitharu.kotatsu.core.util.ext.getParcelableExtraCompat
+import org.koitharu.kotatsu.core.util.ext.isPowerSaveMode
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.history.data.HistoryRepository
 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.runCatchingCancellable
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -115,6 +116,9 @@ class MangaPrefetchService : CoroutineIntentService() {
 			if (source == MangaSource.LOCAL) {
 				return false
 			}
+			if (context.isPowerSaveMode()) {
+				return false
+			}
 			val entryPoint = EntryPointAccessors.fromApplication(context, PrefetchCompanionEntryPoint::class.java)
 			return entryPoint.contentCache.isCachingEnabled && entryPoint.settings.isContentPrefetchEnabled
 		}

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

@@ -22,6 +22,7 @@ import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.lifecycleScope
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
 import org.koitharu.kotatsu.filter.ui.model.FilterItem
@@ -35,7 +36,6 @@ import org.koitharu.kotatsu.parsers.util.SuspendLazy
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 import org.koitharu.kotatsu.search.domain.MangaSearchRepository
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.text.Collator
 import java.util.LinkedList
 import java.util.Locale
@@ -49,7 +49,7 @@ class FilterCoordinator @Inject constructor(
 	dataRepository: MangaDataRepository,
 	private val searchRepository: MangaSearchRepository,
 	lifecycle: ViewModelLifecycle,
-) : FilterOwner {
+) : MangaFilter {
 
 	private val coroutineScope = lifecycle.lifecycleScope
 	private val repository = mangaRepositoryFactory.create(savedStateHandle.require(RemoteListFragment.ARG_SOURCE))

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

@@ -19,9 +19,8 @@ import com.google.android.material.R as materialR
 
 class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsView.OnChipClickListener {
 
-	private val owner by lazy(LazyThreadSafetyMode.NONE) {
-		FilterOwner.from(requireActivity())
-	}
+	private val filter: MangaFilter
+		get() = (requireActivity() as FilterOwner).filter
 
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFilterHeaderBinding {
 		return FragmentFilterHeaderBinding.inflate(inflater, container, false)
@@ -30,7 +29,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 	override fun onViewBindingCreated(binding: FragmentFilterHeaderBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		binding.chipsTags.onChipClickListener = this
-		owner.header.observe(viewLifecycleOwner, ::onDataChanged)
+		filter.header.observe(viewLifecycleOwner, ::onDataChanged)
 	}
 
 	override fun onWindowInsetsChanged(insets: Insets) = Unit
@@ -40,7 +39,7 @@ class FilterHeaderFragment : BaseFragment<FragmentFilterHeaderBinding>(), ChipsV
 		if (tag == null) {
 			FilterSheetFragment.show(parentFragmentManager)
 		} else {
-			owner.onTagItemClick(FilterItem.Tag(tag, !chip.isChecked))
+			filter.onTagItemClick(FilterItem.Tag(tag, !chip.isChecked))
 		}
 	}
 

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

@@ -1,32 +1,6 @@
 package org.koitharu.kotatsu.filter.ui
 
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import kotlinx.coroutines.flow.StateFlow
-import org.koitharu.kotatsu.core.util.ext.values
-import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
-import org.koitharu.kotatsu.list.ui.model.ListModel
-import org.koitharu.kotatsu.parsers.model.MangaTag
+interface FilterOwner {
 
-interface FilterOwner : OnFilterChangedListener {
-
-	val filterItems: StateFlow<List<ListModel>>
-
-	val header: StateFlow<FilterHeaderModel>
-
-	fun applyFilter(tags: Set<MangaTag>)
-
-	companion object {
-
-		fun from(activity: FragmentActivity): FilterOwner {
-			for (f in activity.supportFragmentManager.fragments) {
-				return find(f) ?: continue
-			}
-			error("Cannot find FilterOwner")
-		}
-
-		fun find(fragment: Fragment): FilterOwner? {
-			return fragment.viewModelStore.values.firstNotNullOfOrNull { it as? FilterOwner }
-		}
-	}
+	val filter: MangaFilter
 }

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

@@ -21,20 +21,17 @@ class FilterSheetFragment :
 	AdaptiveSheetCallback,
 	AsyncListDiffer.ListListener<ListModel> {
 
-	private val owner by lazy(LazyThreadSafetyMode.NONE) {
-		FilterOwner.from(requireActivity())
-	}
-
 	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetFilterBinding {
 		return SheetFilterBinding.inflate(inflater, container, false)
 	}
 
 	override fun onViewBindingCreated(binding: SheetFilterBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
+		val filter = (requireActivity() as FilterOwner).filter
 		addSheetCallback(this)
-		val adapter = FilterAdapter(owner, this)
+		val adapter = FilterAdapter(filter, this)
 		binding.recyclerView.adapter = adapter
-		owner.filterItems.observe(viewLifecycleOwner, adapter::setItems)
+		filter.filterItems.observe(viewLifecycleOwner, adapter::setItems)
 
 		if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			binding.recyclerView.scrollIndicators = 0

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

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.filter.ui
+
+import kotlinx.coroutines.flow.StateFlow
+import org.koitharu.kotatsu.filter.ui.model.FilterHeaderModel
+import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.parsers.model.MangaTag
+
+interface MangaFilter : OnFilterChangedListener {
+
+	val filterItems: StateFlow<List<ListModel>>
+
+	val header: StateFlow<FilterHeaderModel>
+
+	fun applyFilter(tags: Set<MangaTag>)
+}

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

@@ -45,6 +45,13 @@ class HistoryRepository @Inject constructor(
 		return entity.manga.toManga(entity.tags.toMangaTags())
 	}
 
+	fun observeLast(): Flow<Manga?> {
+		return db.historyDao.observeAll(1).map {
+			val first = it.firstOrNull()
+			first?.manga?.toManga(first.tags.toMangaTags())
+		}
+	}
+
 	fun observeAll(): Flow<List<Manga>> {
 		return db.historyDao.observeAll().mapItems {
 			it.manga.toManga(it.tags.toMangaTags())

app/src/main/kotlin/org/koitharu/kotatsu/history/domain/HistoryUpdateUseCase.kt

@@ -1,13 +1,15 @@
 package org.koitharu.kotatsu.history.domain
 
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
 import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 class HistoryUpdateUseCase @Inject constructor(
@@ -30,7 +32,9 @@ class HistoryUpdateUseCase @Inject constructor(
 		percent: Float
 	) = processLifecycleScope.launch(Dispatchers.Default) {
 		runCatchingCancellable {
+			withContext(NonCancellable) {
 				invoke(manga, readerState, percent)
+			}
 		}.onFailure {
 			it.printStackTraceDebug()
 		}

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

@@ -17,15 +17,20 @@ import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
+import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.FilterSheetFragment
+import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 
-class LocalListFragment : MangaListFragment() {
+class LocalListFragment : MangaListFragment(), FilterOwner {
 
 	override val viewModel by viewModels<LocalListViewModel>()
 
+	override val filter: MangaFilter
+		get() = viewModel
+
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		addMenuProvider(LocalListMenuProvider(this::onEmptyActionClick))

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

@@ -9,6 +9,7 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import androidx.work.await
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import org.koitharu.kotatsu.local.data.LocalMangaRepository
@@ -33,7 +34,7 @@ class LocalStorageCleanupWorker @AssistedInject constructor(
 
 		private const val TAG = "cleanup"
 
-		fun enqueue(context: Context) {
+		suspend fun enqueue(context: Context) {
 			val constraints = Constraints.Builder()
 				.setRequiresBatteryNotLow(true)
 				.build()
@@ -42,7 +43,7 @@ class LocalStorageCleanupWorker @AssistedInject constructor(
 				.addTag(TAG)
 				.setBackoffCriteria(BackoffPolicy.LINEAR, 1, TimeUnit.MINUTES)
 				.build()
-			WorkManager.getInstance(context).enqueueUniqueWork(TAG, ExistingWorkPolicy.KEEP, request)
+			WorkManager.getInstance(context).enqueueUniqueWork(TAG, ExistingWorkPolicy.KEEP, request).await()
 		}
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/main/domain/ReadingResumeEnabledUseCase.kt

@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.main.domain
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import org.koitharu.kotatsu.core.os.NetworkState
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.prefs.observeAsFlow
+import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import javax.inject.Inject
+
+class ReadingResumeEnabledUseCase @Inject constructor(
+	private val networkState: NetworkState,
+	private val historyRepository: HistoryRepository,
+	private val settings: AppSettings,
+) {
+
+	operator fun invoke(): Flow<Boolean> = settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) {
+		isIncognitoModeEnabled
+	}.flatMapLatest { incognito ->
+		if (incognito) {
+			flowOf(false)
+		} else {
+			combine(networkState, historyRepository.observeLast()) { isOnline, last ->
+				last != null && (isOnline || last.source == MangaSource.LOCAL)
+			}
+		}
+	}
+}

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

@@ -69,8 +69,6 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
 import org.koitharu.kotatsu.shelf.ui.ShelfFragment
-import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
-import org.koitharu.kotatsu.tracker.work.TrackWorker
 import javax.inject.Inject
 import com.google.android.material.R as materialR
 
@@ -321,8 +319,6 @@ class MainActivity :
 				}
 			}
 			withContext(Dispatchers.Default) {
-				TrackWorker.setup(applicationContext)
-				SuggestionsWorker.setup(applicationContext)
 				LocalStorageCleanupWorker.enqueue(applicationContext)
 			}
 			withResumed {

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

@@ -97,7 +97,7 @@ class MainNavigationDelegate(
 	}
 
 	private fun onNavigationItemSelected(@IdRes itemId: Int): Boolean {
-		setPrimaryFragment(
+		return setPrimaryFragment(
 			when (itemId) {
 				R.id.nav_shelf -> ShelfFragment.newInstance()
 				R.id.nav_explore -> ExploreFragment.newInstance()
@@ -106,7 +106,6 @@ class MainNavigationDelegate(
 				else -> return false
 			},
 		)
-		return true
 	}
 
 	private fun getItemId(fragment: Fragment) = when (fragment) {
@@ -117,13 +116,17 @@ class MainNavigationDelegate(
 		else -> 0
 	}
 
-	private fun setPrimaryFragment(fragment: Fragment) {
+	private fun setPrimaryFragment(fragment: Fragment): Boolean {
+		if (fragmentManager.isStateSaved) {
+			return false
+		}
 		fragmentManager.beginTransaction()
 			.setReorderingAllowed(true)
 			.replace(R.id.container, fragment, TAG_PRIMARY)
 			.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
 			.commit()
 		onFragmentChanged(fragment, fromUser = true)
+		return true
 	}
 
 	private fun onFragmentChanged(fragment: Fragment, fromUser: Boolean) {

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

@@ -13,12 +13,12 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.github.AppUpdateRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
 import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.util.ext.MutableEventFlow
 import org.koitharu.kotatsu.core.util.ext.call
 import org.koitharu.kotatsu.history.data.HistoryRepository
+import org.koitharu.kotatsu.main.domain.ReadingResumeEnabledUseCase
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import javax.inject.Inject
@@ -29,16 +29,12 @@ class MainViewModel @Inject constructor(
 	private val appUpdateRepository: AppUpdateRepository,
 	trackingRepository: TrackingRepository,
 	settings: AppSettings,
+	readingResumeEnabledUseCase: ReadingResumeEnabledUseCase,
 ) : BaseViewModel() {
 
 	val onOpenReader = MutableEventFlow<Manga>()
 
-	val isResumeEnabled = combine(
-		historyRepository.observeHasItems(),
-		settings.observeAsFlow(AppSettings.KEY_INCOGNITO_MODE) { isIncognitoModeEnabled },
-	) { hasItems, incognito ->
-		hasItems && !incognito
-	}.stateIn(
+	val isResumeEnabled = readingResumeEnabledUseCase().stateIn(
 		scope = viewModelScope + Dispatchers.Default,
 		started = SharingStarted.WhileSubscribed(5000),
 		initialValue = false,

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

@@ -34,6 +34,8 @@ import org.koitharu.kotatsu.core.util.FileSize
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
 import org.koitharu.kotatsu.core.util.ext.ensureSuccess
 import org.koitharu.kotatsu.core.util.ext.isNotEmpty
+import org.koitharu.kotatsu.core.util.ext.isPowerSaveMode
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.ramAvailable
 import org.koitharu.kotatsu.core.util.ext.withProgress
 import org.koitharu.kotatsu.core.util.progress.ProgressDeferred
@@ -42,7 +44,6 @@ import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import java.io.File
 import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
@@ -83,7 +84,10 @@ class PageLoader @Inject constructor(
 	}
 
 	fun isPrefetchApplicable(): Boolean {
-		return repository is RemoteMangaRepository && settings.isPagesPreloadEnabled && !isLowRam()
+		return repository is RemoteMangaRepository
+			&& settings.isPagesPreloadEnabled
+			&& !context.isPowerSaveMode()
+			&& !isLowRam()
 	}
 
 	@AnyThread

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

@@ -24,6 +24,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
@@ -127,7 +128,7 @@ class ReaderActivity :
 				},
 			),
 		)
-		viewModel.readerMode.observe(this, this::onInitReader)
+		viewModel.readerMode.observe(this, Lifecycle.State.STARTED, this::onInitReader)
 		viewModel.onPageSaved.observeEvent(this, this::onPageSaved)
 		viewModel.uiState.zipWithPrevious().observe(this, this::onUiStateChanged)
 		viewModel.isLoading.observe(this, this::onLoadingStateChanged)

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

@@ -15,7 +15,9 @@ import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.util.ext.addMenuProvider
 import org.koitharu.kotatsu.core.util.ext.withArgs
 import org.koitharu.kotatsu.databinding.FragmentListBinding
+import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.FilterSheetFragment
+import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -23,10 +25,13 @@ import org.koitharu.kotatsu.search.ui.SearchActivity
 import org.koitharu.kotatsu.settings.SettingsActivity
 
 @AndroidEntryPoint
-class RemoteListFragment : MangaListFragment() {
+class RemoteListFragment : MangaListFragment(), FilterOwner {
 
 	override val viewModel by viewModels<RemoteListViewModel>()
 
+	override val filter: MangaFilter
+		get() = viewModel
+
 	override fun onViewBindingCreated(binding: FragmentListBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		addMenuProvider(RemoteListMenuProvider())

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

@@ -20,10 +20,11 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.ext.call
+import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.download.ui.worker.DownloadWorker
 import org.koitharu.kotatsu.filter.ui.FilterCoordinator
-import org.koitharu.kotatsu.filter.ui.FilterOwner
+import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.filter.ui.model.FilterState
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
@@ -36,7 +37,6 @@ import org.koitharu.kotatsu.list.ui.model.toUi
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaTag
-import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug
 import javax.inject.Inject
 
 private const val FILTER_MIN_INTERVAL = 250L
@@ -49,7 +49,7 @@ open class RemoteListViewModel @Inject constructor(
 	settings: AppSettings,
 	listExtraProvider: ListExtraProvider,
 	downloadScheduler: DownloadWorker.Scheduler,
-) : MangaListViewModel(settings, downloadScheduler), FilterOwner by filter {
+) : MangaListViewModel(settings, downloadScheduler), MangaFilter by filter {
 
 	val source = savedStateHandle.require<MangaSource>(RemoteListFragment.ARG_SOURCE)
 	private val repository = mangaRepositoryFactory.create(source)

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

@@ -26,7 +26,7 @@ import org.koitharu.kotatsu.databinding.ActivityMangaListBinding
 import org.koitharu.kotatsu.filter.ui.FilterHeaderFragment
 import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.filter.ui.FilterSheetFragment
-import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.filter.ui.MangaFilter
 import org.koitharu.kotatsu.local.ui.LocalListFragment
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -36,11 +36,16 @@ import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment
 @AndroidEntryPoint
 class MangaListActivity :
 	BaseActivity<ActivityMangaListBinding>(),
-	AppBarOwner, View.OnClickListener {
+	AppBarOwner, View.OnClickListener, FilterOwner {
 
 	override val appBar: AppBarLayout
 		get() = viewBinding.appbar
 
+	override val filter: MangaFilter
+		get() = checkNotNull(findFilterOwner()) {
+			"Cannot find FilterOwner fragment in ${supportFragmentManager.fragments}"
+		}.filter
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityMangaListBinding.inflate(layoutInflater))
@@ -74,7 +79,10 @@ class MangaListActivity :
 
 	private fun initList(source: MangaSource, tags: Set<MangaTag>?) {
 		val fm = supportFragmentManager
-		if (fm.findFragmentById(R.id.container) == null) {
+		val existingFragment = fm.findFragmentById(R.id.container)
+		if (existingFragment is FilterOwner) {
+			initFilter(existingFragment)
+		} else {
 			fm.commit {
 				setReorderingAllowed(true)
 				val fragment = if (source == MangaSource.LOCAL) {
@@ -83,17 +91,15 @@ class MangaListActivity :
 					RemoteListFragment.newInstance(source)
 				}
 				replace(R.id.container, fragment)
-				if (!tags.isNullOrEmpty() && fragment is RemoteListFragment) {
+				runOnCommit { initFilter(fragment) }
+				if (!tags.isNullOrEmpty()) {
 					runOnCommit(ApplyFilterRunnable(fragment, tags))
 				}
-				runOnCommit { initFilter() }
 			}
-		} else {
-			initFilter()
 		}
 	}
 
-	private fun initFilter() {
+	private fun initFilter(filterOwner: FilterOwner) {
 		if (viewBinding.containerFilter != null) {
 			if (supportFragmentManager.findFragmentById(R.id.container_filter) == null) {
 				supportFragmentManager.commit {
@@ -109,14 +115,14 @@ class MangaListActivity :
 				}
 			}
 		}
-		val filterOwner = FilterOwner.from(this)
+		val filter = filterOwner.filter
 		val chipSort = viewBinding.chipSort
 		if (chipSort != null) {
-			filterOwner.header.observe(this) {
+			filter.header.observe(this) {
 				chipSort.setTextAndVisible(it.sortOrder?.titleRes ?: 0)
 			}
 		} else {
-			filterOwner.header.map {
+			filter.header.map {
 				it.textSummary
 			}.flowOn(Dispatchers.Default)
 				.observe(this) {
@@ -125,15 +131,17 @@ class MangaListActivity :
 		}
 	}
 
+	private fun findFilterOwner(): FilterOwner? {
+		return supportFragmentManager.findFragmentById(R.id.container) as? FilterOwner
+	}
+
 	private class ApplyFilterRunnable(
-		private val fragment: MangaListFragment,
+		private val filterOwner: FilterOwner,
 		private val tags: Set<MangaTag>,
 	) : Runnable {
 
 		override fun run() {
-			checkNotNull(FilterOwner.find(fragment)) {
-				"Cannot find FilterOwner"
-			}.applyFilter(tags)
+			filterOwner.filter.applyFilter(tags)
 		}
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt

@@ -9,6 +9,7 @@ import androidx.fragment.app.viewModels
 import coil.ImageLoader
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.AlertDialogFragment
 import org.koitharu.kotatsu.core.util.ext.observe
@@ -38,7 +39,8 @@ class NewSourcesDialogFragment :
 		binding.recyclerView.adapter = adapter
 		binding.textViewTitle.setText(R.string.new_sources_text)
 
-		viewModel.sources.observe(viewLifecycleOwner) { adapter.items = it }
+		viewModel.sources.filterNotNull()
+			.observe(viewLifecycleOwner) { adapter.items = it }
 	}
 
 	override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {

app/src/main/kotlin/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt

@@ -1,7 +1,9 @@
 package org.koitharu.kotatsu.settings.newsources
 
+import androidx.annotation.WorkerThread
 import androidx.core.os.LocaleListCompat
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.core.model.getLocaleTitle
 import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -15,8 +17,14 @@ class NewSourcesViewModel @Inject constructor(
 	private val settings: AppSettings,
 ) : BaseViewModel() {
 
-	val sources = MutableStateFlow<List<SourceConfigItem>>(buildList())
 	private val initialList = settings.newSources
+	val sources = MutableStateFlow<List<SourceConfigItem>?>(null)
+
+	init {
+		launchJob(Dispatchers.Default) {
+			sources.value = buildList()
+		}
+	}
 
 	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
 		if (isEnabled) {
@@ -30,6 +38,7 @@ class NewSourcesViewModel @Inject constructor(
 		settings.markKnownSources(initialList)
 	}
 
+	@WorkerThread
 	private fun buildList(): List<SourceConfigItem.SourceItem> {
 		val locales = LocaleListCompat.getDefault().mapToSet { it.language }
 		val pendingHidden = HashSet<String>()

app/src/main/kotlin/org/koitharu/kotatsu/settings/tracker/TrackerSettingsFragment.kt

@@ -24,6 +24,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.powerManager
 import org.koitharu.kotatsu.settings.tracker.categories.TrackerCategoriesConfigSheet
 import org.koitharu.kotatsu.settings.utils.MultiSummaryProvider
 import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
@@ -155,7 +156,7 @@ class TrackerSettingsFragment :
 			return
 		}
 		val packageName = context.packageName
-		val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+		val powerManager = context.powerManager ?: return
 		if (!powerManager.isIgnoringBatteryOptimizations(packageName)) {
 			try {
 				val intent = Intent(

app/src/main/kotlin/org/koitharu/kotatsu/settings/work/PeriodicWorkScheduler.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.settings.work
+
+import android.content.Context
+
+interface PeriodicWorkScheduler {
+
+	suspend fun schedule(context: Context)
+
+	suspend fun unschedule(context: Context)
+
+	suspend fun isScheduled(context: Context): Boolean
+}

app/src/main/kotlin/org/koitharu/kotatsu/settings/work/WorkScheduleManager.kt

@@ -0,0 +1,49 @@
+package org.koitharu.kotatsu.settings.work
+
+import android.content.Context
+import android.content.SharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.ext.processLifecycleScope
+import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
+import org.koitharu.kotatsu.tracker.work.TrackWorker
+import javax.inject.Inject
+
+class WorkScheduleManager @Inject constructor(
+	@ApplicationContext private val context: Context,
+	private val settings: AppSettings,
+) : SharedPreferences.OnSharedPreferenceChangeListener {
+
+	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+		when (key) {
+			AppSettings.KEY_TRACKER_ENABLED -> updateWorker(TrackWorker, settings.isTrackerEnabled)
+			AppSettings.KEY_SUGGESTIONS -> updateWorker(SuggestionsWorker, settings.isSuggestionsEnabled)
+		}
+	}
+
+	fun init() {
+		settings.subscribe(this)
+		processLifecycleScope.launch(Dispatchers.Default) {
+			updateWorkerImpl(TrackWorker, settings.isTrackerEnabled)
+			updateWorkerImpl(SuggestionsWorker, settings.isSuggestionsEnabled)
+		}
+	}
+
+	private fun updateWorker(scheduler: PeriodicWorkScheduler, isEnabled: Boolean) {
+		processLifecycleScope.launch(Dispatchers.Default) {
+			updateWorkerImpl(scheduler, isEnabled)
+		}
+	}
+
+	private suspend fun updateWorkerImpl(scheduler: PeriodicWorkScheduler, isEnabled: Boolean) {
+		if (scheduler.isScheduled(context) != isEnabled) {
+			if (isEnabled) {
+				scheduler.schedule(context)
+			} else {
+				scheduler.unschedule(context)
+			}
+		}
+	}
+}

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

@@ -23,6 +23,7 @@ import androidx.work.OutOfQuotaPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import androidx.work.await
 import androidx.work.workDataOf
 import coil.ImageLoader
 import coil.request.ImageRequest
@@ -38,6 +39,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.distinctById
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.WorkManagerHelper
 import org.koitharu.kotatsu.core.util.ext.almostEquals
 import org.koitharu.kotatsu.core.util.ext.asArrayList
 import org.koitharu.kotatsu.core.util.ext.flatten
@@ -55,6 +57,7 @@ import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderActivity.IntentBuilder
+import org.koitharu.kotatsu.settings.work.PeriodicWorkScheduler
 import org.koitharu.kotatsu.suggestions.domain.MangaSuggestion
 import org.koitharu.kotatsu.suggestions.domain.SuggestionRepository
 import org.koitharu.kotatsu.suggestions.domain.TagsBlacklist
@@ -75,11 +78,11 @@ class SuggestionsWorker @AssistedInject constructor(
 ) : CoroutineWorker(appContext, params) {
 
 	override suspend fun doWork(): Result {
+		trySetForeground()
 		if (!appSettings.isSuggestionsEnabled) {
 			suggestionRepository.clear()
 			return Result.success()
 		}
-		trySetForeground()
 		val count = doWorkImpl()
 		val outputData = workDataOf(DATA_COUNT to count)
 		return Result.success(outputData)
@@ -303,7 +306,7 @@ class SuggestionsWorker @AssistedInject constructor(
 		return -1
 	}
 
-	companion object {
+	companion object : PeriodicWorkScheduler {
 
 		private const val TAG = "suggestions"
 		private const val TAG_ONESHOT = "suggestions_oneshot"
@@ -324,7 +327,7 @@ class SuggestionsWorker @AssistedInject constructor(
 			SortOrder.RATING,
 		)
 
-		fun setup(context: Context) {
+		override suspend fun schedule(context: Context) {
 			val constraints = Constraints.Builder()
 				.setRequiredNetworkType(NetworkType.UNMETERED)
 				.setRequiresBatteryNotLow(true)
@@ -336,6 +339,19 @@ class SuggestionsWorker @AssistedInject constructor(
 				.build()
 			WorkManager.getInstance(context)
 				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
+				.await()
+		}
+
+		override suspend fun unschedule(context: Context) {
+			WorkManager.getInstance(context)
+				.cancelUniqueWork(TAG)
+				.await()
+		}
+
+		override suspend fun isScheduled(context: Context): Boolean {
+			return WorkManagerHelper(WorkManager.getInstance(context))
+				.getUniqueWorkInfoByName(TAG)
+				.any { !it.state.isFinished }
 		}
 
 		fun startNow(context: Context) {

app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncController.kt

@@ -43,10 +43,12 @@ class SyncController @Inject constructor(
 	private val defaultGcPeriod = TimeUnit.DAYS.toMillis(2) // gc period if sync disabled
 
 	override fun onInvalidated(tables: Set<String>) {
-		requestSync(
-			favourites = TABLE_FAVOURITES in tables || TABLE_FAVOURITE_CATEGORIES in tables,
-			history = TABLE_HISTORY in tables,
-		)
+		val favourites = (TABLE_FAVOURITES in tables || TABLE_FAVOURITE_CATEGORIES in tables)
+			&& !isSyncActiveOrPending(authorityFavourites)
+		val history = TABLE_HISTORY in tables && !isSyncActiveOrPending(authorityHistory)
+		if (favourites || history) {
+			requestSync(favourites, history)
+		}
 	}
 
 	fun isEnabled(account: Account): Boolean {
@@ -126,6 +128,11 @@ class SyncController @Inject constructor(
 		}
 	}
 
+	private fun isSyncActiveOrPending(authority: String): Boolean {
+		val account = peekAccount() ?: return false
+		return ContentResolver.isSyncActive(account, authority) || ContentResolver.isSyncPending(account, authority)
+	}
+
 	companion object {
 
 		@JvmStatic

app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt

@@ -11,6 +11,10 @@ import android.database.Cursor
 import android.net.Uri
 import androidx.annotation.WorkerThread
 import androidx.core.content.contentValuesOf
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dagger.hilt.android.qualifiers.ApplicationContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -23,9 +27,9 @@ import org.koitharu.kotatsu.core.db.TABLE_HISTORY
 import org.koitharu.kotatsu.core.db.TABLE_MANGA
 import org.koitharu.kotatsu.core.db.TABLE_MANGA_TAGS
 import org.koitharu.kotatsu.core.db.TABLE_TAGS
-import org.koitharu.kotatsu.core.logs.LoggersModule
-import org.koitharu.kotatsu.core.network.GZipInterceptor
-import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.logs.FileLogger
+import org.koitharu.kotatsu.core.logs.SyncLogger
+import org.koitharu.kotatsu.core.network.BaseHttpClient
 import org.koitharu.kotatsu.core.util.ext.parseJsonOrNull
 import org.koitharu.kotatsu.core.util.ext.toContentValues
 import org.koitharu.kotatsu.core.util.ext.toJson
@@ -39,23 +43,20 @@ import java.util.concurrent.TimeUnit
 
 private const val FIELD_TIMESTAMP = "timestamp"
 
-/**
- * Warning! This class may be used in another process
- */
-@WorkerThread
-class SyncHelper(
-	context: Context,
-	private val account: Account,
-	private val provider: ContentProviderClient,
+class SyncHelper @AssistedInject constructor(
+	@ApplicationContext context: Context,
+	@BaseHttpClient baseHttpClient: OkHttpClient,
+	@Assisted private val account: Account,
+	@Assisted private val provider: ContentProviderClient,
+	private val settings: SyncSettings,
+	@SyncLogger private val logger: FileLogger,
 ) {
 
 	private val authorityHistory = context.getString(R.string.sync_authority_history)
 	private val authorityFavourites = context.getString(R.string.sync_authority_favourites)
-	private val settings = SyncSettings(context, account)
-	private val httpClient = OkHttpClient.Builder()
+	private val httpClient = baseHttpClient.newBuilder()
 		.authenticator(SyncAuthenticator(context, account, settings, SyncAuthApi(OkHttpClient())))
 		.addInterceptor(SyncInterceptor(context, account))
-		.addInterceptor(GZipInterceptor())
 		.build()
 	private val baseUrl: String by lazy {
 		val host = settings.host
@@ -64,8 +65,8 @@ class SyncHelper(
 	}
 	private val defaultGcPeriod: Long // gc period if sync enabled
 		get() = TimeUnit.DAYS.toMillis(4)
-	private val logger = LoggersModule.provideSyncLogger(context, AppSettings(context))
 
+	@WorkerThread
 	fun syncFavourites(syncResult: SyncResult) {
 		val data = JSONObject()
 		data.put(TABLE_FAVOURITE_CATEGORIES, getFavouriteCategories())
@@ -89,6 +90,7 @@ class SyncHelper(
 		gcFavourites()
 	}
 
+	@WorkerThread
 	fun syncHistory(syncResult: SyncResult) {
 		val data = JSONObject()
 		data.put(TABLE_HISTORY, getHistory())
@@ -321,4 +323,13 @@ class SyncHelper(
 			logger.log("$code ${request.url}")
 		}
 	}
+
+	@AssistedFactory
+	interface Factory {
+
+		fun create(
+			account: Account,
+			contentProviderClient: ContentProviderClient,
+		): SyncHelper
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/SyncAdapterEntryPoint.kt

@@ -0,0 +1,12 @@
+package org.koitharu.kotatsu.sync.ui
+
+import dagger.hilt.EntryPoint
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.koitharu.kotatsu.sync.domain.SyncHelper
+
+@EntryPoint
+@InstallIn(SingletonComponent::class)
+interface SyncAdapterEntryPoint {
+	val syncHelperFactory: SyncHelper.Factory
+}

app/src/main/kotlin/org/koitharu/kotatsu/sync/ui/favourites/FavouritesSyncAdapter.kt

@@ -6,11 +6,12 @@ import android.content.ContentProviderClient
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.onError
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.sync.domain.SyncController
-import org.koitharu.kotatsu.sync.domain.SyncHelper
+import org.koitharu.kotatsu.sync.ui.SyncAdapterEntryPoint
 
 class FavouritesSyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context, true) {
 
@@ -24,7 +25,8 @@ class FavouritesSyncAdapter(context: Context) : AbstractThreadedSyncAdapter(cont
 		if (!context.resources.getBoolean(R.bool.is_sync_enabled)) {
 			return
 		}
-		val syncHelper = SyncHelper(context, account, provider)
+		val entryPoint = EntryPointAccessors.fromApplication(context, SyncAdapterEntryPoint::class.java)
+		val syncHelper = entryPoint.syncHelperFactory.create(account, provider)
 		runCatchingCancellable {
 			syncHelper.syncFavourites(syncResult)
 			SyncController.setLastSync(context, account, authority, System.currentTimeMillis())

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

@@ -6,11 +6,12 @@ import android.content.ContentProviderClient
 import android.content.Context
 import android.content.SyncResult
 import android.os.Bundle
+import dagger.hilt.android.EntryPointAccessors
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.onError
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.sync.domain.SyncController
-import org.koitharu.kotatsu.sync.domain.SyncHelper
+import org.koitharu.kotatsu.sync.ui.SyncAdapterEntryPoint
 
 class HistorySyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context, true) {
 
@@ -24,7 +25,8 @@ class HistorySyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context
 		if (!context.resources.getBoolean(R.bool.is_sync_enabled)) {
 			return
 		}
-		val syncHelper = SyncHelper(context, account, provider)
+		val entryPoint = EntryPointAccessors.fromApplication(context, SyncAdapterEntryPoint::class.java)
+		val syncHelper = entryPoint.syncHelperFactory.create(account, provider)
 		runCatchingCancellable {
 			syncHelper.syncHistory(syncResult)
 			SyncController.setLastSync(context, account, authority, System.currentTimeMillis())

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

@@ -26,6 +26,7 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
 import androidx.work.WorkerParameters
+import androidx.work.await
 import coil.ImageLoader
 import coil.request.ImageRequest
 import dagger.assisted.Assisted
@@ -42,12 +43,14 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.logs.FileLogger
 import org.koitharu.kotatsu.core.logs.TrackerLogger
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.core.util.WorkManagerHelper
 import org.koitharu.kotatsu.core.util.ext.toBitmapOrNull
 import org.koitharu.kotatsu.core.util.ext.trySetForeground
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
+import org.koitharu.kotatsu.settings.work.PeriodicWorkScheduler
 import org.koitharu.kotatsu.tracker.domain.Tracker
 import org.koitharu.kotatsu.tracker.domain.model.MangaUpdates
 import java.util.concurrent.TimeUnit
@@ -67,6 +70,7 @@ class TrackWorker @AssistedInject constructor(
 	}
 
 	override suspend fun doWork(): Result {
+		trySetForeground()
 		logger.log("doWork()")
 		try {
 			return doWorkImpl()
@@ -85,7 +89,6 @@ class TrackWorker @AssistedInject constructor(
 		if (!settings.isTrackerEnabled) {
 			return Result.success(workDataOf(0, 0))
 		}
-		trySetForeground()
 		val tracks = tracker.getAllTracks()
 		logger.log("Total ${tracks.size} tracks")
 		if (tracks.isEmpty()) {
@@ -234,7 +237,7 @@ class TrackWorker @AssistedInject constructor(
 			.build()
 	}
 
-	companion object {
+	companion object : PeriodicWorkScheduler {
 
 		private const val WORKER_CHANNEL_ID = "track_worker"
 		private const val WORKER_NOTIFICATION_ID = 35
@@ -244,14 +247,28 @@ class TrackWorker @AssistedInject constructor(
 		private const val DATA_KEY_SUCCESS = "success"
 		private const val DATA_KEY_FAILED = "failed"
 
-		fun setup(context: Context) {
+		override suspend fun schedule(context: Context) {
 			val constraints = Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
 			val request = PeriodicWorkRequestBuilder<TrackWorker>(4, TimeUnit.HOURS)
 				.setConstraints(constraints)
 				.addTag(TAG)
 				.setBackoffCriteria(BackoffPolicy.LINEAR, 30, TimeUnit.MINUTES)
 				.build()
-			WorkManager.getInstance(context).enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
+			WorkManager.getInstance(context)
+				.enqueueUniquePeriodicWork(TAG, ExistingPeriodicWorkPolicy.KEEP, request)
+				.await()
+		}
+
+		override suspend fun unschedule(context: Context) {
+			WorkManager.getInstance(context)
+				.cancelUniqueWork(TAG)
+				.await()
+		}
+
+		override suspend fun isScheduled(context: Context): Boolean {
+			return WorkManagerHelper(WorkManager.getInstance(context))
+				.getUniqueWorkInfoByName(TAG)
+				.any { !it.state.isFinished }
 		}
 
 		fun startNow(context: Context) {

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

@@ -56,7 +56,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/barrier_top"
-			app:trackColor="?colorPrimaryContainer"
+			app:trackColor="?android:colorBackground"
 			tools:progress="25" />
 
 		<TextView

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

@@ -95,7 +95,7 @@
     <string name="vibration">Вібрацыя</string>
     <string name="favourites_categories">Катэгорыі абранага</string>
     <string name="remove_category">Выдаліць катэгорыю</string>
-    <string name="manga_shelf">Паліца з мангай</string>
+    <string name="manga_shelf">Паліца</string>
     <string name="recent_manga">Нядаўняя манга</string>
     <string name="pages_animation">Анімацыя гартання</string>
     <string name="manga_save_location">Месца спампоўвання мангі</string>
@@ -201,7 +201,7 @@
     <string name="screenshots_block_all">Заўсёды блакуйце</string>
     <string name="screenshots_block_nsfw">Блок на NSFW</string>
     <string name="filter_load_error">Немагчыма загрузіць спіс жанраў</string>
-    <string name="disabled">Непрацаздольны</string>
+    <string name="disabled">Адключаны</string>
     <string name="enabled">Уключаны</string>
     <string name="exclude_nsfw_from_suggestions">Не прапануйце мангу NSFW</string>
     <string name="text_suggestion_holder">Пачніце чытаць мангу, і вы атрымаеце персаналізаваныя прапановы</string>
@@ -255,7 +255,7 @@
     <string name="edit">Змяніць</string>
     <string name="edit_category">Змяніць катэгорыю</string>
     <string name="bookmark_add">Дадаць закладку</string>
-    <string name="undo">Адмяніць</string>
+    <string name="undo">Адмена</string>
     <string name="disable_battery_optimization">Адключыць аптымізацыю акумулятара</string>
     <string name="disable_battery_optimization_summary">Дапамагае з фонавай праверкай абнаўленняў</string>
     <string name="crash_text">Штосьці пайшло не так. Калі ласка, адпраўце справаздачу пра памылку распрацоўшчыкам, каб дапамагчы нам яе выправіць.</string>
@@ -327,7 +327,7 @@
     <string name="enable_logging_summary">Запішыце некаторыя дзеянні для адладкі</string>
     <string name="show_suspicious_content">Паказаць падазроны кантэнт</string>
     <string name="text_shelf_holder_primary">Ваша манга будзе адлюстроўвацца тут</string>
-    <string name="text_shelf_holder_secondary">Знайдзіце, што пачытаць, у раздзеле «Даследаваць»</string>
+    <string name="text_shelf_holder_secondary">Знайдзіце, што пачытаць, у раздзеле «Агляд»</string>
     <string name="canceled">Адменена</string>
     <string name="manage">Кіраваць</string>
     <string name="available">Даступны</string>
@@ -356,7 +356,7 @@
     <string name="random">Выпадковы</string>
     <string name="reorder">Змяніць парадак</string>
     <string name="empty">Пуста</string>
-    <string name="explore">Дасьледуйце</string>
+    <string name="explore">Агляд</string>
     <string name="confirm_exit">Націсніце \"Назад\" яшчэ раз, каб выйсці</string>
     <string name="exit_confirmation_summary">Двойчы націсніце \"Назад\", каб выйсці з праграмы</string>
     <string name="exit_confirmation">Пацверджанне выхаду</string>
@@ -425,7 +425,7 @@
     <string name="invert_colors">Інвертаваць колеры</string>
     <string name="show_pages_numbers_summary">Паказаць нумары старонак у ніжнім куце</string>
     <string name="network">Сетка</string>
-    <string name="data_and_privacy">Дадзеныя і прыватнасць</string>
+    <string name="data_and_privacy">Дадзеныя і канфідэнцыяльнасць</string>
     <string name="webtoon_zoom_summary">Дазволіць жэст для павелічэння ў рэжыме webtoon</string>
     <string name="details_button_tip">Націсніце і ўтрымлівайце кнопку \"Чытаць\", каб убачыць дадатковыя параметры</string>
     <string name="restore_summary">Аднавіць раней створаную рэзервовую копію</string>

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

@@ -422,4 +422,13 @@
     <string name="password">Mot de passe</string>
     <string name="invalid_value_message">Valeur invalide</string>
     <string name="authorization_optional">Autorisation (optionnel)</string>
+    <string name="invalid_port_number">Numéro de port invalide</string>
+    <string name="restore_summary">Restaurer la sauvegarde précédemment créée</string>
+    <string name="webtoon_zoom_summary">Autoriser le geste de zoom avant en mode webtoon</string>
+    <string name="reader_info_bar_summary">Afficher l\'heure actuelle et la progression de la lecture en haut de l\'écran</string>
+    <string name="pages_animation_summary">Animation de tournage de page</string>
+    <string name="details_button_tip">Appuyez et maintenez le bouton Lire pour voir plus d\'options</string>
+    <string name="network">Réseau</string>
+    <string name="data_and_privacy">Données et confidentialité</string>
+    <string name="show_pages_numbers_summary">Afficher les numéros de page dans le coin inférieur</string>
 </resources>

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

@@ -359,4 +359,5 @@
     <string name="allow_unstable_updates">Tillat ustøe oppdateringar</string>
     <string name="downloads_wifi_only">Hent berre på WiFi</string>
     <string name="downloads_wifi_only_summary">Stans all henting når du byter til eit mobilnettverk</string>
+    <string name="find_similar">Finn liknande</string>
 </resources>

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

@@ -75,7 +75,7 @@
     <string name="download">Download</string>
     <string name="notifications_settings">Configurações das notificações</string>
     <string name="light_indicator">Indicador LED</string>
-	<string name="remote_sources">Fontes remotas</string>
+    <string name="remote_sources">Fontes de mangá</string>
     <string name="close">Fechar</string>
     <string name="light">Claro</string>
     <string name="history">Histórico</string>
@@ -114,7 +114,7 @@
     <string name="app_version">Versão %s</string>
     <string name="check_for_updates">Verifique se há atualizações</string>
     <string name="no_update_available">Nenhuma atualização disponível</string>
-	<string name="right_to_left">Da direita para a esquerda</string>
+    <string name="right_to_left">Da direita para a esquerda (←)</string>
     <string name="create_category">Nova categoria</string>
     <string name="scale_mode">Modo de escala</string>
     <string name="zoom_mode_fit_center">Centro de ajuste</string>
@@ -201,7 +201,7 @@
     <string name="screenshots_policy">Política de captura de ecrã</string>
     <string name="screenshots_block_all">Sempre bloquear</string>
     <string name="suggestions_summary">Sugira mangá com base nas suas preferências</string>
-	<string name="suggestions_info">Todos os dados são analisados localmente neste dispositivo. Não há transferência dos seus dados pessoais para nenhum serviço</string>
+    <string name="suggestions_info">Todos os dados são analisados apenas localmente neste dispositivo e nunca são enviados para qualquer lugar.</string>
     <string name="text_suggestion_holder">Comece a ler mangá e receberá sugestões personalizadas</string>
     <string name="suggestions">Sugestões</string>
     <string name="suggestions_enable">Ativar sugestões</string>
@@ -225,127 +225,127 @@
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="text_shelf_holder_primary">O seu mangá será exibido aqui</string>
     <string name="color_correction">Correção de cor</string>
-	<string name="server_error">Erro do lado do servidor (%1$d). Por favor, tente novamente mais tarde</string>
-	<string name="clear_new_chapters_counters">Também limpar informações sobre capítulos novos</string>
-	<string name="hide">Esconder</string>
-	<string name="text_delete_local_manga_batch">Apagar itens selecionados do aparelho permanentemente\?</string>
+    <string name="server_error">Erro do servidor (%1$d). Por favor, tente novamente mais tarde</string>
+    <string name="clear_new_chapters_counters">Apagar informações sobre novos capítulos</string>
+    <string name="hide">Ocultar</string>
+    <string name="text_delete_local_manga_batch">Excluir os itens selecionados do dispositivo permanentemente\?</string>
     <string name="compact">Compactar</string>
     <string name="bookmark_added">Marcador adicionado</string>
     <string name="prefetch_content">Pré-carregamento de conteúdo</string>
-	<string name="invalid_domain_message">Endereço inválido</string>
-	<string name="use_fingerprint">Usar impressão digital, se disponível</string>
-	<string name="appwidget_shelf_description">Mangás dos seus favoritos</string>
-	<string name="appwidget_recent_description">Os seus mangás recentemente lidos</string>
-	<string name="suggestions_excluded_genres_summary">Especifique os gêneros que não deseja ver nas sugestões</string>
+    <string name="invalid_domain_message">Domínio inválido</string>
+    <string name="use_fingerprint">Usar impressão digital, se estiver disponível</string>
+    <string name="appwidget_shelf_description">Mangá dos seus favoritos</string>
+    <string name="appwidget_recent_description">Mangás lidos recentemente</string>
+    <string name="suggestions_excluded_genres_summary">Especifique os gêneros que você não deseja ver nas sugestões</string>
     <string name="removal_completed">Remoção concluída</string>
-	<string name="check_new_chapters_title">Verifique se há novos capítulos e notifique sobre isso</string>
+    <string name="check_new_chapters_title">Verifique se há novos capítulos e notifique se houver</string>
     <string name="default_mode">Modo padrão</string>
     <string name="mark_as_current">Marcar como atual</string>
-	<string name="error_no_space_left">Não há espaço disponível no aparelho</string>
+    <string name="error_no_space_left">Não há espaço disponível no dispositivo</string>
     <string name="different_languages">Idiomas diferentes</string>
     <string name="network_unavailable">A rede não está disponível</string>
-	<string name="network_unavailable_hint">Ative o Wi-Fi ou a rede móvel para ler mangá online</string>
+    <string name="network_unavailable_hint">Ative o Wi-Fi ou a rede móvel para ler o mangá online</string>
     <string name="name">Nome</string>
-	<string name="logout">Terminar sessão</string>
+    <string name="logout">Sair</string>
     <string name="edit">Editar</string>
     <string name="edit_category">Editar categoria</string>
     <string name="tracking">Monitoramento</string>
     <string name="empty_favourite_categories">Nenhuma categoria favorita</string>
     <string name="removed_from_history">Removido do histórico</string>
     <string name="send">Enviar</string>
-	<string name="text_shelf_holder_secondary">Encontre o que ler na secção &lt;«Explorar»</string>
+    <string name="text_shelf_holder_secondary">Encontre o que ler na secção «Explorar»</string>
     <string name="suggestions_excluded_genres">Excluir gêneros</string>
-	<string name="download_slowdown">Lentidão de descarga</string>
-	<string name="download_slowdown_summary">Ajuda a evitar o bloqueio do seu endereço IP</string>
-	<string name="local_manga_processing">Processamento de mangá gravado</string>
-	<string name="chapters_will_removed_background">Os capítulos serão removidos em segundo plano. Pode levar algum tempo</string>
+    <string name="download_slowdown">Download lento</string>
+    <string name="download_slowdown_summary">Ajude a evitar o bloqueio do seu endereço IP</string>
+    <string name="local_manga_processing">Processando mangá salvo</string>
+    <string name="chapters_will_removed_background">Os capítulos serão removidos em segundo plano</string>
     <string name="canceled">Cancelado</string>
-	<string name="email_enter_hint">Digite o seu e-mail para continuar</string>
+    <string name="email_enter_hint">Digite seu e-mail para continuar</string>
     <string name="new_sources_text">Novas fontes de mangá estão disponíveis</string>
-	<string name="show_notification_new_chapters_on">Receberá notificações sobre atualizações do mangá que está lendo</string>
+    <string name="show_notification_new_chapters_on">Você receberá notificações sobre atualizações do mangá que está lendo</string>
     <string name="notifications_enable">Ativar notificações</string>
-	<string name="crash_text">Algo deu errado. Por favor, envie um relatório de bug para ajudar os programadores a consertarem isso.</string>
+    <string name="crash_text">Algo deu errado. Por favor, envie um relatório de bug para os desenvolvedores para nos ajudar a corrigi-lo.</string>
     <string name="status_planned">Planejado</string>
-	<string name="status_reading">Lendo</string>
+    <string name="status_reading">Leitura</string>
     <string name="status_re_reading">Relendo</string>
     <string name="status_completed">Concluído</string>
     <string name="status_on_hold">Em espera</string>
     <string name="show_reading_indicators">Mostrar indicadores de progresso de leitura</string>
     <string name="data_deletion">Exclusão de dados</string>
-	<string name="clear_cookies_summary">Pode ajudar no caso de alguns problemas. Todas as autorizações serão invalidadas</string>
+    <string name="clear_cookies_summary">Pode ajudar em caso de alguns problemas. Todas as autorizações serão invalidadas</string>
     <string name="show_all">Mostrar tudo</string>
-	<string name="clear_all_history">Limpar todo o histórico</string>
-	<string name="last_2_hours">Ultimas 2 horas</string>
-	<string name="categories_delete_confirm">Tem certeza que deseja apagar as categorias favoritas selecionadas\?
-\nTodos os mangás serão perdidos e isso não pode ser desfeito.</string>
-	<string name="reorder">Reordenar</string>
+    <string name="clear_all_history">Apagar todo o histórico</string>
+    <string name="last_2_hours">Últimas 2 horas</string>
+    <string name="categories_delete_confirm">Tem certeza de que deseja excluir as categorias favoritas selecionadas\?
+\nTodos os mangás serão perdidos e isso não poderá ser desfeito.</string>
+    <string name="reorder">Reorganizar</string>
     <string name="empty">Vazio</string>
     <string name="explore">Explorar</string>
-	<string name="comics_archive">Arquivo de banda desenhada</string>
+    <string name="comics_archive">Arquivos de quadrinhos</string>
     <string name="folder_with_images">Pasta com imagens</string>
-	<string name="importing_manga">Importando mangá(s)</string>
-	<string name="saved_manga">Mangás gravados</string>
-	<string name="history_shortcuts">Mostrar atalhos de mangás recentes</string>
-	<string name="history_shortcuts_summary">Torne os mangás recentes visíveis pressionando o ícone da aplicação</string>
-	<string name="brightness">Luminosidade</string>
+    <string name="importing_manga">Importando mangá</string>
+    <string name="saved_manga">Mangás salvos</string>
+    <string name="history_shortcuts">Mostrar atalhos de mangá recentes</string>
+    <string name="history_shortcuts_summary">Disponibilizar mangás recentes pressionando por um curto período de tempo o ícone do aplicativo</string>
+    <string name="brightness">Brilho</string>
     <string name="contrast">Contraste</string>
     <string name="reset">Redefinir</string>
-	<string name="text_unsaved_changes_prompt">Gravar ou descartar alterações não gravadas\?</string>
+    <string name="text_unsaved_changes_prompt">Salvar ou descartar alterações não salvas\?</string>
     <string name="select_range">Selecionar intervalo</string>
-	<string name="reader_slider">Mostrar controle deslizante de troca de página</string>
+    <string name="reader_slider">Mostrar controle de leitura deslizante</string>
     <string name="source_disabled">Fonte desativada</string>
     <string name="account_already_exists">Essa conta já existe</string>
     <string name="back">Voltar</string>
     <string name="sync">Sincronização</string>
-	<string name="sync_title">Sincronize os seus dados</string>
-	<string name="show_notification_new_chapters_off">Não receberá notificações, mas novos capítulos serão destacados nas listas</string>
+    <string name="sync_title">Sincronizar os seus dados</string>
+    <string name="show_notification_new_chapters_off">Você não receberá notificações, mas novos capítulos serão destacados nas listas</string>
     <string name="bookmark_add">Adicionar marcador</string>
     <string name="bookmark_remove">Remover marcador</string>
     <string name="bookmarks">Marcadores</string>
     <string name="bookmark_removed">Marcador removido</string>
     <string name="undo">Desfazer</string>
     <string name="dns_over_https">DNS sobre HTTPS</string>
-	<string name="detect_reader_mode">Detecção automática do modo de leitura</string>
-	<string name="detect_reader_mode_summary">Detetar automaticamente se o mangá é webtoon</string>
-	<string name="disable_battery_optimization">Desative a otimização da bateria</string>
+    <string name="detect_reader_mode">Modo de leitor de detecção automática</string>
+    <string name="detect_reader_mode_summary">Detectar automaticamente se o mangá é webtoon</string>
+    <string name="disable_battery_optimization">Desativar otimização de bateria</string>
     <string name="disable_battery_optimization_summary">Ajuda com verificações de atualizações em segundo plano</string>
-	<string name="status_dropped">Desistido</string>
+    <string name="status_dropped">Dropado</string>
     <string name="disable_all">Desativar tudo</string>
-	<string name="report">Reportar</string>
-	<string name="show_reading_indicators_summary">Mostrar percentual de leitura no histórico e nos favoritos</string>
-	<string name="exclude_nsfw_from_history_summary">Mangás marcados como +18 nunca serão adicionados ao histórico e o seu progresso não sera gravado</string>
-	<string name="history_cleared">Histórico apagado</string>
-	<string name="manage">Gerir</string>
-	<string name="no_bookmarks_yet">Sem páginas marcadas ainda</string>
-	<string name="no_bookmarks_summary">Pode criar um marcador de página enquanto lé o mangá</string>
-	<string name="bookmarks_removed">Marcadores de página removidos</string>
-	<string name="no_manga_sources">Sem fontes de mangás</string>
-	<string name="no_manga_sources_text">Ative as fontes de mangá para ler online</string>
+    <string name="report">Relatório</string>
+    <string name="show_reading_indicators_summary">Mostrar porcentagem lida no histórico e favoritos</string>
+    <string name="exclude_nsfw_from_history_summary">Mangás marcados como NSFW nunca serão adicionados ao seu histórico e seu progresso não será salvo</string>
+    <string name="history_cleared">Histórico deletado</string>
+    <string name="manage">Gerenciar</string>
+    <string name="no_bookmarks_yet">Ainda não há marcadores</string>
+    <string name="no_bookmarks_summary">Você pode criar marcadores enquanto lê o mangá</string>
+    <string name="bookmarks_removed">Marcadores removidos</string>
+    <string name="no_manga_sources">Sem fontes de mangá</string>
+    <string name="no_manga_sources_text">Habilitar fontes de mangá para ler o mangá online</string>
     <string name="random">Aleatório</string>
     <string name="confirm_exit">Pressione Voltar novamente para sair</string>
-	<string name="exit_confirmation_summary">Pressione Voltar duas vezes para sair do app</string>
+    <string name="exit_confirmation_summary">Pressione Voltar duas vezes para sair do aplicativo</string>
     <string name="exit_confirmation">Confirmação de saída</string>
     <string name="pages_cache">Cache de páginas</string>
-	<string name="other_cache">Outro cache</string>
-	<string name="storage_usage">Uso de armazenamento</string>
+    <string name="other_cache">Outros cache</string>
+    <string name="storage_usage">Armazenamento usado</string>
     <string name="available">Disponível</string>
     <string name="memory_usage_pattern">%s - %s</string>
     <string name="removed_from_favourites">Removido dos favoritos</string>
     <string name="options">Opções</string>
     <string name="not_found_404">Conteúdo não encontrado ou removido</string>
-	<string name="incognito_mode">Modo anônimo</string>
+    <string name="incognito_mode">Modo de navegação anônima</string>
     <string name="no_chapters">Sem capítulos</string>
     <string name="automatic_scroll">Rolagem automática</string>
     <string name="reader_info_pattern">Cap. %1$d/%2$d Pág. %3$d/%4$d</string>
     <string name="reader_info_bar">Mostrar barra de informações no leitor</string>
-	<string name="import_completed">Importação completa</string>
-	<string name="import_completed_hint">Pode apagar o ficheiro original do aparelho para poupar espaço</string>
+    <string name="import_completed">Importação concluída</string>
+    <string name="import_completed_hint">Você pode excluir o arquivo original do armazenamento para economizar espaço</string>
     <string name="import_will_start_soon">A importação começará em breve</string>
-	<string name="feed">Feed</string>
-	<string name="manga_error_description_pattern">Detalhes do erro:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Tente &lt;a href=%2$s&gt;abrir o mangá num navegador de internet&lt;/a&gt;para garantir que ele está disponível na fonte&lt;br&gt;2. Se estiver disponível, envie um relatório de erro para os programadores.</string>
-	<string name="reader_control_ltr_summary">Tocar na borda direita ou pressionar a tecla direita sempre passa para a próxima página</string>
-	<string name="reader_control_ltr">Controle de leitura ergonômico</string>
-	<string name="color_correction_hint">As configurações de cor escolhidas serão lembradas para esse mangá</string>
+    <string name="feed">Fluxo de conteúdo</string>
+    <string name="manga_error_description_pattern">Detalhes do erro:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Tente &lt;a href=%2$s&gt;abra a página do mangá em um navegador da web&lt;/a&gt; para garantir que o mesmo esteja disponível em sua fonte&lt;br&gt;2. Se estiver disponível, envie um relatório de erro para os desenvolvedores.</string>
+    <string name="reader_control_ltr_summary">Tocar na borda direita ou pressionar a tecla direita sempre muda para a próxima página</string>
+    <string name="reader_control_ltr">Controle ergonômico do leitor</string>
+    <string name="color_correction_hint">As configurações de cores escolhidas serão lembradas para este mangá</string>
     <string name="discard">Descartar</string>
     <string name="language">Idioma</string>
     <string name="theme_name_mamimi">Mamimi</string>
@@ -366,4 +366,9 @@
     <string name="theme_name_asuka">Asuka</string>
     <string name="theme_name_mion">Mion</string>
     <string name="settings_apply_restart_required">Por favor, reinicie o app para aplicar essas mudanças</string>
+    <string name="theme_name_kanade">Kanade</string>
+    <string name="scrobbling_empty_hint">Para acompanhar o progresso da leitura, selecione Menu → Vá até a tela de detalhes do mangá.</string>
+    <string name="details_button_tip">Pressione e segure o botão Ler para ver mais opções</string>
+    <string name="webtoon_zoom">Zoom Webtoon</string>
+    <string name="allow_unstable_updates_summary">Propor atualizações para versões beta do aplicativo</string>
 </resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -203,7 +203,7 @@
     <string name="suggestions">Öneriler</string>
     <string name="suggestions_enable">Önerileri etkinleştir</string>
     <string name="suggestions_summary">Tercihlerinize göre manga önerileri alın</string>
-	<string name="suggestions_info">Tüm veriler sadece bu cihaz üzerinde yerel olarak işlenir ve asla herhangi bir yere satılmaz.</string>
+    <string name="suggestions_info">Tüm veriler bu cihazda yalnızca yerel olarak analiz edilir ve asla hiçbir yere gönderilmez.</string>
     <string name="text_suggestion_holder">Manga okumaya başladıktan sonra kişiselleştirilmiş öneriler alacaksınız</string>
     <string name="exclude_nsfw_from_suggestions">Uygunsuz manga önerme</string>
     <string name="enabled">Etkin</string>
@@ -227,7 +227,7 @@
     <string name="suggestions_excluded_genres_summary">Önerilerde görmek istemediğiniz türleri belirtin</string>
     <string name="text_delete_local_manga_batch">Seçilen ögeler aygıttan kalıcı olarak silinsin mi\?</string>
     <string name="removal_completed">Kaldırma tamamlandı</string>
-	<string name="chapters_will_removed_background">Bölümler arka planda kaldırılacak.</string>
+    <string name="chapters_will_removed_background">Bölümler arka planda kaldırılacak</string>
     <string name="download_slowdown">İndirmeyi yavaşlat</string>
     <string name="download_slowdown_summary">IP adresinizin engellenmesinden kaçınmanıza yardımcı olur</string>
     <string name="local_manga_processing">Kaydedilen manga işleme</string>
@@ -302,7 +302,7 @@
     <string name="removed_from_favourites">Favorilerden kaldırıldı</string>
     <string name="exit_confirmation">Çıkış doğrulaması</string>
     <string name="comics_archive">Çizgi roman arşivi</string>
-	<string name="manga_error_description_pattern">Hata ayrıntıları:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1.Mangayı &lt;a href=%2$s&gt;kaynağında mevcut olduğuna emin olmak için&lt;/a&gt; bir web tarayıcısında açın&lt;br&gt;2. &lt;a href=kotatsu://about&gt; Kotatsunun son sürümünü kullandığnızdan emin olun.&lt;/a&gt;/br&gt; 3. Mevcutsa, geliştiricilere bir hata reporu gönderin.</string>
+    <string name="manga_error_description_pattern">Hata ayrıntıları:&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1. Kaynağında bulunduğundan emin olmak için &lt;a href=%2$s&gt;mangayı bir web tarayıcısında açmayı&lt;/a&gt; deneyin&lt;br&gt;2. &lt;a href=kotatsu://about&gt;Kotatsu\'nun en son sürümünü&lt;/a&gt;&lt;br&gt;3 kullandığınızdan emin olun. Varsa, geliştiricilere bir hata raporu gönderin.</string>
     <string name="text_shelf_holder_secondary">«Keşfet» kısmında neler okuyacağınızı bulun</string>
     <string name="categories_delete_confirm">Seçilen favori kategorileri silmek istediğinizden emin misiniz\?
 \nİçindeki tüm mangalar kaybolur ve bu işlem geri alınamaz.</string>
@@ -379,7 +379,7 @@
     <string name="clear_network_cache">İnternet geçmişini temizle</string>
     <string name="sync_settings">Eşitleme seçenekleri</string>
     <string name="server_address">Sunucu adresi</string>
-	<string name="sync_host_description">"Şirket içinde barındırılan bir eşitleme sunucusu veya varsayılan bir sunucu kullanabilirsiniz.  Ne yaptığınızdan emin değilseniz bunu değiştirmeyin."</string>
+    <string name="sync_host_description">Şirket içinde barındırılan bir eşitleme sunucusu veya varsayılan bir sunucu kullanabilirsiniz. Ne yaptığınızdan emin değilseniz bunu değiştirmeyin.</string>
     <string name="mirror_switching_summary">Yansıtmalar varsa, hatalarda uzak kaynaklar için etki alanlarını otomatik olarak değiştir</string>
     <string name="downloads_wifi_only_summary">Mobil ağa geçerken indirmeyi durdur</string>
     <string name="remove_completed">Bitirilenleri kaldır</string>
@@ -392,7 +392,7 @@
     <string name="speed">Hız</string>
     <string name="restore_backup_description">Kullanıcı verilerinin önceden oluşturulmuş bir yedeğini içe aktarın</string>
     <string name="show_on_shelf">Rafta Göster</string>
-	<string name="sync_auth_hint">Mevcut bir hesapta oturum açabilir veya yeni bir hesap oluşturabilirsiniz.</string>
+    <string name="sync_auth_hint">Mevcut bir hesapta oturum açabilir veya yeni bir hesap oluşturabilirsiniz</string>
     <string name="ignore_ssl_errors">SSL hatalarını görmezden gel</string>
     <string name="pause">Durdur</string>
     <string name="resume">Devam et</string>
@@ -423,4 +423,12 @@
     <string name="downloaded">İndirildi</string>
     <string name="images_procy_description">Trafik kullanımını azaltmak ve mümkünse resim yüklemeyi hızlandırmak için wsrv.nl hizmetini kullanın</string>
     <string name="username">Kullanıcı adı</string>
+    <string name="network">Ağ</string>
+    <string name="data_and_privacy">Veri ve gizlilik</string>
+    <string name="restore_summary">Önceden oluşturulmuş yedeği geri yükle</string>
+    <string name="webtoon_zoom_summary">Webtoon modunda yakınlaştırma hareketine izin ver</string>
+    <string name="reader_info_bar_summary">Geçerli saati ve okuma ilerlemesini ekranın üst kısmında gösterin</string>
+    <string name="show_pages_numbers_summary">Sayfa numaralarını alt köşede göster</string>
+    <string name="pages_animation_summary">Sayfa Çevirme Animasyonu</string>
+    <string name="details_button_tip">Daha fazla seçenek görmek için Oku düğmesini basılı tutun</string>
 </resources>

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

@@ -22,7 +22,7 @@
     <string name="detailed_list">Детальний список</string>
     <string name="list_mode">Режим списку</string>
     <string name="settings">Налаштування</string>
-    <string name="remote_sources">Джерела манги</string>
+    <string name="remote_sources">Джерела манґи</string>
     <string name="loading_">Завантаження…</string>
     <string name="computing_">Обчислення…</string>
     <string name="chapter_d_of_d">Розділ %1$d із %2$d</string>