mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-12 20:19:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split backup preferences from PreferencesHelper (#8051)

Browse Source
This commit is contained in:
Andreas
2022-09-22 14:57:42 +02:00
committed by GitHub
parent b37b3767f3
commit 5cdcc1679f
9 changed files with 76 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@@ -121,6 +121,7 @@ class MainActivity : BaseActivity() {
securityPreferences = Injekt.get(),
libraryPreferences = libraryPreferences,
readerPreferences = Injekt.get(),
backupPreferences = Injekt.get(),
)
} else {
false

14
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
View File

@@ -18,6 +18,7 @@ import androidx.core.os.bundleOf
import androidx.preference.PreferenceScreen
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.hippo.unifile.UniFile
import eu.kanade.domain.backup.service.BackupPreferences
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.backup.BackupConst
import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
@@ -42,6 +43,7 @@ import eu.kanade.tachiyomi.util.system.openInBrowser
import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import uy.kohesive.injekt.injectLazy
class SettingsBackupController : SettingsController() {
@@ -50,6 +52,8 @@ class SettingsBackupController : SettingsController() {
*/
private var backupFlags = 0
private val backupPreferences: BackupPreferences by injectLazy()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 500)
@@ -105,7 +109,7 @@ class SettingsBackupController : SettingsController() {
titleRes = R.string.pref_backup_service_category
intListPreference {
bindTo(preferences.backupInterval())
bindTo(backupPreferences.backupInterval())
titleRes = R.string.pref_backup_interval
entriesRes = arrayOf(
R.string.update_6hour,
@@ -124,7 +128,7 @@ class SettingsBackupController : SettingsController() {
}
}
preference {
bindTo(preferences.backupsDirectory())
bindTo(backupPreferences.backupsDirectory())
titleRes = R.string.pref_backup_directory
onClick {
@@ -136,7 +140,7 @@ class SettingsBackupController : SettingsController() {
}
}
preferences.backupsDirectory().changes()
backupPreferences.backupsDirectory().changes()
.onEach { path ->
val dir = UniFile.fromUri(context, path.toUri())
summary = dir.filePath + "/automatic"
@@ -144,7 +148,7 @@ class SettingsBackupController : SettingsController() {
.launchIn(viewScope)
}
intListPreference {
bindTo(preferences.numberOfBackups())
bindTo(backupPreferences.numberOfBackups())
titleRes = R.string.pref_backup_slots
entries = arrayOf("2", "3", "4", "5")
entryValues = entries
@@ -183,7 +187,7 @@ class SettingsBackupController : SettingsController() {
Intent.FLAG_GRANT_WRITE_URI_PERMISSION
activity.contentResolver.takePersistableUriPermission(uri, flags)
preferences.backupsDirectory().set(uri.toString())
backupPreferences.backupsDirectory().set(uri.toString())
}
CODE_BACKUP_CREATE -> {
val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or