From a779dc331a44fb0ad53b74e5280a35660406fcd8 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 24 Apr 2025 03:29:42 -0500
Subject: [PATCH] Don't check for xml extension for backups

---
 .../org/tasks/dialogs/ImportTasksDialog.kt    | 22 +++++++------------
 .../tasks/preferences/fragments/Backups.kt    |  9 ++------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/tasks/dialogs/ImportTasksDialog.kt b/app/src/main/java/org/tasks/dialogs/ImportTasksDialog.kt
index 1fb4b2add..a497b2e8a 100644
--- a/app/src/main/java/org/tasks/dialogs/ImportTasksDialog.kt
+++ b/app/src/main/java/org/tasks/dialogs/ImportTasksDialog.kt
@@ -25,7 +25,6 @@ class ImportTasksDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val arguments = requireArguments()
         val data = arguments.getParcelable<Uri>(EXTRA_URI)
-        val extension = arguments.getString(EXTRA_EXTENSION)
         val progressDialog = dialogBuilder.newProgressDialog().apply {
             setProgressStyle(ProgressDialog.STYLE_SPINNER)
             setCancelable(false)
@@ -34,17 +33,14 @@ class ImportTasksDialog : DialogFragment() {
 
         progressDialog.show()
         isCancelable = false
-        when (extension) {
-            "json" -> lifecycleScope.launch {
-                val result = withContext(NonCancellable) {
-                    jsonImporter.importTasks(requireActivity(), data, progressDialog)
-                }
-                if (progressDialog.isShowing) {
-                    progressDialog.dismiss()
-                }
-                showSummary(result)
+        lifecycleScope.launch {
+            val result = withContext(NonCancellable) {
+                jsonImporter.importTasks(requireActivity(), data, progressDialog)
             }
-            else -> throw RuntimeException("Invalid extension: $extension")
+            if (progressDialog.isShowing) {
+                progressDialog.dismiss()
+            }
+            showSummary(result)
         }
         return progressDialog
     }
@@ -70,13 +66,11 @@ class ImportTasksDialog : DialogFragment() {
 
     companion object {
         private const val EXTRA_URI = "extra_uri"
-        private const val EXTRA_EXTENSION = "extra_extension"
 
-        fun newImportTasksDialog(data: Uri?, extension: String?): ImportTasksDialog {
+        fun newImportTasksDialog(data: Uri): ImportTasksDialog {
             val importTasksDialog = ImportTasksDialog()
             val args = Bundle()
             args.putParcelable(EXTRA_URI, data)
-            args.putString(EXTRA_EXTENSION, extension)
             importTasksDialog.arguments = args
             return importTasksDialog
         }
diff --git a/app/src/main/java/org/tasks/preferences/fragments/Backups.kt b/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
index 4d056c13c..dffd5226f 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/Backups.kt
@@ -17,7 +17,6 @@ import org.tasks.extensions.Context.toast
 import org.tasks.files.FileHelper
 import org.tasks.injection.InjectingPreferenceFragment
 import org.tasks.kmp.org.tasks.time.getFullDateTime
-import org.tasks.preferences.FragmentPermissionRequestor
 import org.tasks.preferences.PermissionRequestor
 import org.tasks.preferences.Preferences
 import org.tasks.preferences.PreferencesViewModel
@@ -185,14 +184,10 @@ class Backups : InjectingPreferenceFragment() {
             if (resultCode == RESULT_OK) {
                 val uri = data!!.data
                 val extension = FileHelper.getExtension(requireContext(), uri!!)
-                if (!("json".equals(extension, ignoreCase = true) || "xml".equals(
-                        extension,
-                        ignoreCase = true
-                    ))
-                ) {
+                if (!"json".equals(extension, ignoreCase = true)) {
                     context?.toast(R.string.invalid_backup_file)
                 } else {
-                    ImportTasksDialog.newImportTasksDialog(uri, extension)
+                    ImportTasksDialog.newImportTasksDialog(uri)
                         .show(parentFragmentManager, FRAG_TAG_IMPORT_TASKS)
                 }
             }