null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace RxJava in SettingsAdvancedController

Browse source
This commit is contained in:
Jays2Kings 2023-03-02 01:48:30 -05:00
parent 9c521e23ce
commit 991d46c8aa
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
View file

@ -47,6 +47,7 @@ import eu.kanade.tachiyomi.util.system.localeContext
import eu.kanade.tachiyomi.util.system.materialAlertDialog import eu.kanade.tachiyomi.util.system.materialAlertDialog
import eu.kanade.tachiyomi.util.system.setDefaultSettings import eu.kanade.tachiyomi.util.system.setDefaultSettings
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.system.withUIContext
import eu.kanade.tachiyomi.util.view.openInBrowser import eu.kanade.tachiyomi.util.view.openInBrowser
import eu.kanade.tachiyomi.util.view.withFadeTransaction import eu.kanade.tachiyomi.util.view.withFadeTransaction
import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.CoroutineStart
@ -56,9 +57,6 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import okhttp3.Headers import okhttp3.Headers
import rikka.sui.Sui import rikka.sui.Sui
import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import timber.log.Timber import timber.log.Timber
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
@ -410,25 +408,16 @@ class SettingsAdvancedController : SettingsController() {
private fun clearChapterCache() { private fun clearChapterCache() {
if (activity == null) return if (activity == null) return
val files = chapterCache.cacheDir.listFiles() ?: return viewScope.launchIO {
val files = chapterCache.cacheDir.listFiles() ?: return@launchIO
var deletedFiles = 0 var deletedFiles = 0
try {
Observable.defer { Observable.from(files) } files.forEach { file ->
.doOnNext { file -> if (chapterCache.removeFileFromCache(file.name)) {
if (chapterCache.removeFileFromCache(file.name)) { deletedFiles++
deletedFiles++ }
} }
} withUIContext {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
},
{
activity?.toast(R.string.cache_delete_error)
},
{
activity?.toast( activity?.toast(
resources?.getQuantityString( resources?.getQuantityString(
R.plurals.cache_cleared, R.plurals.cache_cleared,
@ -438,8 +427,13 @@ class SettingsAdvancedController : SettingsController() {
) )
findPreference(CLEAR_CACHE_KEY)?.summary = findPreference(CLEAR_CACHE_KEY)?.summary =
resources?.getString(R.string.used_, chapterCache.readableSize) resources?.getString(R.string.used_, chapterCache.readableSize)
}, }
) } catch (_: Exception) {
withUIContext {
activity?.toast(R.string.cache_delete_error)
}
}
}
} }
private fun clearWebViewData() { private fun clearWebViewData() {