mirror of
https://github.com/null2264/yokai.git
synced 2025-06-21 10:44:42 +00:00
fix: App trying to backup as folder
This commit is contained in:
parent
1f0b122478
commit
deb6920b6a
1 changed files with 13 additions and 7 deletions
|
@ -9,6 +9,7 @@ import android.view.MenuInflater
|
|||
import android.view.MenuItem
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.net.toFile
|
||||
import androidx.core.net.toUri
|
||||
import androidx.preference.PreferenceScreen
|
||||
import com.hippo.unifile.UniFile
|
||||
|
@ -29,6 +30,7 @@ import eu.kanade.tachiyomi.util.system.toast
|
|||
import kotlinx.coroutines.flow.launchIn
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.io.File
|
||||
|
||||
class SettingsDataController : SettingsController() {
|
||||
|
||||
|
@ -184,17 +186,21 @@ class SettingsDataController : SettingsController() {
|
|||
}
|
||||
}
|
||||
|
||||
private fun doBackup(flags: Int, uri: Uri, requestPersist: Boolean = false) {
|
||||
private fun doBackup(flags: Int, uri: Uri, requirePersist: Boolean = false) {
|
||||
val activity = activity ?: return
|
||||
|
||||
if (requestPersist) {
|
||||
val intentFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
|
||||
Intent.FLAG_GRANT_WRITE_URI_PERMISSION
|
||||
val actualUri =
|
||||
if (requirePersist) {
|
||||
val intentFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
|
||||
Intent.FLAG_GRANT_WRITE_URI_PERMISSION
|
||||
|
||||
activity.contentResolver.takePersistableUriPermission(uri, intentFlags)
|
||||
}
|
||||
activity.contentResolver.takePersistableUriPermission(uri, intentFlags)
|
||||
uri
|
||||
} else {
|
||||
UniFile.fromUri(activity, uri)?.createFile(Backup.getBackupFilename())?.uri
|
||||
} ?: return
|
||||
activity.toast(R.string.creating_backup)
|
||||
BackupCreatorJob.startNow(activity, uri, flags)
|
||||
BackupCreatorJob.startNow(activity, actualUri, flags)
|
||||
}
|
||||
|
||||
fun createBackup(flags: Int, picker: Boolean = false) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue