From 92473964cdc38464a576958eb0e56cb5825752c2 Mon Sep 17 00:00:00 2001
From: nashaofu <diaocheng@outlook.com>
Date: Sun, 6 Oct 2024 22:01:04 +0800
Subject: [PATCH 1/4] fix: Fix the issue of Android saving files with a .txt
 extension

---
 plugins/dialog/android/src/main/java/DialogPlugin.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/android/src/main/java/DialogPlugin.kt b/plugins/dialog/android/src/main/java/DialogPlugin.kt
index 15af6808..3e794d6b 100644
--- a/plugins/dialog/android/src/main/java/DialogPlugin.kt
+++ b/plugins/dialog/android/src/main/java/DialogPlugin.kt
@@ -190,7 +190,7 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
 
       val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
       intent.addCategory(Intent.CATEGORY_OPENABLE)
-      intent.setType("text/plain")
+      intent.setType("*/*")
       intent.putExtra(Intent.EXTRA_TITLE, args.fileName ?: "")
       startActivityForResult(invoke, intent, "saveFileDialogResult")
     } catch (ex: Exception) {

From c624c1a4ebcd954063c5ae4eddd65a269fec2eba Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.app>
Date: Wed, 9 Oct 2024 08:40:43 -0300
Subject: [PATCH 2/4] fix(dialog): pull intent type from extensions filters

---
 .changes/fix-android-mime-type.md             |  6 ++
 .../src-tauri/gen/android/.idea/gradle.xml    |  5 +-
 .../android/src/main/java/DialogPlugin.kt     | 59 +++++++++++++------
 3 files changed, 52 insertions(+), 18 deletions(-)
 create mode 100644 .changes/fix-android-mime-type.md

diff --git a/.changes/fix-android-mime-type.md b/.changes/fix-android-mime-type.md
new file mode 100644
index 00000000..5e7bee4a
--- /dev/null
+++ b/.changes/fix-android-mime-type.md
@@ -0,0 +1,6 @@
+---
+"dialog": patch
+"dialog-ts": patch
+---
+
+Set `save` dialog mime type from the `filters` extensions on Android.
diff --git a/examples/api/src-tauri/gen/android/.idea/gradle.xml b/examples/api/src-tauri/gen/android/.idea/gradle.xml
index be741543..ff118549 100644
--- a/examples/api/src-tauri/gen/android/.idea/gradle.xml
+++ b/examples/api/src-tauri/gen/android/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -18,7 +19,7 @@
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.0.0-rc.7/mobile/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.0.2/mobile/android" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
@@ -27,6 +28,8 @@
             <option value="$PROJECT_DIR$/../../../../../plugins/clipboard-manager/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/dialog/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/fs/android" />
+            <option value="$PROJECT_DIR$/../../../../../plugins/geolocation/android" />
+            <option value="$PROJECT_DIR$/../../../../../plugins/haptics/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/nfc/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/notification/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/shell/android" />
diff --git a/plugins/dialog/android/src/main/java/DialogPlugin.kt b/plugins/dialog/android/src/main/java/DialogPlugin.kt
index 3e794d6b..af0467d8 100644
--- a/plugins/dialog/android/src/main/java/DialogPlugin.kt
+++ b/plugins/dialog/android/src/main/java/DialogPlugin.kt
@@ -10,6 +10,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
+import android.webkit.MimeTypeMap
 import androidx.activity.result.ActivityResult
 import app.tauri.Logger
 import app.tauri.annotation.ActivityCallback
@@ -43,6 +44,7 @@ class MessageOptions {
 @InvokeArg
 class SaveFileDialogOptions {
   var fileName: String? = null
+  lateinit var filters: Array<Filter>
 }
 
 @TauriPlugin
@@ -57,20 +59,7 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
       
       val intent = if (parsedTypes.isNotEmpty()) {
         val intent = Intent(Intent.ACTION_PICK)
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, parsedTypes)
-        
-        var uniqueMimeType = true
-        var mimeKind: String? = null
-        for (mime in parsedTypes) {
-          val kind = mime.split("/")[0]
-          if (mimeKind == null) {
-            mimeKind = kind
-          } else if (mimeKind != kind) {
-            uniqueMimeType = false
-          }
-        }
-        
-        intent.type = if (uniqueMimeType) Intent.normalizeMimeType("$mimeKind/*") else "*/*"
+        setIntentMimeTypes(intent, parsedTypes)
         intent
       } else {
         val intent = Intent(Intent.ACTION_GET_CONTENT)
@@ -130,12 +119,46 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
   private fun parseFiltersOption(filters: Array<Filter>): Array<String> {
     val mimeTypes = mutableListOf<String>()
     for (filter in filters) {
-      for (mime in filter.extensions) {
-        mimeTypes.add(if (mime == "text/csv") "text/comma-separated-values" else mime)
+      for (ext in filter.extensions) {
+        if (ext.contains('/')) {
+          mimeTypes.add(if (ext == "text/csv") "text/comma-separated-values" else ext)
+        } else {
+          MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext)?.let {
+            mimeTypes.add(it)
+          }
+        }
       }
     }
     return mimeTypes.toTypedArray()
   }
+
+  private fun setIntentMimeTypes(intent: Intent, mimeTypes: Array<String>) {
+    if (mimeTypes.isNotEmpty()) {
+      var uniqueMimeKind = true
+      var mimeKind: String? = null
+      for (mime in mimeTypes) {
+        val kind = mime.split("/")[0]
+        if (mimeKind == null) {
+          mimeKind = kind
+        } else if (mimeKind != kind) {
+          uniqueMimeKind = false
+        }
+      }
+
+      if (uniqueMimeKind) {
+        if (mimeTypes.size > 1) {
+          intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
+          intent.type = Intent.normalizeMimeType("$mimeKind/*")
+        } else {
+          intent.type = mimeTypes[0]
+        }
+      } else {
+        intent.type = "*/*"
+      }
+    } else {
+      intent.type = "*/*"
+    }
+  }
   
   @Command
   fun showMessageDialog(invoke: Invoke) {
@@ -187,10 +210,12 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
   fun saveFileDialog(invoke: Invoke) {
     try {
       val args = invoke.parseArgs(SaveFileDialogOptions::class.java)
+      val parsedTypes = parseFiltersOption(args.filters)
 
       val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
+      setIntentMimeTypes(intent, parsedTypes)
+
       intent.addCategory(Intent.CATEGORY_OPENABLE)
-      intent.setType("*/*")
       intent.putExtra(Intent.EXTRA_TITLE, args.fileName ?: "")
       startActivityForResult(invoke, intent, "saveFileDialogResult")
     } catch (ex: Exception) {

From 5b37a2f682b851f104e640decae35a4a616f72e2 Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.app>
Date: Wed, 9 Oct 2024 08:43:55 -0300
Subject: [PATCH 3/4] fix covector

---
 .changes/fix-android-mime-type.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changes/fix-android-mime-type.md b/.changes/fix-android-mime-type.md
index 5e7bee4a..f9d92237 100644
--- a/.changes/fix-android-mime-type.md
+++ b/.changes/fix-android-mime-type.md
@@ -1,6 +1,6 @@
 ---
 "dialog": patch
-"dialog-ts": patch
+"dialog-js": patch
 ---
 
 Set `save` dialog mime type from the `filters` extensions on Android.

From fc7e6fccd851278856ef78d82665a4d2eb0823cd Mon Sep 17 00:00:00 2001
From: nashaofu <nashaofu@users.noreply.github.com>
Date: Sat, 15 Feb 2025 09:22:38 +0800
Subject: [PATCH 4/4] fix: Fix the issue of inconsistency between selected
 files and returned files.

---
 plugins/dialog/ios/Sources/FilePickerController.swift | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/dialog/ios/Sources/FilePickerController.swift b/plugins/dialog/ios/Sources/FilePickerController.swift
index b2752f0b..20e3119e 100644
--- a/plugins/dialog/ios/Sources/FilePickerController.swift
+++ b/plugins/dialog/ios/Sources/FilePickerController.swift
@@ -119,8 +119,7 @@ public class FilePickerController: NSObject {
 extension FilePickerController: UIDocumentPickerDelegate {
 	public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
 		do {
-			let temporaryUrls = try urls.map { try saveTemporaryFile($0) }
-			self.plugin.onFilePickerEvent(.selected(temporaryUrls))
+			self.plugin.onFilePickerEvent(.selected(urls))
 		} catch {
 			self.plugin.onFilePickerEvent(.error("Failed to create a temporary copy of the file"))
 		}
@@ -149,8 +148,7 @@ extension FilePickerController: UIImagePickerControllerDelegate, UINavigationCon
 		dismissViewController(picker) {
 			if let url = info[.mediaURL] as? URL {
 				do {
-					let temporaryUrl = try self.saveTemporaryFile(url)
-					self.plugin.onFilePickerEvent(.selected([temporaryUrl]))
+					self.plugin.onFilePickerEvent(.selected([url]))
 				} catch {
 					self.plugin.onFilePickerEvent(.error("Failed to create a temporary copy of the file"))
 				}