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

revert: "Simplify backup code"

Browse source 
This reverts commit 58c5a17c50.
This commit is contained in:
Ahmad Ansori Palembani 2024-10-06 15:48:31 +07:00
parent a33a167e2c
commit f4bf249477
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

53
app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/legacy/SettingsDataLegacyController.kt
View file

@ -251,6 +251,10 @@ class SettingsDataLegacyController : SettingsLegacyController() {
storagePreferences.baseStorageDirectory().set(file.uri.toString()) storagePreferences.baseStorageDirectory().set(file.uri.toString())
} }
CODE_BACKUP_CREATE -> {
doBackup(backupFlags, uri, true)
}
CODE_BACKUP_RESTORE -> { CODE_BACKUP_RESTORE -> {
(activity as? MainActivity)?.showNotificationPermissionPrompt(true) (activity as? MainActivity)?.showNotificationPermissionPrompt(true)
showBackupRestoreDialog(uri) showBackupRestoreDialog(uri)
@ -259,28 +263,48 @@ class SettingsDataLegacyController : SettingsLegacyController() {
} }
} }
private fun createBackup(options: BackupOptions) { private fun doBackup(options: BackupOptions, uri: Uri, requirePersist: Boolean = false) {
val activity = activity ?: return val activity = activity ?: return
backupFlags = options val actualUri =
val uri = storageManager.getBackupsDirectory()?.createFile(Backup.getBackupFilename())?.uri
if (uri == null) {
activity?.toast(MR.strings.invalid_location_generic)
return
}
/* Might not need it
if (requirePersist) { if (requirePersist) {
val intentFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or val intentFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
Intent.FLAG_GRANT_WRITE_URI_PERMISSION Intent.FLAG_GRANT_WRITE_URI_PERMISSION
activity.tryTakePersistableUriPermission(uri, intentFlags) activity.tryTakePersistableUriPermission(uri, intentFlags)
} uri
*/ } else {
UniFile.fromUri(activity, uri)?.createFile(Backup.getBackupFilename())?.uri
} ?: return
activity.toast(MR.strings.creating_backup) activity.toast(MR.strings.creating_backup)
BackupCreatorJob.startNow(activity, uri, options) BackupCreatorJob.startNow(activity, actualUri, options)
}
private fun createBackup(options: BackupOptions, picker: Boolean = false) {
backupFlags = options
val dir = storageManager.getBackupsDirectory()
if (dir == null) {
activity?.toast(MR.strings.invalid_location_generic)
return
}
if (!picker) {
doBackup(backupFlags, dir.uri)
return
}
try {
// Use Android's built-in file creator
val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
.addCategory(Intent.CATEGORY_OPENABLE)
.setType("application/*")
.putExtra(Intent.EXTRA_TITLE, Backup.getBackupFilename())
startActivityForResult(intent, CODE_BACKUP_CREATE)
} catch (e: ActivityNotFoundException) {
activity?.toast(MR.strings.file_picker_error)
}
} }
private fun showBackupCreateDialog() { private fun showBackupCreateDialog() {
@ -382,6 +406,7 @@ class SettingsDataLegacyController : SettingsLegacyController() {
private const val CLEAR_CACHE_KEY = "pref_clear_cache_key" private const val CLEAR_CACHE_KEY = "pref_clear_cache_key"
private const val CODE_DATA_DIR = 104 private const val CODE_DATA_DIR = 104
private const val CODE_BACKUP_CREATE = 504
private const val CODE_BACKUP_RESTORE = 505 private const val CODE_BACKUP_RESTORE = 505
private const val HELP_URL = "https://tachiyomi.org/docs/guides/backups" private const val HELP_URL = "https://tachiyomi.org/docs/guides/backups"