From 5ec56b66a4028eb595f8c1f0c4e62414f201d08f Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 27 Oct 2022 18:02:53 -0400 Subject: [PATCH] Show file URI when invalid backup file is selected (cherry picked from commit 1704dc062d9f610ff1787260516893e697773108) --- .../more/settings/screen/SettingsBackupScreen.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index 42fe13c30..289d0790b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -247,7 +247,7 @@ class SettingsBackupScreen : SearchableSettings { AlertDialog( onDismissRequest = onDismissRequest, title = { Text(text = stringResource(R.string.invalid_backup_file)) }, - text = { Text(text = err.message) }, + text = { Text(text = "${err.uri}\n\n${err.message}") }, dismissButton = { TextButton( onClick = { @@ -312,7 +312,7 @@ class SettingsBackupScreen : SearchableSettings { val results = try { BackupFileValidator().validate(context, it) } catch (e: Exception) { - error = InvalidRestore(e.message.toString()) + error = InvalidRestore(it, e.message.toString()) return@rememberLauncherForActivityResult } @@ -419,5 +419,6 @@ private data class MissingRestoreComponents( ) data class InvalidRestore( + val uri: Uri, val message: String, )