Show file URI when invalid backup file is selected
(cherry picked from commit 1704dc062d9f610ff1787260516893e697773108)
This commit is contained in:
parent
47564449a6
commit
5ec56b66a4
@ -247,7 +247,7 @@ class SettingsBackupScreen : SearchableSettings {
|
|||||||
AlertDialog(
|
AlertDialog(
|
||||||
onDismissRequest = onDismissRequest,
|
onDismissRequest = onDismissRequest,
|
||||||
title = { Text(text = stringResource(R.string.invalid_backup_file)) },
|
title = { Text(text = stringResource(R.string.invalid_backup_file)) },
|
||||||
text = { Text(text = err.message) },
|
text = { Text(text = "${err.uri}\n\n${err.message}") },
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
TextButton(
|
TextButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
@ -312,7 +312,7 @@ class SettingsBackupScreen : SearchableSettings {
|
|||||||
val results = try {
|
val results = try {
|
||||||
BackupFileValidator().validate(context, it)
|
BackupFileValidator().validate(context, it)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
error = InvalidRestore(e.message.toString())
|
error = InvalidRestore(it, e.message.toString())
|
||||||
return@rememberLauncherForActivityResult
|
return@rememberLauncherForActivityResult
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -419,5 +419,6 @@ private data class MissingRestoreComponents(
|
|||||||
)
|
)
|
||||||
|
|
||||||
data class InvalidRestore(
|
data class InvalidRestore(
|
||||||
|
val uri: Uri,
|
||||||
val message: String,
|
val message: String,
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user