feat(fs): resolve content URIs on Android (#1658)

* Implemented writeTextFile on Android.

* Added license headers.

* fix fmt checks.

* implement more file APIs

* change file

* cleanup

* refactor dialog plugin to leverage new FS APIs

* implement metadata functions

* fix build

* expose FS rust API

* resolve resources on android

* update pnpm

* update docs

---------

Co-authored-by: Lucas Nogueira <[email protected]>

Author: mikoto2000

.changes/dialog-return-path.md

@@ -0,0 +1,7 @@
+---
+"dialog": patch
+"dialog-js": patch
+---
+
+The `open` function now returns a string representing either the file path or URI instead of an object.
+To read the file data, use the `fs` APIs.

.changes/resolve-content-uris.md

@@ -0,0 +1,5 @@
+---
+"fs": patch:feat
+---
+
+Resolve `content://` path URIs on Android.

Cargo.lock

@@ -11,10 +11,10 @@ resolver = "2"
 [workspace.dependencies]
 serde = { version = "1", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.0-rc.3", default-features = false }
-tauri-build = "2.0.0-rc.3"
-tauri-plugin = "2.0.0-rc.3"
-tauri-utils = "2.0.0-rc.3"
+tauri = { version = "2.0.0-rc.5", default-features = false }
+tauri-build = "2.0.0-rc.5"
+tauri-plugin = "2.0.0-rc.5"
+tauri-utils = "2.0.0-rc.5"
 serde_json = "1"
 thiserror = "1"
 url = "2"

Cargo.toml

@@ -30,7 +30,7 @@
     "@iconify-json/codicon": "^1.1.37",
     "@iconify-json/ph": "^1.1.8",
     "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tauri-apps/cli": "2.0.0-rc.4",
+    "@tauri-apps/cli": "2.0.0-rc.6",
     "@unocss/extractor-svelte": "^0.62.0",
     "svelte": "^4.2.8",
     "unocss": "^0.62.0",

examples/api/package.json

@@ -61,6 +61,9 @@
     "clipboard-manager:allow-write-text",
     "clipboard-manager:allow-read-image",
     "clipboard-manager:allow-write-image",
+    "fs:allow-open",
+    "fs:allow-write",
+    "fs:allow-read",
     "fs:allow-rename",
     "fs:allow-mkdir",
     "fs:allow-remove",

examples/api/src-tauri/capabilities/base.json

@@ -23,11 +23,7 @@
 
   async function prompt() {
     confirm("Do you want to do something?")
-      .then((res) =>
-        onMessage(
-          res ? "Yes" : "No"
-        )
-      )
+      .then((res) => onMessage(res ? "Yes" : "No"))
       .catch(onMessage);
   }
 
@@ -67,14 +63,15 @@
         if (Array.isArray(res)) {
           onMessage(res);
         } else {
-          var pathToRead = typeof res === "string" ? res : res.path;
+          var pathToRead = res;
           var isFile = pathToRead.match(/\S+\.\S+$/g);
           readFile(pathToRead)
             .then(function (response) {
               if (isFile) {
                 if (
                   pathToRead.includes(".png") ||
-                  pathToRead.includes(".jpg")
+                  pathToRead.includes(".jpg") ||
+                  pathToRead.includes(".jpeg")
                 ) {
                   arrayBufferToBase64(
                     new Uint8Array(response),
@@ -144,5 +141,7 @@
   >Open save dialog</button
 >
 <button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
-<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}>Prompt (custom)</button>
+<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
+  >Prompt (custom)</button
+>
 <button class="btn" id="message-dialog" on:click={msg}>Message</button>

examples/api/src-tauri/gen/android/.idea/gradle.xml

@@ -14,7 +14,7 @@
     "@tauri-apps/plugin-deep-link": "2.0.0-rc.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0-rc.4",
+    "@tauri-apps/cli": "2.0.0-rc.6",
     "typescript": "^5.2.2",
     "vite": "^5.0.13"
   }

examples/api/src/views/Dialog.svelte

@@ -17,13 +17,17 @@ targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
 [build-dependencies]
 tauri-plugin = { workspace = true, features = [ "build" ] }
 
+[dev-dependencies]
+tauri = { workspace = true, features = [ "wry" ] }
+
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 dunce = { workspace = true }
+url = { workspace = true }
 tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.0" }
 
 [target.'cfg(target_os = "ios")'.dependencies]