From bdb4fd208f53322f13f245b6a32be6393a698330 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 20 Sep 2023 15:00:34 -0400 Subject: [PATCH] android: Allow importing saves even if no saves are found Exporting still won't be allowed on an empty save directory. --- .../fragments/ImportExportSavesFragment.kt | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt index ee2d44718..6c3c00147 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt @@ -65,25 +65,20 @@ class ImportExportSavesFragment : DialogFragment() { } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - return if (savesFolderRoot == "") { - MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.manage_save_data) - .setMessage(R.string.import_export_saves_no_profile) - .setPositiveButton(android.R.string.ok, null) - .show() - } else { - MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.manage_save_data) - .setMessage(R.string.manage_save_data_description) - .setNegativeButton(R.string.export_saves) { _, _ -> - exportSave() - } - .setPositiveButton(R.string.import_saves) { _, _ -> - documentPicker.launch(arrayOf("application/zip")) - } - .setNeutralButton(android.R.string.cancel, null) - .show() + val builder = MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.manage_save_data) + .setPositiveButton(R.string.import_saves) { _, _ -> + documentPicker.launch(arrayOf("application/zip")) + } + .setNeutralButton(android.R.string.cancel, null) + + if (savesFolderRoot != "") { + builder.setNegativeButton(R.string.export_saves) { _, _ -> + exportSave() + } } + + return builder.show() } /**