Publish New Versions (v2) (#3268 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
chore(deps): fix audits (#3373 )
2026-05-03 12:15:11 +02:00 · 2026-04-04 18:47:18 +02:00 · 2026-03-31 18:28:05 +08:00 · 2026-03-31 10:33:38 +02:00 · 2026-03-25 22:22:30 +08:00 · 2026-03-23 22:00:32 +01:00
247 changed files with 6837 additions and 4501 deletions
@@ -1,11 +1,5 @@
 [advisories]
 ignore = [
-  # time 0.1
-  "RUSTSEC-2020-0071",
-  # needs sqlx 0.7 (still in alpha)
-  "RUSTSEC-2022-0090",
-  # wry needs kuchiki on Android
-  "RUSTSEC-2023-0019",
-  # atty is only used when the `colored` feature is enabled on tauri-plugin-log
-  "RUSTSEC-2021-0145",
+  # time crate can't be updated in the repo because of MSRV, users are unaffected
+  "RUSTSEC-2026-0009",
 ]
@@ -5,6 +5,7 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 - [Issue Reporting Guidelines](#issue-reporting-guidelines)
 - [Pull Request Guidelines](#pull-request-guidelines)
 - [Development Guide](#development-guide)
+- [AI Tool Policy](#ai-tool-policy)

 ## Issue Reporting Guidelines

@@ -60,3 +61,13 @@ The easiest way to test your changes is to use the [example app](https://github.
 To test local changes against your own application simply point the plugin create to your local repository, for example:

 `tauri-plugin-sample = { path = "path/to/local/tauri-plugin-sample/" }`
+
+## AI Tool Policy
+
+It takes a lot of time to review a Pull Request while it's very easy to make a nonsensical but plausible looking one using AI tools.
+It is unfair for other contributors and the reviewers to spend much of the time dealing with this, hence these rules:
+
+1. Review and test all LLM-generated content before submitting, you're the one responsible for it, not the AI.
+2. Don't use AI to respond to review comments (except for translations).
+
+We will close the Pull Request with a `ai-slop` tag if you failed to do so.
@@ -0,0 +1,63 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: 🐞 Bug Report
+description: Report a bug
+labels: ['type: bug']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## First of all
+        1. Please search for [existing issues](https://github.com/tauri-apps/plugins-workspace/issues?q=is%3Aissue) about this problem first.
+        2. Make sure `rustc` and all relevant Tauri packages are up to date.
+        3. Make sure it's an issue with a tauri plugin and not something else you are using.
+        4. Remember to follow our community guidelines and be friendly.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is. Include screenshots if applicable.
+      placeholder: Bug description
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction
+      description: A link to a reproduction repo or steps to reproduce the behaviour.
+      placeholder: |
+        Please provide a minimal reproduction or steps to reproduce, see this guide https://stackoverflow.com/help/minimal-reproducible-example
+        Why reproduction is required? see this article https://antfu.me/posts/why-reproductions-are-required
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear description of what you expected to happen.
+
+  - type: textarea
+    id: info
+    attributes:
+      label: Full `tauri info` output
+      description: 'Output of `npm run tauri info` or `cargo tauri info`. Issues without this will be closed!'
+      render: text
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Stack trace
+      description: A stack trace or ANY error messages you may see.
+      render: text
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. For example a link to a Discord discussion.
@@ -0,0 +1,12 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+#blank_issues_enabled: false
+contact_links:
+  - name: 💡 Request a new plugin
+    url: https://github.com/orgs/tauri-apps/discussions/new?category=plugin-requests
+    about: Propose a new Plugin to the community or the Tauri org.
+  - name: 💬 Discord Chat
+    url: https://discord.com/invite/tauri
+    about: Ask questions and talk to other Tauri users and the maintainers
@@ -0,0 +1,5 @@
+---
+name: 📚 Docs Report
+about: Create a report to help us improve the docs
+labels: 'type: documentation'
+---
@@ -0,0 +1,46 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: 💡 Feature Request
+description: Request a feature or enhancement for an existing plugin
+labels: ['type: feature request']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## First of all
+        - Please search for [existing issues](https://github.com/tauri-apps/plugins-workspace/issues?q=is%3Aissue) for this request first.
+        - Only requests for plugins that exist in this repo are allowed.
+        - You can request new plugins [here](https://github.com/orgs/tauri-apps/discussions/new?category=plugin-requests)
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe the problem
+      description: A clear description of the problem this feature would solve
+      placeholder: "I'm always frustrated when..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: "Describe the solution you'd like"
+      description: A clear description of what change you would like
+      placeholder: 'I would like to...'
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives considered
+      description: "Any alternative solutions you've considered"
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
@@ -34,7 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: rustsec/audit-check@v1
+      - uses: rustsec/audit-check@v2
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          # https://github.com/tauri-apps/plugins-workspace/issues/774
@@ -11,7 +11,7 @@ on:
      - v2

 permissions:
-  # required for npm provenance
+  # required for oidc token
  id-token: write
  # required to create the GitHub Release
  contents: write
@@ -62,7 +62,6 @@ jobs:
        id: covector
        env:
          CARGO_TARGET_DIR: /mnt/target
-          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          command: 'version-or-publish'
@@ -5,6 +5,7 @@
 name: integration tests

 on:
+  workflow_dispatch:
  push:
    branches:
      - v1
@@ -154,4 +154,5 @@ jobs:
        run: cargo clippy --package ${{ matrix.package }} --all-targets -- -D warnings

      - name: clippy ${{ matrix.package }} --all-features
+        if: matrix.package != 'tauri-plugin-dialog'
        run: cargo clippy --package ${{ matrix.package }} --all-targets --all-features -- -D warnings
@@ -246,9 +246,9 @@ jobs:
        run: cargo +stable install cross --git https://github.com/cross-rs/cross

      - name: test ${{ matrix.package }}
-        if: matrix.package != 'tauri-plugin-http'
+        if: ${{ matrix.package != 'tauri-plugin-http' && matrix.package != 'tauri-plugin-dialog' }}
        run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features

      - name: test ${{ matrix.package }}
-        if: matrix.package == 'tauri-plugin-http'
+        if: ${{ matrix.package == 'tauri-plugin-http' || matrix.package == 'tauri-plugin-dialog' }}
        run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets
@@ -21,6 +21,7 @@ target/
 package-lock.json
 yarn.lock
 bun.lockb
+bun.lock

 # rust compiled folders
 target/
@@ -58,4 +59,4 @@ pids
 .idea
 debug.log
 TODO.md
-.aider*
+.aider.*
@@ -12,10 +12,10 @@ resolver = "2"
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
 log = "0.4"
-tauri = { version = "2.8.2", default-features = false }
-tauri-build = "2.4"
-tauri-plugin = "2.4"
-tauri-utils = "2.7"
+tauri = { version = "2.10", default-features = false }
+tauri-build = "2.5"
+tauri-plugin = "2.5"
+tauri-utils = "2.8"
 serde_json = "1"
 thiserror = "2"
 url = "2"
@@ -3,11 +3,12 @@
 // SPDX-License-Identifier: MIT

 import eslint from '@eslint/js'
+import { defineConfig } from 'eslint/config'
 import eslintConfigPrettier from 'eslint-config-prettier'
 import eslintPluginSecurity from 'eslint-plugin-security'
 import tseslint from 'typescript-eslint'

-export default tseslint.config(
+export default defineConfig(
  {
    ignores: [
      '**/target',
@@ -1,5 +1,94 @@
 # Changelog

+## \[2.0.38]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.5.0`
+- Upgraded to `http-js@2.5.8`
+- Upgraded to `updater-js@2.10.1`
+- Upgraded to `nfc-js@2.3.5`
+- Upgraded to `dialog-js@2.7.0`
+
+## \[2.0.37]
+
+### Dependencies
+
+- Upgraded to `updater-js@2.10.0`
+- Upgraded to `barcode-scanner-js@2.4.4`
+- Upgraded to `http-js@2.5.7`
+- Upgraded to `shell-js@2.3.5`
+
+## \[2.0.36]
+
+### Dependencies
+
+- Upgraded to `http-js@2.5.6`
+- Upgraded to `dialog-js@2.6.0`
+
+## \[2.0.35]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.5.0`
+- Upgraded to `log-js@2.8.0`
+- Upgraded to `shell-js@2.3.4`
+- Upgraded to `barcode-scanner-js@2.4.3`
+- Upgraded to `fs-js@2.4.5`
+- Upgraded to `http-js@2.5.5`
+- Upgraded to `nfc-js@2.3.4`
+- Upgraded to `opener-js@2.5.3`
+- Upgraded to `store-js@2.4.2`
+
+## \[2.0.34]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.4.2`
+- Upgraded to `biometric-js@2.3.2`
+- Upgraded to `cli-js@2.4.1`
+- Upgraded to `clipboard-manager-js@2.3.2`
+- Upgraded to `dialog-js@2.4.2`
+- Upgraded to `fs-js@2.4.4`
+- Upgraded to `global-shortcut-js@2.3.1`
+- Upgraded to `http-js@2.5.4`
+- Upgraded to `log-js@2.7.1`
+- Upgraded to `nfc-js@2.3.3`
+- Upgraded to `notification-js@2.3.3`
+- Upgraded to `opener-js@2.5.2`
+- Upgraded to `os-js@2.3.2`
+- Upgraded to `process-js@2.3.1`
+- Upgraded to `shell-js@2.3.3`
+- Upgraded to `store-js@2.4.1`
+
+## \[2.0.33]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.4.1`
+- Upgraded to `biometric-js@2.3.1`
+- Upgraded to `clipboard-manager-js@2.3.1`
+- Upgraded to `dialog-js@2.4.1`
+- Upgraded to `fs-js@2.4.3`
+- Upgraded to `nfc-js@2.3.2`
+- Upgraded to `notification-js@2.3.2`
+- Upgraded to `opener-js@2.5.1`
+- Upgraded to `shell-js@2.3.2`
+- Upgraded to `http-js@2.5.3`
+
+## \[2.0.32]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.4.0`
+- Upgraded to `log-js@2.7.0`
+
+## \[2.0.31]
+
+### Dependencies
+
+- Upgraded to `shell-js@2.3.1`
+
 ## \[2.0.30]

 ### Dependencies
@@ -1,7 +1,7 @@
 {
  "name": "api",
  "private": true,
-  "version": "2.0.30",
+  "version": "2.0.38",
  "type": "module",
  "scripts": {
    "dev": "vite --clearScreen false",
@@ -10,36 +10,36 @@
    "tauri": "tauri"
  },
  "dependencies": {
-    "@tauri-apps/api": "2.8.0",
-    "@tauri-apps/plugin-barcode-scanner": "^2.4.0",
-    "@tauri-apps/plugin-biometric": "^2.3.0",
-    "@tauri-apps/plugin-cli": "^2.4.0",
-    "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
-    "@tauri-apps/plugin-dialog": "^2.3.3",
-    "@tauri-apps/plugin-fs": "^2.4.2",
-    "@tauri-apps/plugin-geolocation": "^2.2.0",
-    "@tauri-apps/plugin-global-shortcut": "^2.3.0",
-    "@tauri-apps/plugin-haptics": "^2.2.0",
-    "@tauri-apps/plugin-http": "^2.5.2",
-    "@tauri-apps/plugin-nfc": "^2.3.1",
-    "@tauri-apps/plugin-notification": "^2.3.1",
-    "@tauri-apps/plugin-opener": "^2.5.0",
-    "@tauri-apps/plugin-os": "^2.3.1",
-    "@tauri-apps/plugin-process": "^2.3.0",
-    "@tauri-apps/plugin-shell": "^2.3.0",
-    "@tauri-apps/plugin-store": "^2.4.0",
-    "@tauri-apps/plugin-updater": "^2.9.0",
-    "@tauri-apps/plugin-upload": "^2.3.0",
+    "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/plugin-barcode-scanner": "^2.4.4",
+    "@tauri-apps/plugin-biometric": "^2.3.2",
+    "@tauri-apps/plugin-cli": "^2.4.1",
+    "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
+    "@tauri-apps/plugin-dialog": "^2.7.0",
+    "@tauri-apps/plugin-fs": "^2.5.0",
+    "@tauri-apps/plugin-geolocation": "^2.3.2",
+    "@tauri-apps/plugin-global-shortcut": "^2.3.1",
+    "@tauri-apps/plugin-haptics": "^2.3.2",
+    "@tauri-apps/plugin-http": "^2.5.8",
+    "@tauri-apps/plugin-nfc": "^2.3.5",
+    "@tauri-apps/plugin-notification": "^2.3.3",
+    "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-os": "^2.3.2",
+    "@tauri-apps/plugin-process": "^2.3.1",
+    "@tauri-apps/plugin-shell": "^2.3.5",
+    "@tauri-apps/plugin-store": "^2.4.2",
+    "@tauri-apps/plugin-updater": "^2.10.1",
+    "@tauri-apps/plugin-upload": "^2.4.0",
    "@zerodevx/svelte-json-view": "1.0.11"
  },
  "devDependencies": {
-    "@iconify-json/codicon": "^1.2.12",
+    "@iconify-json/codicon": "^1.2.49",
    "@iconify-json/ph": "^1.2.2",
-    "@sveltejs/vite-plugin-svelte": "^6.0.0",
-    "@tauri-apps/cli": "2.8.1",
-    "@unocss/extractor-svelte": "^66.3.3",
-    "svelte": "^5.20.4",
-    "unocss": "^66.3.3",
-    "vite": "^7.0.4"
+    "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "@tauri-apps/cli": "2.10.1",
+    "@unocss/extractor-svelte": "^66.6.7",
+    "svelte": "^5.54.0",
+    "unocss": "^66.6.7",
+    "vite": "^8.0.1"
  }
 }
@@ -1,5 +1,98 @@
 # Changelog

+## \[2.0.42]
+
+### Dependencies
+
+- Upgraded to `fs@2.5.0`
+- Upgraded to `http@2.5.8`
+- Upgraded to `updater@2.10.1`
+- Upgraded to `nfc@2.3.5`
+- Upgraded to `dialog@2.7.0`
+
+## \[2.0.41]
+
+### Dependencies
+
+- Upgraded to `updater@2.10.0`
+- Upgraded to `barcode-scanner@2.4.4`
+- Upgraded to `http@2.5.7`
+- Upgraded to `shell@2.3.5`
+
+## \[2.0.40]
+
+### Dependencies
+
+- Upgraded to `http@2.5.6`
+- Upgraded to `dialog@2.6.0`
+
+## \[2.0.39]
+
+### Dependencies
+
+- Upgraded to `dialog@2.5.0`
+- Upgraded to `log@2.8.0`
+- Upgraded to `shell@2.3.4`
+- Upgraded to `barcode-scanner@2.4.3`
+- Upgraded to `fs@2.4.5`
+- Upgraded to `http@2.5.5`
+- Upgraded to `nfc@2.3.4`
+- Upgraded to `opener@2.5.3`
+- Upgraded to `store@2.4.2`
+
+## \[2.0.38]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.4.2`
+- Upgraded to `biometric@2.3.2`
+- Upgraded to `cli@2.4.1`
+- Upgraded to `clipboard-manager@2.3.2`
+- Upgraded to `dialog@2.4.2`
+- Upgraded to `fs@2.4.4`
+- Upgraded to `geolocation@2.3.2`
+- Upgraded to `global-shortcut@2.3.1`
+- Upgraded to `haptics@2.3.2`
+- Upgraded to `http@2.5.4`
+- Upgraded to `log@2.7.1`
+- Upgraded to `nfc@2.3.3`
+- Upgraded to `notification@2.3.3`
+- Upgraded to `opener@2.5.2`
+- Upgraded to `os@2.3.2`
+- Upgraded to `process@2.3.1`
+- Upgraded to `shell@2.3.3`
+- Upgraded to `store@2.4.1`
+
+## \[2.0.37]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.4.1`
+- Upgraded to `biometric@2.3.1`
+- Upgraded to `clipboard-manager@2.3.1`
+- Upgraded to `dialog@2.4.1`
+- Upgraded to `fs@2.4.3`
+- Upgraded to `geolocation@2.3.1`
+- Upgraded to `haptics@2.3.1`
+- Upgraded to `nfc@2.3.2`
+- Upgraded to `notification@2.3.2`
+- Upgraded to `opener@2.5.1`
+- Upgraded to `shell@2.3.2`
+- Upgraded to `http@2.5.3`
+
+## \[2.0.36]
+
+### Dependencies
+
+- Upgraded to `dialog@2.4.0`
+- Upgraded to `log@2.7.0`
+
+## \[2.0.35]
+
+### Dependencies
+
+- Upgraded to `shell@2.3.1`
+
 ## \[2.0.34]

 ### Dependencies
@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.34"
+version = "2.0.42"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,24 +20,24 @@ serde = { workspace = true }
 tiny_http = "0.12"
 time = "0.3"
 log = { workspace = true }
-tauri-plugin-log = { path = "../../../plugins/log", version = "2.6.0" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.2", features = [
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.8.0" }
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.5.0", features = [
  "watch",
 ] }
-tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.3" }
+tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.2" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.7.0" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
  "multipart",
  "cookies",
-], version = "2.5.2" }
-tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.1", features = [
+], version = "2.5.8" }
+tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.3", features = [
  "windows7-compat",
 ] }
-tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.1" }
-tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.0" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.0" }
-tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.0" }
-tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.0" }
+tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.2" }
+tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.1" }
+tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.3" }
+tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.5" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.2" }
 tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }

 [dependencies.tauri]
@@ -55,17 +55,17 @@ features = [
 ]

 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.0" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.0" }
-tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.9.0" }
+tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.1" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.1" }
+tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.10.1" }
 tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }

 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
-tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.0" }
-tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.1" }
-tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.0" }
-tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.0" }
-tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.0" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.4" }
+tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.5" }
+tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.2" }
+tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.2" }
+tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.2" }

 [features]
 prod = ["tauri/custom-protocol"]
@@ -23,11 +23,7 @@
    "core:window:allow-start-dragging",
    "notification:default",
    "os:allow-platform",
-    "dialog:allow-open",
-    "dialog:allow-ask",
-    "dialog:allow-save",
-    "dialog:allow-confirm",
-    "dialog:allow-message",
+    "dialog:default",
    {
      "identifier": "shell:allow-spawn",
      "allow": [
@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
 }

 android {
-    compileSdk = 34
+    compileSdk = 36
    namespace = "com.tauri.api"
    defaultConfig {
        manifestPlaceholders["usesCleartextTraffic"] = "false"
        applicationId = "com.tauri.api"
        minSdk = 24
-        targetSdk = 34
+        targetSdk = 36
        versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
    }
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:8.5.1")
+        classpath("com.android.tools.build:gradle:8.11.0")
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
    }
 }
@@ -18,6 +18,6 @@ repositories {

 dependencies {
    compileOnly(gradleApi())
-    implementation("com.android.tools.build:gradle:8.5.1")
+    implementation("com.android.tools.build:gradle:8.11.0")
 }

@@ -8,6 +8,8 @@
  let filter = null;
  let multiple = false;
  let directory = false;
+  let pickerMode = "document";
+  let fileAccessMode = "scoped";

  function arrayBufferToBase64(buffer, callback) {
    var blob = new Blob([buffer], {
@@ -41,58 +43,72 @@
  }

  async function msg() {
-    await message("Tauri is awesome!");
+    await message("Tauri is awesome!").then((res) => onMessage(res));
  }

-  function openDialog() {
-    open({
-      title: "My wonderful open dialog",
-      defaultPath,
-      filters: filter
-        ? [
-            {
-              name: "Tauri Example",
-              extensions: filter.split(",").map((f) => f.trim()),
-            },
-          ]
-        : [],
-      multiple,
-      directory,
-    })
-      .then(function (res) {
-        if (Array.isArray(res)) {
-          onMessage(res);
-        } else {
-          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(".jpeg")
-                ) {
-                  arrayBufferToBase64(
-                    new Uint8Array(response),
-                    function (base64) {
-                      var src = "data:image/png;base64," + base64;
-                      insecureRenderHtml('<img src="' + src + '"></img>');
-                    }
-                  );
-                } else {
-                  onMessage(res);
-                }
-              } else {
-                onMessage(res);
-              }
-            })
-            .catch(onMessage(res));
-        }
-      })
+  async function msgCustom(result) {
+    const buttons = { yes: "awesome", no: "amazing", cancel: "stunning" };
+    await message(`Tauri is: `, { buttons })
+      .then((res) => onMessage(`Tauri is ${res}`))
      .catch(onMessage);
  }

+  async function openDialog() {
+    try {
+      var result = await open({
+        title: "My wonderful open dialog",
+        defaultPath,
+        filters: filter
+          ? [
+              {
+                name: "Tauri Example",
+                extensions: filter.split(",").map((f) => f.trim()),
+              },
+            ]
+          : [],
+        multiple,
+        directory,
+        pickerMode,
+        fileAccessMode,
+      })
+
+      if (Array.isArray(result)) {
+        onMessage(result);
+      } else {
+        var pathToRead = result;
+        var isFile = pathToRead.match(/\S+\.\S+$/g);
+
+        await readFile(pathToRead)
+          .then(function (res) {
+            if (isFile) {
+              if (
+                pathToRead.includes(".png") ||
+                pathToRead.includes(".jpg") ||
+                pathToRead.includes(".jpeg")
+              ) {
+                arrayBufferToBase64(
+                  new Uint8Array(res),
+                  function (base64) {
+                    var src = "data:image/png;base64," + base64;
+                    insecureRenderHtml('<img src="' + src + '"></img>');
+                  }
+                );
+              } else {
+                // Convert byte array to UTF-8 string
+                const decoder = new TextDecoder('utf-8');
+                const text = decoder.decode(new Uint8Array(res));
+                onMessage(text);
+              }
+            } else {
+              onMessage(res);
+          }
+        })
+      }
+    } catch(exception) {
+      onMessage(exception)
+    }
+  }
+
  function saveDialog() {
    save({
      title: "My wonderful save dialog",
@@ -105,7 +121,7 @@
            },
          ]
        : [],
-    })
+      })
      .then(onMessage)
      .catch(onMessage);
  }
@@ -135,13 +151,35 @@
  <input type="checkbox" id="dialog-directory" bind:checked={directory} />
  <label for="dialog-directory">Directory</label>
 </div>
+<div>
+  <label for="dialog-picker-mode">Picker Mode:</label>
+  <select id="dialog-picker-mode" bind:value={pickerMode}>
+    <option value="">None</option>
+    <option value="media">Media</option>
+    <option value="image">Image</option>
+    <option value="video">Video</option>
+    <option value="document">Document</option>
+  </select>
+</div>
+<div>
+  <label for="dialog-file-access-mode">File Access Mode:</label>
+  <select id="dialog-file-access-mode" bind:value={fileAccessMode}>
+    <option value="copy">Copy</option>
+    <option value="scoped">Scoped</option>
+  </select>
+</div>
 <br />
-<button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
-<button class="btn" id="save-dialog" on:click={saveDialog}
-  >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="message-dialog" on:click={msg}>Message</button>
+
+<div class="flex flex-wrap flex-col md:flex-row gap-2 children:flex-shrink-0">
+  <button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
+  <button class="btn" id="save-dialog" on:click={saveDialog}
+    >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="message-dialog" on:click={msg}>Message</button>
+  <button class="btn" id="message-dialog" on:click={msgCustom}>Message (custom)</button>
+
+</div>
@@ -1,5 +1,5 @@
 <script>
-  import { download, upload } from '@tauri-apps/plugin-upload'
+  import { download, upload, HttpMethod } from '@tauri-apps/plugin-upload'
  import { open } from '@tauri-apps/plugin-dialog'
  import { JsonView } from '@zerodevx/svelte-json-view'
  import { appDataDir } from '@tauri-apps/api/path'
@@ -16,6 +16,22 @@

  let uploadUrl = 'https://httpbin.org/post'
  let uploadFilePath = ''
+  let uploadMethod = HttpMethod.Post
+
+  // Update URL when method changes
+  $: {
+    switch (uploadMethod) {
+      case HttpMethod.Post:
+        uploadUrl = 'https://httpbin.org/post'
+        break
+      case HttpMethod.Put:
+        uploadUrl = 'https://httpbin.org/put'
+        break
+      case HttpMethod.Patch:
+        uploadUrl = 'https://httpbin.org/patch'
+        break
+    }
+  }
  let uploadProgress = null
  let uploadResult = null
  let isUploading = false
@@ -197,7 +213,8 @@
        },
        new Map([
          ['User-Agent', 'Tauri Upload Plugin Demo']
-        ])
+        ]),
+        uploadMethod
      )

      uploadResult = {
@@ -340,12 +357,36 @@
        </div>
      </div>

+      <div>
+        <label for="upload-method" class="block text-sm font-medium text-gray-700 mb-1">HTTP Method:</label>
+        <select
+          id="upload-method"
+          bind:value={uploadMethod}
+          class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-green-500"
+          disabled={isUploading}
+        >
+          <option value={HttpMethod.Post}>POST</option>
+          <option value={HttpMethod.Put}>PUT</option>
+          <option value={HttpMethod.Patch}>PATCH</option>
+        </select>
+        <p class="text-xs text-gray-500 mt-1">Choose the HTTP method for the upload request</p>
+      </div>
+
+      <div class="bg-blue-50 border border-blue-200 p-3 rounded-md">
+        <div class="text-sm text-blue-800">
+          <strong>Upload Configuration:</strong>
+          <div class="font-mono text-xs mt-1">
+            Method: {uploadMethod} | URL: {uploadUrl || 'Not set'}
+          </div>
+        </div>
+      </div>
+
      <button
        on:click={startUpload}
        class="w-full px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600 disabled:opacity-50 disabled:cursor-not-allowed"
        disabled={isUploading || !uploadUrl || !uploadFilePath}
      >
-        {isUploading ? 'Uploading...' : 'Upload File'}
+        {isUploading ? `Uploading (${uploadMethod})...` : `Upload File (${uploadMethod})`}
      </button>

      {#if uploadProgress}
@@ -11,20 +11,20 @@
    "example:api:dev": "pnpm run --filter \"api\" tauri dev"
  },
  "devDependencies": {
-    "@eslint/js": "9.33.0",
-    "@rollup/plugin-node-resolve": "16.0.1",
-    "@rollup/plugin-terser": "0.4.4",
-    "@rollup/plugin-typescript": "12.1.4",
-    "covector": "^0.12.4",
-    "eslint": "9.33.0",
+    "@eslint/js": "10.0.1",
+    "@rollup/plugin-node-resolve": "16.0.3",
+    "@rollup/plugin-terser": "1.0.0",
+    "@rollup/plugin-typescript": "12.3.0",
+    "eslint": "10.1.0",
    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-security": "3.0.1",
-    "prettier": "3.6.2",
-    "rollup": "4.47.1",
+    "eslint-plugin-security": "4.0.0",
+    "prettier": "3.8.1",
+    "rollup": "4.59.0",
    "tslib": "2.8.1",
-    "typescript": "5.9.2",
-    "typescript-eslint": "8.40.0"
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.57.1"
  },
+  "minimumReleaseAge": 4320,
  "pnpm": {
    "overrides": {
      "esbuild@<0.25.0": ">=0.25.0"
@@ -34,6 +34,6 @@
    ]
  },
  "engines": {
-    "pnpm": "^10.0.0"
+    "pnpm": "^10.16.0"
  }
 }
@@ -1,5 +1,9 @@
 # Changelog

+## \[2.5.1]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
 ## \[2.5.0]

 - [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-autostart"
-version = "2.5.0"
+version = "2.5.1"
 description = "Automatically launch your application at startup."
 authors = { workspace = true }
 license = { workspace = true }
@@ -9,10 +9,6 @@ rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-autostart"

-[package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
-
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-autostart",
-  "version": "2.5.0",
+  "version": "2.5.1",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,5 +1,25 @@
 # Changelog

+## \[2.4.4]
+
+- [`82fbb0c7`](https://github.com/tauri-apps/plugins-workspace/commit/82fbb0c790288eca72af9ade13828ded7700ff90) ([#3221](https://github.com/tauri-apps/plugins-workspace/pull/3221)) On iOS, fixed an application crash happening when the scanner was started when user denied permission before.
+- [`b60dd887`](https://github.com/tauri-apps/plugins-workspace/commit/b60dd88702a2be2af942a3d104d728970a4c42d6) ([#3223](https://github.com/tauri-apps/plugins-workspace/pull/3223)) On iOS, start the scanning session on a separate thread to fix performance issues.
+- [`c27af912`](https://github.com/tauri-apps/plugins-workspace/commit/c27af9128d6cc7a2424ec49e98005e68b2d0eb1a) ([#3222](https://github.com/tauri-apps/plugins-workspace/pull/3222)) On iOS, fixed an application crash happening when the scanner was started on the iOS Simulator (no camera available).
+
+## \[2.4.3]
+
+- [`d8bfe61f`](https://github.com/tauri-apps/plugins-workspace/commit/d8bfe61f20f235314bad93a9c50d8b7f3eade734) ([#3121](https://github.com/tauri-apps/plugins-workspace/pull/3121) by [@NKIPSC](https://github.com/tauri-apps/plugins-workspace/../../NKIPSC)) Remove unnecessary checks on Android when requesting camera permission.
+- [`631d0e25`](https://github.com/tauri-apps/plugins-workspace/commit/631d0e256a37946b6a9102ca35511abfbebb92c5) ([#2440](https://github.com/tauri-apps/plugins-workspace/pull/2440) by [@kingsword09](https://github.com/tauri-apps/plugins-workspace/../../kingsword09)) Fix the `cameraView` is not removed after scanning in iOS.
+
+## \[2.4.2]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.4.1]
+
+- [`654bf489`](https://github.com/tauri-apps/plugins-workspace/commit/654bf4891a35769f7e82971641d3ad99974b2dfe) ([#3038](https://github.com/tauri-apps/plugins-workspace/pull/3038) by [@daniel-mader](https://github.com/tauri-apps/plugins-workspace/../../daniel-mader)) Update `androidx.camera` from `1.1.0` to `1.5.1` to support 16 KB memory page sizes.
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+
 ## \[2.4.0]

 - [`aa9140e1`](https://github.com/tauri-apps/plugins-workspace/commit/aa9140e1ac239ab9f015f92b2ed52bbf0eda7c12) ([#2437](https://github.com/tauri-apps/plugins-workspace/pull/2437) by [@enkhjile](https://github.com/tauri-apps/plugins-workspace/../../enkhjile)) Added support for GS1 DataBar on iOS 15.4+
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-barcode-scanner"
-version = "2.4.0"
+version = "2.4.4"
 description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -10,8 +10,6 @@ repository = { workspace = true }
 links = "tauri-plugin-barcode-scanner"

 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]

 [package.metadata.platforms.support]
@@ -5,10 +5,10 @@ plugins {

 android {
    namespace = "app.tauri.barcodescanner"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
-        minSdk = 24        
+        minSdk = 24

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -33,16 +33,14 @@ android {
 }

 dependencies {
-
+    val camerax_version = "1.5.1"
    implementation("androidx.core:core-ktx:1.9.0")
    implementation("androidx.appcompat:appcompat:1.6.0")
    implementation("com.google.android.material:material:1.7.0")
-    implementation("androidx.camera:camera-core:1.1.0")
-    implementation("androidx.camera:camera-view:1.1.0")
-    implementation("androidx.camera:camera-lifecycle:1.1.0")
-    implementation("androidx.camera:camera-camera2:1.1.0")
-    implementation("androidx.camera:camera-lifecycle:1.1.0")
-    implementation("androidx.camera:camera-view:1.1.0")
+    implementation("androidx.camera:camera-core:${camerax_version}")
+    implementation("androidx.camera:camera-camera2:${camerax_version}")
+    implementation("androidx.camera:camera-lifecycle:${camerax_version}")
+    implementation("androidx.camera:camera-view:${camerax_version}")
    implementation("com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0")
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
@@ -54,7 +54,6 @@ import java.util.concurrent.ExecutionException

 private const val PERMISSION_ALIAS_CAMERA = "camera"
 private const val PERMISSION_NAME = Manifest.permission.CAMERA
-private const val PREFS_PERMISSION_FIRST_TIME_ASKING = "PREFS_PERMISSION_FIRST_TIME_ASKING"

@InvokeArg
 class ScanOptions {
@@ -354,17 +353,6 @@ class BarcodeScannerPlugin(private val activity: Activity) : Plugin(activity),
        }
    }

-    private fun markFirstPermissionRequest() {
-        val sharedPreference: SharedPreferences =
-            activity.getSharedPreferences(PREFS_PERMISSION_FIRST_TIME_ASKING, MODE_PRIVATE)
-        sharedPreference.edit().putBoolean(PERMISSION_NAME, false).apply()
-    }
-
-    private fun firstPermissionRequest(): Boolean {
-        return activity.getSharedPreferences(PREFS_PERMISSION_FIRST_TIME_ASKING, MODE_PRIVATE)
-            .getBoolean(PERMISSION_NAME, true)
-    }
-
    @SuppressLint("ObsoleteSdkInt")
    @PermissionCallback
    fun cameraPermissionCallback(invoke: Invoke) {
@@ -380,9 +368,7 @@ class BarcodeScannerPlugin(private val activity: Activity) : Plugin(activity),
            requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.GRANTED)
        } else {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (!activity.shouldShowRequestPermissionRationale(PERMISSION_NAME)) {
-                    requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.DENIED)
-                }
+                requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.DENIED)
            } else {
                requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.GRANTED)
            }
@@ -401,20 +387,12 @@ class BarcodeScannerPlugin(private val activity: Activity) : Plugin(activity),
            requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.GRANTED)
        } else {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                if (firstPermissionRequest() || activity.shouldShowRequestPermissionRationale(
-                        PERMISSION_NAME
-                    )
-                ) {
-                    markFirstPermissionRequest()
-                    requestPermissionForAlias(
-                        PERMISSION_ALIAS_CAMERA,
-                        invoke,
-                        "cameraPermissionCallback"
-                    )
-                    return
-                } else {
-                    requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.DENIED)
-                }
+                requestPermissionForAlias(
+                    PERMISSION_ALIAS_CAMERA,
+                    invoke,
+                    "cameraPermissionCallback"
+                )
+                return
            } else {
                requestPermissionResponse.put(PERMISSION_ALIAS_CAMERA, PermissionState.GRANTED)
            }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then(n=>n.camera)},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then(n=>n.camera)},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}
@@ -191,6 +191,7 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
    if self.captureSession != nil {
      self.captureSession!.stopRunning()
      self.cameraView.removePreviewLayer()
+      self.cameraView.removeFromSuperview()
      self.captureVideoPreviewLayer = nil
      self.metaOutput = nil
      self.captureSession = nil
@@ -260,27 +261,34 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
  }

  private func runScanner(_ invoke: Invoke, args: ScanOptions) {
+    if getPermissionState() != "granted" {
+      invoke.reject("Camera permission denied or not yet requested")
+      return
+    }
+
    scanFormats = [AVMetadataObject.ObjectType]()

    (args.formats ?? []).forEach { format in
-        if let formatValue = format.value {
-            scanFormats.append(formatValue)
-        } else {
-            invoke.reject("Unsupported barcode format on this iOS version: \(format)")
-            return
-        }
+      if let formatValue = format.value {
+        scanFormats.append(formatValue)
+      } else {
+        invoke.reject("Unsupported barcode format on this iOS version: \(format)")
+        return
+      }
    }

    if scanFormats.isEmpty {
-        for supportedFormat in SupportedFormat.allCases {
-            if let formatValue = supportedFormat.value {
-                scanFormats.append(formatValue)
-            }
+      for supportedFormat in SupportedFormat.allCases {
+        if let formatValue = supportedFormat.value {
+          scanFormats.append(formatValue)
        }
+      }
    }

    self.metaOutput!.metadataObjectTypes = self.scanFormats
-    self.captureSession!.startRunning()
+    DispatchQueue.main.async {
+      self.captureSession!.startRunning()
+    }

    self.isScanning = true
  }
@@ -297,6 +305,13 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
      return
    }

+    // Check if camera is available on this platform (iOS simulator doesn't have cameras)
+    let availableVideoDevices = discoverCaptureDevices()
+    if availableVideoDevices.isEmpty {
+      invoke.reject("No camera available on this device (e.g., iOS Simulator)")
+      return
+    }
+
    var iOS14min: Bool = false
    if #available(iOS 14.0, *) { iOS14min = true }
    if !iOS14min && self.getPermissionState() != "granted" {
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-barcode-scanner",
-  "version": "2.4.0",
+  "version": "2.4.4",
  "description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,5 +1,13 @@
 # Changelog

+## \[2.3.2]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.3.1]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+
 ## \[2.3.0]

 - [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-biometric"
-version = "2.3.0"
+version = "2.3.2"
 description = "Prompt the user for biometric authentication on Android and iOS."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,8 +9,6 @@ repository = { workspace = true }
 links = "tauri-plugin-biometric"

 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]

 [package.metadata.platforms.support]
@@ -5,10 +5,10 @@ plugins {

 android {
    namespace = "app.tauri.biometric"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
-        minSdk = 24        
+        minSdk = 24

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-biometric",
-  "version": "2.3.0",
+  "version": "2.3.2",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,5 +1,9 @@
 # Changelog

+## \[2.4.1]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
 ## \[2.4.0]

 - [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-cli"
-version = "2.4.0"
+version = "2.4.1"
 description = "Parse arguments from your Tauri application's command line interface."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,10 +9,6 @@ rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-cli"

-[package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
-
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-cli",
-  "version": "2.4.0",
+  "version": "2.4.1",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,5 +1,13 @@
 # Changelog

+## \[2.3.2]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.3.1]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+
 ## \[2.3.0]

 - [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-clipboard-manager"
-version = "2.3.0"
+version = "2.3.2"
 description = "Read and write to the system clipboard."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -10,8 +10,7 @@ repository = { workspace = true }
 links = "tauri-plugin-clipboard-manager"

 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
+
 targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]

 [package.metadata.platforms.support]
@@ -5,10 +5,10 @@ plugins {

 android {
    namespace = "app.tauri.clipboard"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
-        minSdk = 24        
+        minSdk = 24

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n?e!==n||!r:!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then((e=>new a(e)))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n?e!==n||!r:!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then(e=>new a(e))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then(e=>new a(e))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then(e=>new a(e))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then(e=>new a(e))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-clipboard-manager",
-  "version": "2.3.0",
+  "version": "2.3.2",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,5 +1,31 @@
 # Changelog

+## \[2.4.8]
+
+- [`024ec0c2`](https://github.com/tauri-apps/plugins-workspace/commit/024ec0c29c20cf94579dab9b79d6be0da61a8daa) ([#3214](https://github.com/tauri-apps/plugins-workspace/pull/3214) by [@joshIsCoding](https://github.com/tauri-apps/plugins-workspace/../../joshIsCoding)) Account for differing Android VIEW intent in ChromeOS, fixing deep-link behaviour on Chromium platforms.
+- [`015e817c`](https://github.com/tauri-apps/plugins-workspace/commit/015e817cf2d7f66c1b9268606af8318dfe0bc4ee) ([#3186](https://github.com/tauri-apps/plugins-workspace/pull/3186) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Validate Android new intent is actually a deep link before triggering the onOpenUrl event.
+
+## \[2.4.7]
+
+- [`8374e997`](https://github.com/tauri-apps/plugins-workspace/commit/8374e997b82c95516fc0c1f6d665d9fc3b52edf8) ([#3258](https://github.com/tauri-apps/plugins-workspace/pull/3258) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix runtime deep link registration failing on Linux when the app path has spaces.
+
+## \[2.4.6]
+
+- [`28048039`](https://github.com/tauri-apps/plugins-workspace/commit/28048039496e84b46847c008416d341f1349e30e) ([#3143](https://github.com/tauri-apps/plugins-workspace/pull/3143) by [@Tunglies](https://github.com/tauri-apps/plugins-workspace/../../Tunglies)) Fix clippy warnings. No user facing changes.
+
+## \[2.4.5]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.4.4]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+- [`e25a9339`](https://github.com/tauri-apps/plugins-workspace/commit/e25a9339f46268f70dc9afd0c5ab3decbf79b330) ([#3019](https://github.com/tauri-apps/plugins-workspace/pull/3019) by [@kevinschoonover](https://github.com/tauri-apps/plugins-workspace/../../kevinschoonover)) Fix Exec= field in desktop handler if executable path changes
+
+## \[2.4.3]
+
+- [`2522b71f`](https://github.com/tauri-apps/plugins-workspace/commit/2522b71f6bcae65c03b24415eb9295c9e7c84ffc) ([#2970](https://github.com/tauri-apps/plugins-workspace/pull/2970) by [@WSH032](https://github.com/tauri-apps/plugins-workspace/../../WSH032)) Revert the breaking change introduced by [#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928).
+
 ## \[2.4.2]

 - [`21d721a0`](https://github.com/tauri-apps/plugins-workspace/commit/21d721a0c2731fc201872f5b99ea8bbdc61b0b60) ([#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Linux, improved error messages when OS commands fail.
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.4.2"
+version = "2.4.8"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }
@@ -10,8 +10,6 @@ repository = { workspace = true }
 links = "tauri-plugin-deep-link"

 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]

 [package.metadata.platforms.support]
@@ -5,10 +5,10 @@ plugins {

 android {
    namespace = "app.tauri.deep_link"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
-        minSdk = 24        
+        minSdk = 24

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -6,9 +6,8 @@ package app.tauri.deep_link

 import android.app.Activity
 import android.content.Intent
-import android.os.Bundle
+import android.os.PatternMatcher
 import android.webkit.WebView
-import app.tauri.Logger
 import app.tauri.annotation.InvokeArg
 import app.tauri.annotation.Command
 import app.tauri.annotation.TauriPlugin
@@ -16,23 +15,43 @@ import app.tauri.plugin.Channel
 import app.tauri.plugin.JSObject
 import app.tauri.plugin.Plugin
 import app.tauri.plugin.Invoke
+import androidx.core.net.toUri

@InvokeArg
 class SetEventHandlerArgs {
    lateinit var handler: Channel
 }

+@InvokeArg
+class AssociatedDomain {
+    var scheme: List<String> = listOf("https", "http")
+    var host: String? = null
+    var path: List<String> = listOf()
+    var pathPattern: List<String> = listOf()
+    var pathPrefix: List<String> = listOf()
+    var pathSuffix: List<String> = listOf()
+}
+
+@InvokeArg
+class PluginConfig {
+    var mobile: List<AssociatedDomain> = listOf()
+}
+
@TauriPlugin
 class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {
    //private val implementation = Example()
    private var webView: WebView? = null
    private var currentUrl: String? = null
    private var channel: Channel? = null
-
+    private var config: PluginConfig? = null
    companion object {
        var instance: DeepLinkPlugin? = null
    }

+    private fun isViewIntent(action: String?): Boolean {
+        return action == Intent.ACTION_VIEW || action == "org.chromium.arc.intent.action.VIEW"
+    }
+
    @Command
    fun getCurrent(invoke: Invoke) {
        val ret = JSObject()
@@ -51,27 +70,105 @@ class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {

    override fun load(webView: WebView) {
        instance = this
-
-        val intent = activity.intent
-
-        if (intent.action == Intent.ACTION_VIEW) {
-            // TODO: check if it makes sense to split up init url and last url
-            this.currentUrl = intent.data.toString()
-            val event = JSObject()
-            event.put("url", this.currentUrl)
-            this.channel?.send(event)
-        }
+        config = getConfig(PluginConfig::class.java)

        super.load(webView)
        this.webView = webView
+
+        val intent = activity.intent
+
+        if (isViewIntent(intent.action) && intent.data != null) {
+            val url = intent.data.toString()
+            if (isDeepLink(url)) {
+                // TODO: check if it makes sense to split up init url and last url
+                this.currentUrl = url
+                val event = JSObject()
+                event.put("url", this.currentUrl)
+                this.channel?.send(event)
+            }
+        }
    }

    override fun onNewIntent(intent: Intent) {
-        if (intent.action == Intent.ACTION_VIEW) {
-            this.currentUrl = intent.data.toString()
-            val event = JSObject()
-            event.put("url", this.currentUrl)
-            this.channel?.send(event)
+        if (isViewIntent(intent.action) && intent.data != null) {
+            val url = intent.data.toString()
+            if (isDeepLink(url)) {
+                this.currentUrl = url
+                val event = JSObject()
+                event.put("url", this.currentUrl)
+                this.channel?.send(event)
+            }
        }
    }
+
+    private fun isDeepLink(url: String): Boolean {
+        val config = this.config ?: return false
+        
+        if (config.mobile.isEmpty()) {
+            return false
+        }
+
+        val uri = try {
+            url.toUri()
+        } catch (_: Exception) {
+            // not a URL
+            return false
+        }
+
+        val scheme = uri.scheme ?: return false
+        val host = uri.host
+        val path = uri.path ?: ""
+
+        // Check if URL matches any configured mobile deep link
+        for (domain in config.mobile) {
+            // Check scheme
+            if (!domain.scheme.any { it.equals(scheme, ignoreCase = true) }) {
+                continue
+            }
+
+            // Check host (if configured)
+            if (domain.host != null) {
+                if (!host.equals(domain.host, ignoreCase = true)) {
+                    continue
+                }
+            }
+
+            // Check path constraints
+            // According to Android docs:
+            // - path: exact match, must begin with /
+            // - pathPrefix: matches initial part of path
+            // - pathSuffix: matches ending part, doesn't need to begin with /
+            // - pathPattern: simple glob pattern (., *, .*)
+            val pathMatches = when {
+                // Exact path match (must begin with /)
+                domain.path.isNotEmpty() && domain.path.any { it == path } -> true
+                // Path pattern match (simple glob: ., *, .*)
+                domain.pathPattern.isNotEmpty() && domain.pathPattern.any { pattern ->
+                    try {
+                        PatternMatcher(pattern, PatternMatcher.PATTERN_SIMPLE_GLOB).match(path)
+                    } catch (e: Exception) {
+                        false
+                    }
+                } -> true
+                // Path prefix match
+                domain.pathPrefix.isNotEmpty() && domain.pathPrefix.any { prefix ->
+                    path.startsWith(prefix)
+                } -> true
+                // Path suffix match
+                domain.pathSuffix.isNotEmpty() && domain.pathSuffix.any { suffix ->
+                    path.endsWith(suffix)
+                } -> true
+                // If no path constraints, any path is allowed
+                domain.path.isEmpty() && domain.pathPattern.isEmpty() && 
+                domain.pathPrefix.isEmpty() && domain.pathSuffix.isEmpty() -> true
+                else -> false
+            }
+
+            if (pathMatches) {
+                return true
+            }
+        }
+
+        return false
+    }
 }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then((n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",(n=>{e(n.payload)}))},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then(n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",n=>{e(n.payload)})},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
@@ -25,6 +25,8 @@ fn intent_filter(domain: &AssociatedDomain) -> String {
    format!(
        r#"<intent-filter {auto_verify}>
    <action android:name="android.intent.action.VIEW" />
+    <!-- ChromeOS ARC++ uses a different action for deep links -->
+    <action android:name="org.chromium.arc.intent.action.VIEW" />
    <category android:name="android.intent.category.DEFAULT" />
    <category android:name="android.intent.category.BROWSABLE" />
    {schemes}
@@ -137,13 +139,7 @@ fn main() {
            let deep_link_domains = config
                .mobile
                .iter()
-                .filter_map(|domain| {
-                    if domain.is_app_link() {
-                        return None;
-                    }
-
-                    Some(domain)
-                })
+                .filter(|domain| domain.is_app_link())
                .collect::<Vec<_>>();

            if deep_link_domains.is_empty() {
@@ -177,7 +173,7 @@ fn main() {
                                );
                                dict.insert(
                                    "CFBundleURLName".into(),
-                                    format!("{}", domain.scheme[0]).into(),
+                                    domain.scheme[0].clone().into(),
                                );
                                plist::Value::Dictionary(dict)
                            })
@@ -1,5 +1,41 @@
 # Changelog

+## \[2.2.11]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.8`
+
+## \[2.2.10]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.7`
+
+## \[2.2.9]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.6`
+
+## \[2.2.8]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.5`
+
+## \[2.2.7]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.4`
+
+## \[2.2.6]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.3`
+
 ## \[2.2.5]

 ### Dependencies
@@ -1,7 +1,7 @@
 {
  "name": "deep-link-example",
  "private": true,
-  "version": "2.2.5",
+  "version": "2.2.11",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -10,12 +10,12 @@
    "tauri": "tauri"
  },
  "dependencies": {
-    "@tauri-apps/api": "2.8.0",
-    "@tauri-apps/plugin-deep-link": "2.4.2"
+    "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/plugin-deep-link": "2.4.8"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "2.8.1",
-    "typescript": "^5.7.3",
-    "vite": "^7.0.4"
+    "@tauri-apps/cli": "2.10.1",
+    "typescript": "^5.9.3",
+    "vite": "^8.0.1"
  }
 }
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.4.2",
+  "version": "2.4.8",
  "description": "Set your Tauri application as the default handler for an URL",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "2.8.1"
+    "@tauri-apps/cli": "2.10.1"
  }
 }
@@ -23,14 +23,21 @@ pub enum Error {
    #[cfg(target_os = "linux")]
    #[error(transparent)]
    ParseIni(#[from] ini::ParseError),
-    #[cfg(target_os = "linux")]
-    #[error("Failed to run OS command `{0}`: {1}")]
-    Execute(&'static str, #[source] std::io::Error),
    #[cfg(mobile)]
    #[error(transparent)]
    PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError),
 }

+// TODO(v3): change this into an error in v3,
+// see <https://github.com/tauri-apps/plugins-workspace/pull/2970#issuecomment-3244660138>.
+#[inline]
+#[cfg(target_os = "linux")]
+pub(crate) fn inspect_command_error<'a>(command: &'a str) -> impl Fn(&std::io::Error) + 'a {
+    move |e| {
+        tracing::error!("Failed to run OS command `{command}`: {e}");
+    }
+}
+
 impl Serialize for Error {
    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
    where
@@ -293,6 +293,7 @@ mod imp {
                    .unwrap_or_else(|| bin.into_os_string())
                    .to_string_lossy()
                    .to_string();
+                let qualified_exec = format!("\"{}\" %u", exec);

                let target = self.app.path().data_dir()?.join("applications");

@@ -304,12 +305,28 @@ mod imp {

                if let Ok(mut desktop_file) = ini::Ini::load_from_file(&target_file) {
                    if let Some(section) = desktop_file.section_mut(Some("Desktop Entry")) {
-                        // it's ok to remove it - we only write to the file if it's missing
-                        // and in that case we include old_mimes
                        let old_mimes = section.remove("MimeType").unwrap_or_default();
+                        let mut change = false;

+                        // if the mime type is not present, append it to the list
                        if !old_mimes.split(';').any(|mime| mime == mime_type) {
                            section.append("MimeType", format!("{mime_type};{old_mimes}"));
+                            change = true;
+                        } else {
+                            section.insert("MimeType".to_string(), old_mimes);
+                        }
+
+                        // if the exec command doesnt match, update to the new one
+                        let old_exec = section.remove("Exec").unwrap_or_default();
+                        if old_exec != qualified_exec {
+                            section.append("Exec", qualified_exec);
+                            change = true;
+                        } else {
+                            section.insert("Exec".to_string(), old_exec.to_string());
+                        }
+
+                        // if any property has changed, rewrite the .desktop file
+                        if change {
                            desktop_file.write_to_file(&target_file)?;
                        }
                    }
@@ -324,7 +341,7 @@ mod imp {
                                .product_name
                                .clone()
                                .unwrap_or_else(|| file_name.clone()),
-                            exec = exec,
+                            qualified_exec = qualified_exec,
                            mime_type = mime_type
                        )
                        .as_bytes(),
@@ -334,12 +351,14 @@ mod imp {
                Command::new("update-desktop-database")
                    .arg(target)
                    .status()
-                    .map_err(|error| crate::Error::Execute("update-desktop-database", error))?;
+                    .inspect_err(crate::error::inspect_command_error(
+                        "update-desktop-database",
+                    ))?;

                Command::new("xdg-mime")
                    .args(["default", &file_name, mime_type.as_str()])
                    .status()
-                    .map_err(|error| crate::Error::Execute("xdg-mime", error))?;
+                    .inspect_err(crate::error::inspect_command_error("xdg-mime"))?;

                Ok(())
            }
@@ -444,7 +463,7 @@ mod imp {
                        &format!("x-scheme-handler/{}", _protocol.as_ref()),
                    ])
                    .output()
-                    .map_err(|error| crate::Error::Execute("xdg-mime", error))?;
+                    .inspect_err(crate::error::inspect_command_error("xdg-mime"))?;

                Ok(String::from_utf8_lossy(&output.stdout).contains(&file_name))
            }
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name={name}
-Exec={exec} %u
+Exec={qualified_exec}
 Terminal=false
 MimeType={mime_type}
-NoDisplay=true
+NoDisplay=true
@@ -1,5 +1,49 @@
 # Changelog

+## \[2.7.0]
+
+- [`24154472`](https://github.com/tauri-apps/plugins-workspace/commit/24154472a6710a690173df0a121125d1f1b871e8) ([#3287](https://github.com/tauri-apps/plugins-workspace/pull/3287) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Re-use `message` command in Rust side for `ask` and `confirm` commands, `allow-ask` and `allow-confirm` permissions are now aliases to `allow-message`
+
+### Dependencies
+
+- Upgraded to `fs-js@2.5.0`
+
+## \[2.6.0]
+
+- [`d7a0bb32`](https://github.com/tauri-apps/plugins-workspace/commit/d7a0bb325dad919d6cc132eb3898c33540de77c4) ([#3136](https://github.com/tauri-apps/plugins-workspace/pull/3136) by [@onehumandev](https://github.com/tauri-apps/plugins-workspace/../../onehumandev)) Add `fileAccessMode` option to file picker.
+
+## \[2.5.0]
+
+- [`dff6fa98`](https://github.com/tauri-apps/plugins-workspace/commit/dff6fa986a9a05ba98b6ca660fea78ae97251fc2) ([#3034](https://github.com/tauri-apps/plugins-workspace/pull/3034) by [@onehumandev](https://github.com/tauri-apps/plugins-workspace/../../onehumandev)) Add `pickerMode` option to file picker (currently only used on iOS)
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.5`
+
+### feat
+
+- [`c23fa03f`](https://github.com/tauri-apps/plugins-workspace/commit/c23fa03f07d5c1c220bcf0bca482364513e3f754) ([#3098](https://github.com/tauri-apps/plugins-workspace/pull/3098) by [@Lepidopteran](https://github.com/tauri-apps/plugins-workspace/../../Lepidopteran)) Add `xdg-portal` as an optional feature for `rfd`
+
+## \[2.4.2]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.4`
+
+## \[2.4.1]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.3`
+
+## \[2.4.0]
+
+- [`509eba8d`](https://github.com/tauri-apps/plugins-workspace/commit/509eba8d441c4f6ecf0af77b572cb2afd69a752d) ([#2641](https://github.com/tauri-apps/plugins-workspace/pull/2641) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add support for showing a message dialog with 3 buttons.
+
 ## \[2.3.3]

 ### Dependencies
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.3.3"
+version = "2.7.0"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,9 +9,12 @@ rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-dialog"

+[features]
+default = ["gtk3"]
+xdg-portal = ["rfd/xdg-portal", "rfd/tokio", "rfd/wayland"]
+gtk3 = ["rfd/gtk3"]
+
 [package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]

 [package.metadata.platforms.support]
@@ -34,15 +37,14 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.4.2" }
+tauri-plugin-fs = { path = "../fs", version = "2.5.0" }

 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }

 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-rfd = { version = "0.15", default-features = false, features = [
-  "tokio",
-  "gtk3",
+rfd = { version = "0.16", default-features = false, features = [
  "common-controls-v6",
 ] }
+
 raw-window-handle = "0.6"
@@ -31,6 +31,24 @@ tauri-plugin-dialog = "2.0.0"
 tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 ```

+### Linux XDG Desktop Portal Support
+
+By default, this plugin uses gtk to show dialogs, however since `v2.5.0` you can switch to using [XDG Desktop Portal](https://flatpak.github.io/xdg-desktop-portal/) by adding the following to your `Cargo.toml` file:
+
+```toml
+[dependencies]
+tauri-plugin-dialog = { version = "2.5.0", default-features = false, features = ["xdg-portal"] }
+# alternatively with Git:
+tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2", default-features = false, features = ["xdg-portal"] }
+
+```
+
+Do note if you use the `xdg-portal` feature, you need to ensure that [`zenity`](https://gitlab.gnome.org/GNOME/zenity) and an [XDG Desktop Portal backend](https://flatpak.github.io/xdg-desktop-portal#using-portals) is installed with your program.
+
+For more information, see [XDG Desktop Portal documentation](https://flatpak.github.io/xdg-desktop-portal/) and [`rfd` documentation](https://docs.rs/rfd/latest/rfd#xdg-desktop-portal-backend).
+
+### JavaScript
+
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:

 ```sh
@@ -5,10 +5,10 @@ plugins {

 android {
    namespace = "app.tauri.dialog"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
-        minSdk = 24        
+        minSdk = 24

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -31,6 +31,7 @@ class Filter {
 class FilePickerOptions {
  lateinit var filters: Array<Filter>
  var multiple: Boolean? = null
+  var pickerMode: String? = null
 }

@InvokeArg
@@ -38,6 +39,7 @@ class MessageOptions {
  var title: String? = null
  lateinit var message: String
  var okButtonLabel: String? = null
+  var noButtonLabel: String? = null
  var cancelButtonLabel: String? = null
 }

@@ -60,10 +62,19 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
      // TODO: ACTION_OPEN_DOCUMENT ??
      val intent = Intent(Intent.ACTION_GET_CONTENT)
      intent.addCategory(Intent.CATEGORY_OPENABLE)
-      intent.type = "*/*"

-      if (parsedTypes.isNotEmpty()) {
+      if (args.pickerMode == "image") {
+        intent.type = "image/*"
+      } else if (args.pickerMode == "video") {
+        intent.type = "video/*"
+      } else if (args.pickerMode == "media") {
+        intent.type = "*/*"
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("video/*", "image/*"))
+      } else if (parsedTypes.isNotEmpty()) {
+        intent.type = "*/*"
        intent.putExtra(Intent.EXTRA_MIME_TYPES, parsedTypes)
+      } else {
+        intent.type = "*/*"
      }

      intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, args.multiple ?: false)
@@ -139,9 +150,8 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
      return
    }

-    val handler = { cancelled: Boolean, value: Boolean ->
+    val handler = { value: String ->
      val ret = JSObject()
-      ret.put("cancelled", cancelled)
      ret.put("value", value)
      invoke.resolve(ret)
    }
@@ -153,24 +163,34 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
        if (args.title != null) {
          builder.setTitle(args.title)
        }
+
+        val okButtonLabel = args.okButtonLabel ?: "Ok"
+
        builder
          .setMessage(args.message)
-          .setPositiveButton(
-            args.okButtonLabel ?: "OK"
-          ) { dialog, _ ->
+          .setPositiveButton(okButtonLabel) { dialog, _ ->
            dialog.dismiss()
-            handler(false, true)
+            handler(okButtonLabel)
          }
          .setOnCancelListener { dialog ->
            dialog.dismiss()
-            handler(true, false)
+            handler(args.cancelButtonLabel ?: "Cancel")
          }
+
+        if (args.noButtonLabel != null) {
+          builder.setNeutralButton(args.noButtonLabel) { dialog, _ ->
+            dialog.dismiss()
+            handler(args.noButtonLabel!!)
+          }
+        }
+
        if (args.cancelButtonLabel != null) {
          builder.setNegativeButton( args.cancelButtonLabel) { dialog, _ ->
            dialog.dismiss()
-            handler(false, false)
+            handler(args.cancelButtonLabel!!)
          }
        }
+
        val dialog = builder.create()
        dialog.show()
      }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,yesButtonLabel:i?.okLabel?.toString(),noButtonLabel:i?.cancelLabel?.toString()})},t.confirm=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),cancelButtonLabel:i?.cancelLabel?.toString()})},t.message=async function(t,e){const i="string"==typeof e?{title:e}:e;await n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(n){"use strict";async function e(n,e={},t){return window.__TAURI_INTERNALS__.invoke(n,e,t)}function t(n){if(void 0!==n)return"string"==typeof n?n:"ok"in n&&"cancel"in n?{OkCancelCustom:[n.ok,n.cancel]}:"yes"in n&&"no"in n&&"cancel"in n?{YesNoCancelCustom:[n.yes,n.no,n.cancel]}:"ok"in n?{OkCustom:n.ok}:void 0}async function o(n,o){return await e("plugin:dialog|message",{message:n,title:o?.title,kind:o?.kind,buttons:t(o?.buttons)})}return"function"==typeof SuppressedError&&SuppressedError,n.ask=async function(n,e){const t="string"==typeof e?{title:e}:e,i=t?.okLabel||t?.cancelLabel,a=t?.okLabel??"Yes";return await o(n,{title:t?.title,kind:t?.kind,buttons:i?{ok:a,cancel:t.cancelLabel??"No"}:"YesNo"})===a},n.confirm=async function(n,e){const t="string"==typeof e?{title:e}:e,i=t?.okLabel||t?.cancelLabel,a=t?.okLabel??"Ok";return await o(n,{title:t?.title,kind:t?.kind,buttons:i?{ok:a,cancel:t.cancelLabel??"Cancel"}:"OkCancel"})===a},n.message=async function(n,e){const t="string"==typeof e?{title:e}:e;return t&&!t.buttons&&t.okLabel&&(t.buttons={ok:t.okLabel}),o(n,t)},n.open=async function(n={}){return"object"==typeof n&&Object.freeze(n),await e("plugin:dialog|open",{options:n})},n.save=async function(n={}){return"object"==typeof n&&Object.freeze(n),await e("plugin:dialog|save",{options:n})},n}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT

-const COMMANDS: &[&str] = &["open", "save", "message", "ask", "confirm"];
+const COMMANDS: &[&str] = &["open", "save", "message"];

 fn main() {
    let result = tauri_plugin::Builder::new(COMMANDS)
@@ -14,6 +14,16 @@ interface DialogFilter {
  name: string
  /**
   * Extensions to filter, without a `.` prefix.
+   *
+   * **Note:** Mobile platforms have different APIs for filtering that may not support extensions.
+   * iOS: Extensions are supported in the document picker, but not in the media picker.
+   * Android: Extensions are not supported.
+   *
+   * For these platforms, MIME types are the primary way to filter files, as opposed to extensions.
+   * This means the string values here labeled as `extensions` may also be a MIME type.
+   * This property name of `extensions` is being kept for backwards compatibility, but this may be revisited to
+   * specify the difference between extension or MIME type filtering.
+   *
   * @example
   * ```typescript
   * extensions: ['svg', 'png']
@@ -30,7 +40,14 @@ interface DialogFilter {
 interface OpenDialogOptions {
  /** The title of the dialog window (desktop only). */
  title?: string
-  /** The filters of the dialog. */
+  /**
+   * The filters of the dialog.
+   * On mobile platforms, if either:
+   * A) the {@linkcode pickerMode} is set to `media`, `image`, or `video`
+   * -- or --
+   * B) the filters include **only** either image or video mime types, the media picker will be displayed.
+   * Otherwise, the document picker will be displayed.
+   */
  filters?: DialogFilter[]
  /**
   * Initial directory or file path.
@@ -52,6 +69,38 @@ interface OpenDialogOptions {
  recursive?: boolean
  /** Whether to allow creating directories in the dialog. Enabled by default. **macOS Only** */
  canCreateDirectories?: boolean
+  /**
+   * The preferred mode of the dialog.
+   * This is meant for mobile platforms (iOS and Android) which have distinct file and media pickers.
+   * If not provided, the dialog will automatically choose the best mode based on the MIME types or extensions of the {@linkcode filters}.
+   * On desktop, this option is ignored.
+   */
+  pickerMode?: PickerMode
+  /**
+   * The file access mode of the dialog.
+   * If not provided, `copy` is used, which matches the behavior of the {@linkcode open} method before the introduction of this option.
+   *
+   * **Usage**
+   * If a file is opened with {@linkcode fileAccessMode: 'copy'}, it will be copied to the app's sandbox.
+   * This means the file can be read, edited, deleted, copied, or any other operation without any issues, since the file
+   * now belongs to the app.
+   * This also means that the caller has responsibility of deleting the file if this file is not meant to be retained
+   * in the app sandbox.
+   *
+   * If a file is opened with {@linkcode fileAccessMode: 'scoped'}, the file will remain in its original location
+   * and security-scoped access will be automatically managed by the system.
+   *
+   * **Note**
+   * This is specifically meant for document pickers on iOS or MacOS, in conjunction with [security scoped resources](https://developer.apple.com/documentation/foundation/nsurl/startaccessingsecurityscopedresource()).
+   *
+   * Why only document pickers, and not image or video pickers?
+   * The image and video pickers on iOS behave differently from the document pickers, and return [NSItemProvider](https://developer.apple.com/documentation/foundation/nsitemprovider) objects instead of file URLs.
+   * These are meant to be ephemeral (only available within the callback of the picker), and are not accessible outside of the callback.
+   * So for image and video pickers, the only way to access the file is to copy it to the app's sandbox, and this is the URL that is returned from this API.
+   * This means there is no provision for using `scoped` mode with image or video pickers.
+   * If an image or video picker is used, `copy` is always used.
+   */
+  fileAccessMode?: FileAccessMode
 }

 /**
@@ -77,6 +126,100 @@ interface SaveDialogOptions {
  canCreateDirectories?: boolean
 }

+/**
+ * The preferred mode of the dialog.
+ * This is meant for mobile platforms (iOS and Android) which have distinct file and media pickers.
+ * On desktop, this option is ignored.
+ * If not provided, the dialog will automatically choose the best mode based on the MIME types or extensions of the {@linkcode filters}.
+ *
+ * **Note:** This option is only supported on iOS 14 and above. This parameter is ignored on iOS 13 and below.
+ */
+export type PickerMode = 'document' | 'media' | 'image' | 'video'
+
+/**
+ * The file access mode of the dialog.
+ *
+ * - `copy`: copy/move the picked file to the app sandbox; no scoped access required.
+ * - `scoped`: keep file in place; security-scoped access is automatically managed.
+ *
+ * **Note:** This option is only supported on iOS 14 and above. This parameter is ignored on iOS 13 and below.
+ */
+export type FileAccessMode = 'copy' | 'scoped'
+
+/**
+ * Default buttons for a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogDefaultButtons =
+  | 'Ok'
+  | 'OkCancel'
+  | 'YesNo'
+  | 'YesNoCancel'
+
+/** All possible button keys. */
+type ButtonKey = 'ok' | 'cancel' | 'yes' | 'no'
+
+/** Ban everything except a set of keys. */
+type BanExcept<Allowed extends ButtonKey> = Partial<
+  Record<Exclude<ButtonKey, Allowed>, never>
+>
+
+/**
+ * The Yes, No and Cancel buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsYesNoCancel = {
+  /** The Yes button. */
+  yes: string
+  /** The No button. */
+  no: string
+  /** The Cancel button. */
+  cancel: string
+} & BanExcept<'yes' | 'no' | 'cancel'>
+
+/**
+ * The Ok and Cancel buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsOkCancel = {
+  /** The Ok button. */
+  ok: string
+  /** The Cancel button. */
+  cancel: string
+} & BanExcept<'ok' | 'cancel'>
+
+/**
+ * The Ok button of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsOk = {
+  /** The Ok button. */
+  ok: string
+} & BanExcept<'ok'>
+
+/**
+ * Custom buttons for a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogCustomButtons =
+  | MessageDialogButtonsYesNoCancel
+  | MessageDialogButtonsOkCancel
+  | MessageDialogButtonsOk
+
+/**
+ * The buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtons =
+  | MessageDialogDefaultButtons
+  | MessageDialogCustomButtons
+
 /**
 * @since 2.0.0
 */
@@ -85,8 +228,58 @@ interface MessageDialogOptions {
  title?: string
  /** The kind of the dialog. Defaults to `info`. */
  kind?: 'info' | 'warning' | 'error'
-  /** The label of the confirm button. */
+  /**
+   * The label of the Ok button.
+   *
+   * @deprecated Use {@linkcode MessageDialogOptions.buttons} instead.
+   */
  okLabel?: string
+  /**
+   * The buttons of the dialog.
+   *
+   * @example
+   *
+   * ```ts
+   * // Use system default buttons texts
+   * await message('Hello World!', { buttons: 'Ok' })
+   * await message('Hello World!', { buttons: 'OkCancel' })
+   *
+   * // Or with custom button texts
+   * await message('Hello World!', { buttons: { ok: 'Yes!' } })
+   * await message('Take on the task?', {
+   *   buttons: { ok: 'Accept', cancel: 'Cancel' }
+   * })
+   * await message('Show the file content?', {
+   *   buttons: { yes: 'Show content', no: 'Show in folder', cancel: 'Cancel' }
+   * })
+   * ```
+   *
+   * @since 2.4.0
+   */
+  buttons?: MessageDialogButtons
+}
+
+/**
+ * Internal function to convert the buttons to the Rust type.
+ */
+function buttonsToRust(buttons: MessageDialogButtons | undefined) {
+  if (buttons === undefined) {
+    return undefined
+  }
+
+  if (typeof buttons === 'string') {
+    return buttons
+  } else if ('ok' in buttons && 'cancel' in buttons) {
+    return { OkCancelCustom: [buttons.ok, buttons.cancel] }
+  } else if ('yes' in buttons && 'no' in buttons && 'cancel' in buttons) {
+    return {
+      YesNoCancelCustom: [buttons.yes, buttons.no, buttons.cancel]
+    }
+  } else if ('ok' in buttons) {
+    return { OkCustom: buttons.ok }
+  }
+
+  return undefined
 }

 interface ConfirmDialogOptions {
@@ -202,6 +395,28 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
  return await invoke('plugin:dialog|save', { options })
 }

+/**
+ * The result of a message dialog.
+ *
+ * The result is a string if the dialog has custom buttons,
+ * otherwise it is one of the default buttons.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})
+
+async function messageCommand(
+  message: string,
+  options?: Omit<MessageDialogOptions, 'okLabel'>
+) {
+  return await invoke<MessageDialogResult>('plugin:dialog|message', {
+    message,
+    title: options?.title,
+    kind: options?.kind,
+    buttons: buttonsToRust(options?.buttons)
+  })
+}
+
 /**
 * Shows a message dialog with an `Ok` button.
 * @example
@@ -222,18 +437,19 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
 async function message(
  message: string,
  options?: string | MessageDialogOptions
-): Promise<void> {
+): Promise<MessageDialogResult> {
  const opts = typeof options === 'string' ? { title: options } : options
-  await invoke('plugin:dialog|message', {
-    message: message.toString(),
-    title: opts?.title?.toString(),
-    kind: opts?.kind,
-    okButtonLabel: opts?.okLabel?.toString()
-  })
+  if (opts && !opts.buttons && opts.okLabel) {
+    opts.buttons = { ok: opts.okLabel }
+  }
+  return messageCommand(message, opts)
 }

 /**
 * Shows a question dialog with `Yes` and `No` buttons.
+ *
+ * Convenient wrapper for `await message('msg', { buttons: 'YesNo' }) === 'Yes'`
+ *
 * @example
 * ```typescript
 * import { ask } from '@tauri-apps/plugin-dialog';
@@ -253,17 +469,24 @@ async function ask(
  options?: string | ConfirmDialogOptions
 ): Promise<boolean> {
  const opts = typeof options === 'string' ? { title: options } : options
-  return await invoke('plugin:dialog|ask', {
-    message: message.toString(),
-    title: opts?.title?.toString(),
-    kind: opts?.kind,
-    yesButtonLabel: opts?.okLabel?.toString(),
-    noButtonLabel: opts?.cancelLabel?.toString()
-  })
+  const customButtons = opts?.okLabel || opts?.cancelLabel
+  const okLabel = opts?.okLabel ?? 'Yes'
+  return (
+    (await messageCommand(message, {
+      title: opts?.title,
+      kind: opts?.kind,
+      buttons: customButtons
+        ? { ok: okLabel, cancel: opts.cancelLabel ?? 'No' }
+        : 'YesNo'
+    })) === okLabel
+  )
 }

 /**
 * Shows a question dialog with `Ok` and `Cancel` buttons.
+ *
+ * Convenient wrapper for `await message('msg', { buttons: 'OkCancel' }) === 'Ok'`
+ *
 * @example
 * ```typescript
 * import { confirm } from '@tauri-apps/plugin-dialog';
@@ -283,13 +506,17 @@ async function confirm(
  options?: string | ConfirmDialogOptions
 ): Promise<boolean> {
  const opts = typeof options === 'string' ? { title: options } : options
-  return await invoke('plugin:dialog|confirm', {
-    message: message.toString(),
-    title: opts?.title?.toString(),
-    kind: opts?.kind,
-    okButtonLabel: opts?.okLabel?.toString(),
-    cancelButtonLabel: opts?.cancelLabel?.toString()
-  })
+  const customButtons = opts?.okLabel || opts?.cancelLabel
+  const okLabel = opts?.okLabel ?? 'Ok'
+  return (
+    (await messageCommand(message, {
+      title: opts?.title,
+      kind: opts?.kind,
+      buttons: customButtons
+        ? { ok: okLabel, cancel: opts.cancelLabel ?? 'Cancel' }
+        : 'OkCancel'
+    })) === okLabel
+  )
 }

 export type {
@@ -8,6 +8,7 @@ import PhotosUI
 import SwiftRs
 import Tauri
 import UIKit
+import UniformTypeIdentifiers
 import WebKit

 enum FilePickerEvent {
@@ -20,6 +21,7 @@ struct MessageDialogOptions: Decodable {
  var title: String?
  let message: String
  var okButtonLabel: String?
+  var noButtonLabel: String?
  var cancelButtonLabel: String?
 }

@@ -31,6 +33,8 @@ struct FilePickerOptions: Decodable {
  var multiple: Bool?
  var filters: [Filter]?
  var defaultPath: String?
+  var pickerMode: PickerMode?
+  var fileAccessMode: FileAccessMode?
 }

 struct SaveFileDialogOptions: Decodable {
@@ -38,6 +42,18 @@ struct SaveFileDialogOptions: Decodable {
  var defaultPath: String?
 }

+enum FileAccessMode: String, Decodable {
+  case copy
+  case scoped
+}
+
+enum PickerMode: String, Decodable {
+  case document
+  case media
+  case image
+  case video
+}
+
 class DialogPlugin: Plugin {

  var filePickerController: FilePickerController!
@@ -46,31 +62,12 @@ class DialogPlugin: Plugin {
  override init() {
    super.init()
    filePickerController = FilePickerController(self)
+
  }

  @objc public func showFilePicker(_ invoke: Invoke) throws {
    let args = try invoke.parseArgs(FilePickerOptions.self)

-    let parsedTypes = parseFiltersOption(args.filters ?? [])
-
-    var isMedia = !parsedTypes.isEmpty
-    var uniqueMimeType: Bool? = nil
-    var mimeKind: String? = nil
-    if !parsedTypes.isEmpty {
-      uniqueMimeType = true
-      for mime in parsedTypes {
-        let kind = mime.components(separatedBy: "/")[0]
-        if kind != "image" && kind != "video" {
-          isMedia = false
-        }
-        if mimeKind == nil {
-          mimeKind = kind
-        } else if mimeKind != kind {
-          uniqueMimeType = false
-        }
-      }
-    }
-
    onFilePickerResult = { (event: FilePickerEvent) -> Void in
      switch event {
      case .selected(let urls):
@@ -82,49 +79,59 @@ class DialogPlugin: Plugin {
      }
    }

-    if uniqueMimeType == true || isMedia {
-      DispatchQueue.main.async {
-        if #available(iOS 14, *) {
+    if #available(iOS 14, *) {
+      let parsedTypes = parseFiltersOption(args.filters ?? [])
+
+      let mimeKinds = Set(
+        parsedTypes.compactMap { $0.preferredMIMEType?.components(separatedBy: "/")[0] })
+      let filtersIncludeImage = mimeKinds.contains("image")
+      let filtersIncludeVideo = mimeKinds.contains("video")
+      let filtersIncludeNonMedia = mimeKinds.contains(where: { $0 != "image" && $0 != "video" })
+
+      // If the picker mode is media, images, or videos, we always want to show the media picker regardless of what's in the filters.
+      // Otherwise, if the filters A) do not include non-media types and B) include either image or video, we want to show the media picker.
+      if args.pickerMode == .media
+        || args.pickerMode == .image
+        || args.pickerMode == .video
+        || (!filtersIncludeNonMedia && (filtersIncludeImage || filtersIncludeVideo))
+      {
+        DispatchQueue.main.async {
          var configuration = PHPickerConfiguration(photoLibrary: PHPhotoLibrary.shared())
          configuration.selectionLimit = (args.multiple ?? false) ? 0 : 1

-          if uniqueMimeType == true {
-            if mimeKind == "image" {
-              configuration.filter = .images
-            } else if mimeKind == "video" {
-              configuration.filter = .videos
-            }
+          // If the filters include image or video, use the appropriate filter.
+          // If both are true, don't define a filter, which means we will display all media.
+          if args.pickerMode == .image || (filtersIncludeImage && !filtersIncludeVideo) {
+            configuration.filter = .images
+          } else if args.pickerMode == .video || (filtersIncludeVideo && !filtersIncludeImage) {
+            configuration.filter = .videos
          }

          let picker = PHPickerViewController(configuration: configuration)
          picker.delegate = self.filePickerController
          picker.modalPresentationStyle = .fullScreen
          self.presentViewController(picker)
-        } else {
-          let picker = UIImagePickerController()
-          picker.delegate = self.filePickerController
+        }
+      } else {
+        DispatchQueue.main.async {
+          // The UTType.item is the catch-all, allowing for any file type to be selected.
+          let contentTypes = parsedTypes.isEmpty ? [UTType.item] : parsedTypes
+          let picker: UIDocumentPickerViewController = UIDocumentPickerViewController(
+            forOpeningContentTypes: contentTypes,
+            asCopy: args.fileAccessMode == .scoped ? false : true)

-          if uniqueMimeType == true && mimeKind == "image" {
-            picker.sourceType = .photoLibrary
+          if let defaultPath = args.defaultPath {
+            picker.directoryURL = URL(string: defaultPath)
          }

-          picker.sourceType = .photoLibrary
+          picker.delegate = self.filePickerController
+          picker.allowsMultipleSelection = args.multiple ?? false
          picker.modalPresentationStyle = .fullScreen
          self.presentViewController(picker)
        }
      }
    } else {
-      let documentTypes = parsedTypes.isEmpty ? ["public.data"] : parsedTypes
-      DispatchQueue.main.async {
-        let picker = UIDocumentPickerViewController(documentTypes: documentTypes, in: .import)
-        if let defaultPath = args.defaultPath {
-          picker.directoryURL = URL(string: defaultPath)
-        }
-        picker.delegate = self.filePickerController
-        picker.allowsMultipleSelection = args.multiple ?? false
-        picker.modalPresentationStyle = .fullScreen
-        self.presentViewController(picker)
-      }
+      showFilePickerLegacy(args: args)
    }
  }

@@ -172,7 +179,68 @@ class DialogPlugin: Plugin {
    self.manager.viewController?.present(viewControllerToPresent, animated: true, completion: nil)
  }

-  private func parseFiltersOption(_ filters: [Filter]) -> [String] {
+  @available(iOS 14, *)
+  private func parseFiltersOption(_ filters: [Filter]) -> [UTType] {
+    var parsedTypes: [UTType] = []
+    for filter in filters {
+      for ext in filter.extensions ?? [] {
+        // We need to support extensions as well as MIME types.
+        if let utType = UTType(mimeType: ext) {
+          parsedTypes.append(utType)
+        } else if let utType = UTType(filenameExtension: ext) {
+          parsedTypes.append(utType)
+        }
+      }
+    }
+
+    return parsedTypes
+  }
+
+  /// This function is only used for iOS < 14, and should be removed if/when the deployment target is raised to 14.
+  private func showFilePickerLegacy(args: FilePickerOptions) {
+    let parsedTypes = parseFiltersOptionLegacy(args.filters ?? [])
+
+    var filtersIncludeImage: Bool = false
+    var filtersIncludeVideo: Bool = false
+    var filtersIncludeNonMedia: Bool = false
+
+    if !parsedTypes.isEmpty {
+      let mimeKinds = Set(parsedTypes.map { $0.components(separatedBy: "/")[0] })
+      filtersIncludeImage = mimeKinds.contains("image")
+      filtersIncludeVideo = mimeKinds.contains("video")
+      filtersIncludeNonMedia = mimeKinds.contains(where: { $0 != "image" && $0 != "video" })
+    }
+
+    if !filtersIncludeNonMedia && (filtersIncludeImage || filtersIncludeVideo) {
+      DispatchQueue.main.async {
+        let picker = UIImagePickerController()
+        picker.delegate = self.filePickerController
+
+        if filtersIncludeImage && !filtersIncludeVideo {
+          picker.sourceType = .photoLibrary
+        }
+
+        picker.modalPresentationStyle = .fullScreen
+        self.presentViewController(picker)
+      }
+    } else {
+      let documentTypes = parsedTypes.isEmpty ? ["public.data"] : parsedTypes
+      DispatchQueue.main.async {
+        let picker = UIDocumentPickerViewController(documentTypes: documentTypes, in: .import)
+        if let defaultPath = args.defaultPath {
+          picker.directoryURL = URL(string: defaultPath)
+        }
+
+        picker.delegate = self.filePickerController
+        picker.allowsMultipleSelection = args.multiple ?? false
+        picker.modalPresentationStyle = .fullScreen
+        self.presentViewController(picker)
+      }
+    }
+  }
+
+  /// This function is only used for iOS < 14, and should be removed if/when the deployment target is raised to 14.
+  private func parseFiltersOptionLegacy(_ filters: [Filter]) -> [String] {
    var parsedTypes: [String] = []
    for filter in filters {
      for ext in filter.extensions ?? [] {
@@ -185,6 +253,7 @@ class DialogPlugin: Plugin {
        parsedTypes.append(utType)
      }
    }
+
    return parsedTypes
  }

@@ -200,39 +269,42 @@ class DialogPlugin: Plugin {
      let alert = UIAlertController(
        title: args.title, message: args.message, preferredStyle: UIAlertController.Style.alert)

-      let cancelButtonLabel = args.cancelButtonLabel ?? ""
-      if !cancelButtonLabel.isEmpty {
+      if let cancelButtonLabel = args.cancelButtonLabel {
        alert.addAction(
          UIAlertAction(
            title: cancelButtonLabel, style: UIAlertAction.Style.default,
            handler: { (_) -> Void in
-              Logger.error("cancel")
-
-              invoke.resolve([
-                "value": false,
-                "cancelled": false,
-              ])
-            }))
+              invoke.resolve(["value": cancelButtonLabel])
+            }
+          )
+        )
      }

-      let okButtonLabel = args.okButtonLabel ?? (cancelButtonLabel.isEmpty ? "OK" : "")
-      if !okButtonLabel.isEmpty {
+      if let noButtonLabel = args.noButtonLabel {
        alert.addAction(
          UIAlertAction(
-            title: okButtonLabel, style: UIAlertAction.Style.default,
+            title: noButtonLabel, style: UIAlertAction.Style.default,
            handler: { (_) -> Void in
-              Logger.error("ok")
-
-              invoke.resolve([
-                "value": true,
-                "cancelled": false,
-              ])
-            }))
+              invoke.resolve(["value": noButtonLabel])
+            }
+          )
+        )
      }

+      let okButtonLabel = args.okButtonLabel ?? "Ok"
+      alert.addAction(
+        UIAlertAction(
+          title: okButtonLabel, style: UIAlertAction.Style.default,
+          handler: { (_) -> Void in
+            invoke.resolve(["value": okButtonLabel])
+          }
+        )
+      )
+
      manager.viewController?.present(alert, animated: true, completion: nil)
    }
  }
+
 }

@_cdecl("init_plugin_dialog")
@@ -95,16 +95,33 @@ public class FilePickerController: NSObject {
 			return nil
 		}
 	}
-
+    
+	/// ## In which cases do we need to save a copy of a file selected by a user to the app sandbox?
+	/// In short, only when the file is **not** selected using UIDocumentPickerDelegate.
+	/// For the rest of the cases, we need to write a copy of the file to the app sandbox. 
+	/// 
+	/// For PHPicker (used for photos and videos), `NSItemProvider.loadFileRepresentation` returns a temporary file URL that is deleted after the completion handler.
+	/// The recommendation is to [Persist](https://developer.apple.com/documentation/foundation/nsitemprovider/2888338-loadfilerepresentation) the file by moving/copying
+	/// it to your app’s directory within the completion handler.
+	/// 
+	/// If available, `loadInPlaceFileRepresentation` can open a file in place; Photos assets typically do not support true in-place access,
+	/// so fall back to persisting a local file.
+	/// Ref: https://developer.apple.com/documentation/foundation/nsitemprovider/2888335-loadinplacefilerepresentation
+	/// 
+	/// For UIDocumentPicker, prefer "open in place" and avoid copying when possible.
+	/// Ref: https://developer.apple.com/documentation/uikit/uidocumentpickerviewcontroller
 	private func saveTemporaryFile(_ sourceUrl: URL) throws -> URL {
+
 		var directory = URL(fileURLWithPath: NSTemporaryDirectory())
 		if let cachesDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first {
 			directory = cachesDirectory
 		}
+		
 		let targetUrl = directory.appendingPathComponent(sourceUrl.lastPathComponent)
 		do {
 			try deleteFile(targetUrl)
 		}
+
 		try FileManager.default.copyItem(at: sourceUrl, to: targetUrl)
 		return targetUrl
 	}
@@ -119,8 +136,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"))
 		}
@@ -191,6 +207,8 @@ extension FilePickerController: PHPickerViewControllerDelegate {
 						return
 					}
 					do {
+						// We have to make a copy of the file to the app sandbox here, as PHPicker returns an NSItemProvider with either an ephemeral file URL or content that is deleted after the completion handler.
+						// This is a different behavior from UIDocumentPicker, where the file can either be copied to the app sandbox or opened in place, and then accessed with `startAccessingSecurityScopedResource`.
 						let temporaryUrl = try self.saveTemporaryFile(url)
 						temporaryUrls.append(temporaryUrl)
 					} catch {
@@ -212,6 +230,8 @@ extension FilePickerController: PHPickerViewControllerDelegate {
 						return
 					}
 					do {
+						// We have to make a copy of the file to the app sandbox here, as PHPicker returns an NSItemProvider with either an ephemeral file URL or content that is deleted after the completion handler.
+						// This is a different behavior from UIDocumentPicker, where the file can either be copied to the app sandbox or opened in place, and then accessed with `startAccessingSecurityScopedResource`.
 						let temporaryUrl = try self.saveTemporaryFile(url)
 						temporaryUrls.append(temporaryUrl)
 					} catch {
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-dialog",
-  "version": "2.3.3",
+  "version": "2.7.0",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -0,0 +1,11 @@
+"$schema" = "schemas/schema.json"
+
+[[permission]]
+identifier = "allow-ask"
+description = "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
+commands.allow = ["message"]
+
+[[permission]]
+identifier = "deny-ask"
+description = "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
+commands.deny = ["message"]
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-ask"
-description = "Enables the ask command without any pre-configured scope."
-commands.allow = ["ask"]
-
-[[permission]]
-identifier = "deny-ask"
-description = "Denies the ask command without any pre-configured scope."
-commands.deny = ["ask"]
@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-confirm"
-description = "Enables the confirm command without any pre-configured scope."
-commands.allow = ["confirm"]
-
-[[permission]]
-identifier = "deny-confirm"
-description = "Denies the confirm command without any pre-configured scope."
-commands.deny = ["confirm"]
@@ -9,8 +9,6 @@ All dialog types are enabled.

 #### This default permission set includes the following:

- `allow-ask`
- `allow-confirm`
 - `allow-message`
 - `allow-save`
 - `allow-open`
@@ -32,7 +30,7 @@ All dialog types are enabled.
 </td>
 <td>

-Enables the ask command without any pre-configured scope.
+Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)

 </td>
 </tr>
@@ -45,33 +43,7 @@ Enables the ask command without any pre-configured scope.
 </td>
 <td>

-Denies the ask command without any pre-configured scope.
-
-</td>
-</tr>
-
-<tr>
-<td>
-
-`dialog:allow-confirm`
-
-</td>
-<td>
-
-Enables the confirm command without any pre-configured scope.
-
-</td>
-</tr>
-
-<tr>
-<td>
-
-`dialog:deny-confirm`
-
-</td>
-<td>
-
-Denies the confirm command without any pre-configured scope.
+Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)

 </td>
 </tr>
@@ -151,6 +123,32 @@ Enables the save command without any pre-configured scope.

 Denies the save command without any pre-configured scope.

+</td>
+</tr>
+
+<tr>
+<td>
+
+`dialog:allow-confirm`
+
+</td>
+<td>
+
+Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`dialog:deny-confirm`
+
+</td>
+<td>
+
+Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)
+
 </td>
 </tr>
 </table>
@@ -0,0 +1,11 @@
+"$schema" = "schemas/schema.json"
+
+[[permission]]
+identifier = "allow-confirm"
+description = "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
+commands.allow = ["message"]
+
+[[permission]]
+identifier = "deny-confirm"
+description = "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
+commands.deny = ["message"]
@@ -11,10 +11,4 @@ All dialog types are enabled.


 """
-permissions = [
-  "allow-ask",
-  "allow-confirm",
-  "allow-message",
-  "allow-save",
-  "allow-open",
-]
+permissions = ["allow-message", "allow-save", "allow-open"]
@@ -295,28 +295,16 @@
      "type": "string",
      "oneOf": [
        {
-          "description": "Enables the ask command without any pre-configured scope.",
+          "description": "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)",
          "type": "string",
          "const": "allow-ask",
-          "markdownDescription": "Enables the ask command without any pre-configured scope."
+          "markdownDescription": "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
        },
        {
-          "description": "Denies the ask command without any pre-configured scope.",
+          "description": "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)",
          "type": "string",
          "const": "deny-ask",
-          "markdownDescription": "Denies the ask command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the confirm command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-confirm",
-          "markdownDescription": "Enables the confirm command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the confirm command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-confirm",
-          "markdownDescription": "Denies the confirm command without any pre-configured scope."
+          "markdownDescription": "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
        },
        {
          "description": "Enables the message command without any pre-configured scope.",
@@ -355,10 +343,22 @@
          "markdownDescription": "Denies the save command without any pre-configured scope."
        },
        {
-          "description": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`",
+          "description": "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)",
+          "type": "string",
+          "const": "allow-confirm",
+          "markdownDescription": "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
+        },
+        {
+          "description": "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)",
+          "type": "string",
+          "const": "deny-confirm",
+          "markdownDescription": "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
+        },
+        {
+          "description": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-message`\n- `allow-save`\n- `allow-open`",
          "type": "string",
          "const": "default",
-          "markdownDescription": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`"
+          "markdownDescription": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-message`\n- `allow-save`\n- `allow-open`"
        }
      ]
    }
@@ -9,8 +9,8 @@ use tauri::{command, Manager, Runtime, State, Window};
 use tauri_plugin_fs::FsExt;

 use crate::{
-    Dialog, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind, Result, CANCEL,
-    NO, OK, YES,
+    Dialog, FileAccessMode, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind,
+    MessageDialogResult, PickerMode, Result,
 };

 #[derive(Serialize)]
@@ -56,6 +56,17 @@ pub struct OpenDialogOptions {
    recursive: bool,
    /// Whether to allow creating directories in the dialog **macOS Only**
    can_create_directories: Option<bool>,
+    /// The preferred mode of the dialog.
+    /// This is meant for mobile platforms (iOS and Android) which have distinct file and media pickers.
+    /// On desktop, this option is ignored.
+    /// If not provided, the dialog will automatically choose the best mode based on the MIME types of the filters.
+    #[serde(default)]
+    #[cfg_attr(mobile, allow(dead_code))]
+    picker_mode: Option<PickerMode>,
+    /// The file access mode of the dialog.
+    #[serde(default)]
+    #[cfg_attr(mobile, allow(dead_code))]
+    file_access_mode: Option<FileAccessMode>,
 }

 /// The options for the save dialog API.
@@ -127,10 +138,16 @@ pub(crate) async fn open<R: Runtime>(
    if let Some(can) = options.can_create_directories {
        dialog_builder = dialog_builder.set_can_create_directories(can);
    }
+    if let Some(picker_mode) = options.picker_mode {
+        dialog_builder = dialog_builder.set_picker_mode(picker_mode);
+    }
    for filter in options.filters {
        let extensions: Vec<&str> = filter.extensions.iter().map(|s| &**s).collect();
        dialog_builder = dialog_builder.add_filter(filter.name, &extensions);
    }
+    if let Some(file_access_mode) = options.file_access_mode {
+        dialog_builder = dialog_builder.set_file_access_mode(file_access_mode);
+    }

    let res = if options.directory {
        #[cfg(desktop)]
@@ -241,17 +258,20 @@ pub(crate) async fn save<R: Runtime>(
    Ok(path.map(|p| p.simplified()))
 }

-fn message_dialog<R: Runtime>(
-    #[allow(unused_variables)] window: Window<R>,
+#[command]
+pub(crate) async fn message<R: Runtime>(
+    #[allow(unused)] window: Window<R>,
    dialog: State<'_, Dialog<R>>,
    title: Option<String>,
    message: String,
    kind: Option<MessageDialogKind>,
-    buttons: MessageDialogButtons,
-) -> bool {
+    buttons: Option<MessageDialogButtons>,
+) -> Result<MessageDialogResult> {
    let mut builder = dialog.message(message);

-    builder = builder.buttons(buttons);
+    if let Some(buttons) = buttons {
+        builder = builder.buttons(buttons);
+    }

    if let Some(title) = title {
        builder = builder.title(title);
@@ -266,86 +286,5 @@ fn message_dialog<R: Runtime>(
        builder = builder.kind(kind);
    }

-    builder.blocking_show()
-}
-
-#[command]
-pub(crate) async fn message<R: Runtime>(
-    window: Window<R>,
-    dialog: State<'_, Dialog<R>>,
-    title: Option<String>,
-    message: String,
-    kind: Option<MessageDialogKind>,
-    ok_button_label: Option<String>,
-) -> Result<bool> {
-    Ok(message_dialog(
-        window,
-        dialog,
-        title,
-        message,
-        kind,
-        if let Some(ok_button_label) = ok_button_label {
-            MessageDialogButtons::OkCustom(ok_button_label)
-        } else {
-            MessageDialogButtons::Ok
-        },
-    ))
-}
-
-#[command]
-pub(crate) async fn ask<R: Runtime>(
-    window: Window<R>,
-    dialog: State<'_, Dialog<R>>,
-    title: Option<String>,
-    message: String,
-    kind: Option<MessageDialogKind>,
-    yes_button_label: Option<String>,
-    no_button_label: Option<String>,
-) -> Result<bool> {
-    Ok(message_dialog(
-        window,
-        dialog,
-        title,
-        message,
-        kind,
-        if let Some(yes_button_label) = yes_button_label {
-            MessageDialogButtons::OkCancelCustom(
-                yes_button_label,
-                no_button_label.unwrap_or(NO.to_string()),
-            )
-        } else if let Some(no_button_label) = no_button_label {
-            MessageDialogButtons::OkCancelCustom(YES.to_string(), no_button_label)
-        } else {
-            MessageDialogButtons::YesNo
-        },
-    ))
-}
-
-#[command]
-pub(crate) async fn confirm<R: Runtime>(
-    window: Window<R>,
-    dialog: State<'_, Dialog<R>>,
-    title: Option<String>,
-    message: String,
-    kind: Option<MessageDialogKind>,
-    ok_button_label: Option<String>,
-    cancel_button_label: Option<String>,
-) -> Result<bool> {
-    Ok(message_dialog(
-        window,
-        dialog,
-        title,
-        message,
-        kind,
-        if let Some(ok_button_label) = ok_button_label {
-            MessageDialogButtons::OkCancelCustom(
-                ok_button_label,
-                cancel_button_label.unwrap_or(CANCEL.to_string()),
-            )
-        } else if let Some(cancel_button_label) = cancel_button_label {
-            MessageDialogButtons::OkCancelCustom(OK.to_string(), cancel_button_label)
-        } else {
-            MessageDialogButtons::OkCancel
-        },
-    ))
+    Ok(builder.blocking_show_with_result())
 }
@@ -13,7 +13,7 @@ use rfd::{AsyncFileDialog, AsyncMessageDialog};
 use serde::de::DeserializeOwned;
 use tauri::{plugin::PluginApi, AppHandle, Runtime};

-use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder, OK};
+use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder};

 pub fn init<R: Runtime, C: DeserializeOwned>(
    app: &AppHandle<R>,
@@ -115,6 +115,10 @@ impl From<MessageDialogButtons> for rfd::MessageButtons {
            MessageDialogButtons::YesNo => Self::YesNo,
            MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok),
            MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel),
+            MessageDialogButtons::YesNoCancel => Self::YesNoCancel,
+            MessageDialogButtons::YesNoCancelCustom(yes, no, cancel) => {
+                Self::YesNoCancelCustom(yes, no, cancel)
+            }
        }
    }
 }
@@ -208,28 +212,46 @@ pub fn save_file<R: Runtime, F: FnOnce(Option<FilePath>) + Send + 'static>(
 }

 /// Shows a message dialog
-pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
+pub fn show_message_dialog<R: Runtime, F: FnOnce(MessageDialogResult) + Send + 'static>(
    dialog: MessageDialogBuilder<R>,
-    f: F,
+    callback: F,
 ) {
-    use rfd::MessageDialogResult;
-
-    let ok_label = match &dialog.buttons {
-        MessageDialogButtons::OkCustom(ok) => Some(ok.clone()),
-        MessageDialogButtons::OkCancelCustom(ok, _) => Some(ok.clone()),
-        _ => None,
-    };
-    let f = move |res| {
-        f(match res {
-            MessageDialogResult::Ok | MessageDialogResult::Yes => true,
-            MessageDialogResult::Custom(s) => ok_label.map_or(s == OK, |ok_label| ok_label == s),
-            _ => false,
-        });
-    };
+    let f = move |res: rfd::MessageDialogResult| callback(res.into());

    let handle = dialog.dialog.app_handle().to_owned();
    let _ = handle.run_on_main_thread(move || {
+        let buttons = dialog.buttons.clone();
        let dialog = AsyncMessageDialog::from(dialog).show();
-        std::thread::spawn(move || f(tauri::async_runtime::block_on(dialog)));
+        std::thread::spawn(move || {
+            let result = tauri::async_runtime::block_on(dialog);
+            // on Linux rfd does not return rfd::MessageDialogResult::Custom, so we must map manually
+            let result = match (result, buttons) {
+                (rfd::MessageDialogResult::Ok, MessageDialogButtons::OkCustom(s)) => {
+                    rfd::MessageDialogResult::Custom(s)
+                }
+                (
+                    rfd::MessageDialogResult::Ok,
+                    MessageDialogButtons::OkCancelCustom(ok, _cancel),
+                ) => rfd::MessageDialogResult::Custom(ok),
+                (
+                    rfd::MessageDialogResult::Cancel,
+                    MessageDialogButtons::OkCancelCustom(_ok, cancel),
+                ) => rfd::MessageDialogResult::Custom(cancel),
+                (
+                    rfd::MessageDialogResult::Yes,
+                    MessageDialogButtons::YesNoCancelCustom(yes, _no, _cancel),
+                ) => rfd::MessageDialogResult::Custom(yes),
+                (
+                    rfd::MessageDialogResult::No,
+                    MessageDialogButtons::YesNoCancelCustom(_yes, no, _cancel),
+                ) => rfd::MessageDialogResult::Custom(no),
+                (
+                    rfd::MessageDialogResult::Cancel,
+                    MessageDialogButtons::YesNoCancelCustom(_yes, _no, cancel),
+                ) => rfd::MessageDialogResult::Custom(cancel),
+                (result, _) => result,
+            };
+            f(result);
+        });
    });
 }
@@ -9,7 +9,7 @@
    html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png"
 )]

-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use tauri::{
    plugin::{Builder, TauriPlugin},
    Manager, Runtime,
@@ -44,9 +44,28 @@ pub use desktop::Dialog;
 #[cfg(mobile)]
 pub use mobile::Dialog;

+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum PickerMode {
+    Document,
+    Media,
+    Image,
+    Video,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum FileAccessMode {
+    Copy,
+    Scoped,
+}
+
 pub(crate) const OK: &str = "Ok";
+#[cfg(mobile)]
 pub(crate) const CANCEL: &str = "Cancel";
+#[cfg(mobile)]
 pub(crate) const YES: &str = "Yes";
+#[cfg(mobile)]
 pub(crate) const NO: &str = "No";

 macro_rules! blocking_fn {
@@ -181,8 +200,6 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
            commands::open,
            commands::save,
            commands::message,
-            commands::ask,
-            commands::confirm
        ])
        .setup(|app, api| {
            #[cfg(mobile)]
@@ -216,6 +233,7 @@ pub(crate) struct MessageDialogPayload<'a> {
    message: &'a String,
    kind: &'a MessageDialogKind,
    ok_button_label: Option<&'a str>,
+    no_button_label: Option<&'a str>,
    cancel_button_label: Option<&'a str>,
 }

@@ -229,8 +247,8 @@ impl<R: Runtime> MessageDialogBuilder<R> {
            dialog,
            title: title.into(),
            message: message.into(),
-            kind: Default::default(),
-            buttons: Default::default(),
+            kind: MessageDialogKind::default(),
+            buttons: MessageDialogButtons::default(),
            #[cfg(desktop)]
            parent: None,
        }
@@ -238,13 +256,17 @@ impl<R: Runtime> MessageDialogBuilder<R> {

    #[cfg(mobile)]
    pub(crate) fn payload(&self) -> MessageDialogPayload<'_> {
-        let (ok_button_label, cancel_button_label) = match &self.buttons {
-            MessageDialogButtons::Ok => (Some(OK), None),
-            MessageDialogButtons::OkCancel => (Some(OK), Some(CANCEL)),
-            MessageDialogButtons::YesNo => (Some(YES), Some(NO)),
-            MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), Some(CANCEL)),
+        let (ok_button_label, no_button_label, cancel_button_label) = match &self.buttons {
+            MessageDialogButtons::Ok => (Some(OK), None, None),
+            MessageDialogButtons::OkCancel => (Some(OK), None, Some(CANCEL)),
+            MessageDialogButtons::YesNo => (Some(YES), Some(NO), None),
+            MessageDialogButtons::YesNoCancel => (Some(YES), Some(NO), Some(CANCEL)),
+            MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), None, None),
            MessageDialogButtons::OkCancelCustom(ok, cancel) => {
-                (Some(ok.as_str()), Some(cancel.as_str()))
+                (Some(ok.as_str()), None, Some(cancel.as_str()))
+            }
+            MessageDialogButtons::YesNoCancelCustom(yes, no, cancel) => {
+                (Some(yes.as_str()), Some(no.as_str()), Some(cancel.as_str()))
            }
        };
        MessageDialogPayload {
@@ -252,6 +274,7 @@ impl<R: Runtime> MessageDialogBuilder<R> {
            message: &self.message,
            kind: &self.kind,
            ok_button_label,
+            no_button_label,
            cancel_button_label,
        }
    }
@@ -295,16 +318,55 @@ impl<R: Runtime> MessageDialogBuilder<R> {
    }

    /// Shows a message dialog
+    ///
+    /// Returns `true` if the user pressed the OK/Yes button,
    pub fn show<F: FnOnce(bool) + Send + 'static>(self, f: F) {
+        let ok_label = match &self.buttons {
+            MessageDialogButtons::OkCustom(ok) => Some(ok.clone()),
+            MessageDialogButtons::OkCancelCustom(ok, _) => Some(ok.clone()),
+            MessageDialogButtons::YesNoCancelCustom(yes, _, _) => Some(yes.clone()),
+            _ => None,
+        };
+
+        show_message_dialog(self, move |res| {
+            let sucess = match res {
+                MessageDialogResult::Ok | MessageDialogResult::Yes => true,
+                MessageDialogResult::Custom(s) => {
+                    ok_label.map_or(s == OK, |ok_label| ok_label == s)
+                }
+                _ => false,
+            };
+
+            f(sucess)
+        })
+    }
+
+    /// Shows a message dialog and returns the button that was pressed.
+    ///
+    /// Returns a [`MessageDialogResult`] enum that indicates which button was pressed.
+    pub fn show_with_result<F: FnOnce(MessageDialogResult) + Send + 'static>(self, f: F) {
        show_message_dialog(self, f)
    }

    /// Shows a message dialog.
+    ///
+    /// Returns `true` if the user pressed the OK/Yes button,
+    ///
    /// This is a blocking operation,
    /// and should *NOT* be used when running on the main thread context.
    pub fn blocking_show(self) -> bool {
        blocking_fn!(self, show)
    }
+
+    /// Shows a message dialog and returns the button that was pressed.
+    ///
+    /// Returns a [`MessageDialogResult`] enum that indicates which button was pressed.
+    ///
+    /// This is a blocking operation,
+    /// and should *NOT* be used when running on the main thread context.
+    pub fn blocking_show_with_result(self) -> MessageDialogResult {
+        blocking_fn!(self, show_with_result)
+    }
 }
 #[derive(Debug, Serialize)]
 pub(crate) struct Filter {
@@ -324,6 +386,8 @@ pub struct FileDialogBuilder<R: Runtime> {
    pub(crate) file_name: Option<String>,
    pub(crate) title: Option<String>,
    pub(crate) can_create_directories: Option<bool>,
+    pub(crate) picker_mode: Option<PickerMode>,
+    pub(crate) file_access_mode: Option<FileAccessMode>,
    #[cfg(desktop)]
    pub(crate) parent: Option<crate::desktop::WindowHandle>,
 }
@@ -335,6 +399,8 @@ pub(crate) struct FileDialogPayload<'a> {
    file_name: &'a Option<String>,
    filters: &'a Vec<Filter>,
    multiple: bool,
+    picker_mode: &'a Option<PickerMode>,
+    file_access_mode: &'a Option<FileAccessMode>,
 }

 // raw window handle :(
@@ -350,6 +416,8 @@ impl<R: Runtime> FileDialogBuilder<R> {
            file_name: None,
            title: None,
            can_create_directories: None,
+            picker_mode: None,
+            file_access_mode: None,
            #[cfg(desktop)]
            parent: None,
        }
@@ -361,6 +429,8 @@ impl<R: Runtime> FileDialogBuilder<R> {
            file_name: &self.file_name,
            filters: &self.filters,
            multiple,
+            picker_mode: &self.picker_mode,
+            file_access_mode: &self.file_access_mode,
        }
    }

@@ -421,11 +491,29 @@ impl<R: Runtime> FileDialogBuilder<R> {
        self
    }

+    /// Set the picker mode of the dialog.
+    /// This is meant for mobile platforms (iOS and Android) which have distinct file and media pickers.
+    /// On desktop, this option is ignored.
+    /// If not provided, the dialog will automatically choose the best mode based on the MIME types of the filters.
+    pub fn set_picker_mode(mut self, mode: PickerMode) -> Self {
+        self.picker_mode.replace(mode);
+        self
+    }
+
+    /// Set the file access mode of the dialog.
+    /// This is only used on iOS.
+    /// On desktop and Android, this option is ignored.
+    pub fn set_file_access_mode(mut self, mode: FileAccessMode) -> Self {
+        self.file_access_mode.replace(mode);
+        self
+    }
+
    /// Shows the dialog to select a single file.
+    ///
    /// This is not a blocking operation,
    /// and should be used when running on the main thread to avoid deadlocks with the event loop.
    ///
-    /// For usage in other contexts such as commands, prefer [`Self::pick_file`].
+    /// See [`Self::blocking_pick_file`] for a blocking version for use in other contexts.
    ///
    /// # Examples
    ///
@@ -445,9 +533,12 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select multiple files.
+    ///
    /// This is not a blocking operation,
    /// and should be used when running on the main thread to avoid deadlocks with the event loop.
    ///
+    /// See [`Self::blocking_pick_files`] for a blocking version for use in other contexts.
+    ///
    /// # Reading the files
    ///
    /// The file paths cannot be read directly on Android as they are behind a content URI.
@@ -490,9 +581,12 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select a single folder.
+    ///
    /// This is not a blocking operation,
    /// and should be used when running on the main thread to avoid deadlocks with the event loop.
    ///
+    /// See [`Self::blocking_pick_folder`] for a blocking version for use in other contexts.
+    ///
    /// # Examples
    ///
    /// ```
@@ -512,9 +606,12 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select multiple folders.
+    ///
    /// This is not a blocking operation,
    /// and should be used when running on the main thread to avoid deadlocks with the event loop.
    ///
+    /// See [`Self::blocking_pick_folders`] for a blocking version for use in other contexts.
+    ///
    /// # Examples
    ///
    /// ```
@@ -538,6 +635,8 @@ impl<R: Runtime> FileDialogBuilder<R> {
    /// This is not a blocking operation,
    /// and should be used when running on the main thread to avoid deadlocks with the event loop.
    ///
+    /// See [`Self::blocking_save_file`] for a blocking version for use in other contexts.
+    ///
    /// # Examples
    ///
    /// ```
@@ -559,8 +658,11 @@ impl<R: Runtime> FileDialogBuilder<R> {
 /// Blocking APIs.
 impl<R: Runtime> FileDialogBuilder<R> {
    /// Shows the dialog to select a single file.
+    ///
    /// This is a blocking operation,
-    /// and should *NOT* be used when running on the main thread context.
+    /// and should *NOT* be used when running on the main thread.
+    ///
+    /// See [`Self::pick_file`] for a non-blocking version for use in main-thread contexts.
    ///
    /// # Examples
    ///
@@ -578,8 +680,11 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select multiple files.
+    ///
    /// This is a blocking operation,
-    /// and should *NOT* be used when running on the main thread context.
+    /// and should *NOT* be used when running on the main thread.
+    ///
+    /// See [`Self::pick_files`] for a non-blocking version for use in main-thread contexts.
    ///
    /// # Examples
    ///
@@ -597,8 +702,11 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select a single folder.
+    ///
    /// This is a blocking operation,
-    /// and should *NOT* be used when running on the main thread context.
+    /// and should *NOT* be used when running on the main thread.
+    ///
+    /// See [`Self::pick_folder`] for a non-blocking version for use in main-thread contexts.
    ///
    /// # Examples
    ///
@@ -617,8 +725,11 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to select multiple folders.
+    ///
    /// This is a blocking operation,
-    /// and should *NOT* be used when running on the main thread context.
+    /// and should *NOT* be used when running on the main thread.
+    ///
+    /// See [`Self::pick_folders`] for a non-blocking version for use in main-thread contexts.
    ///
    /// # Examples
    ///
@@ -637,8 +748,11 @@ impl<R: Runtime> FileDialogBuilder<R> {
    }

    /// Shows the dialog to save a file.
+    ///
    /// This is a blocking operation,
-    /// and should *NOT* be used when running on the main thread context.
+    /// and should *NOT* be used when running on the main thread.
+    ///
+    /// See [`Self::save_file`] for a non-blocking version for use in main-thread contexts.
    ///
    /// # Examples
    ///
@@ -8,7 +8,7 @@ use tauri::{
    AppHandle, Runtime,
 };

-use crate::{FileDialogBuilder, FilePath, MessageDialogBuilder};
+use crate::{FileDialogBuilder, FilePath, MessageDialogBuilder, MessageDialogResult};

 #[cfg(target_os = "android")]
 const PLUGIN_IDENTIFIER: &str = "app.tauri.dialog";
@@ -107,13 +107,11 @@ pub fn save_file<R: Runtime, F: FnOnce(Option<FilePath>) + Send + 'static>(

 #[derive(Debug, Deserialize)]
 struct ShowMessageDialogResponse {
-    #[allow(dead_code)]
-    cancelled: bool,
-    value: bool,
+    value: String,
 }

 /// Shows a message dialog
-pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
+pub fn show_message_dialog<R: Runtime, F: FnOnce(MessageDialogResult) + Send + 'static>(
    dialog: MessageDialogBuilder<R>,
    f: F,
 ) {
@@ -122,6 +120,8 @@ pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
            .dialog
            .0
            .run_mobile_plugin::<ShowMessageDialogResponse>("showMessageDialog", dialog.payload());
-        f(res.map(|r| r.value).unwrap_or_default())
+
+        let res = res.map(|res| res.value.into());
+        f(res.unwrap_or_default())
    });
 }
@@ -6,9 +6,10 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};

 /// Types of message, ask and confirm dialogs.
 #[non_exhaustive]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Default)]
 pub enum MessageDialogKind {
    /// Information dialog.
+    #[default]
    Info,
    /// Warning dialog.
    Warning,
@@ -16,12 +17,6 @@ pub enum MessageDialogKind {
    Error,
 }

-impl Default for MessageDialogKind {
-    fn default() -> Self {
-        Self::Info
-    }
-}
-
 impl<'de> Deserialize<'de> for MessageDialogKind {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
@@ -52,7 +47,7 @@ impl Serialize for MessageDialogKind {

 /// Set of button that will be displayed on the dialog
 #[non_exhaustive]
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
 pub enum MessageDialogButtons {
    #[default]
    /// A single `Ok` button with OS default dialog text
@@ -61,8 +56,49 @@ pub enum MessageDialogButtons {
    OkCancel,
    /// 2 buttons `Yes` and `No` with OS default dialog texts
    YesNo,
+    /// 3 buttons `Yes`, `No` and `Cancel` with OS default dialog texts
+    YesNoCancel,
    /// A single `Ok` button with custom text
    OkCustom(String),
    /// 2 buttons `Ok` and `Cancel` with custom texts
    OkCancelCustom(String, String),
+    /// 3 buttons `Yes`, `No` and `Cancel` with custom texts
+    YesNoCancelCustom(String, String, String),
+}
+
+/// Result of a message dialog
+#[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)]
+pub enum MessageDialogResult {
+    Yes,
+    No,
+    Ok,
+    #[default]
+    Cancel,
+    #[serde(untagged)]
+    Custom(String),
+}
+
+#[cfg(desktop)]
+impl From<rfd::MessageDialogResult> for MessageDialogResult {
+    fn from(result: rfd::MessageDialogResult) -> Self {
+        match result {
+            rfd::MessageDialogResult::Yes => Self::Yes,
+            rfd::MessageDialogResult::No => Self::No,
+            rfd::MessageDialogResult::Ok => Self::Ok,
+            rfd::MessageDialogResult::Cancel => Self::Cancel,
+            rfd::MessageDialogResult::Custom(s) => Self::Custom(s),
+        }
+    }
+}
+
+impl From<String> for MessageDialogResult {
+    fn from(value: String) -> Self {
+        match value.as_str() {
+            "Yes" => Self::Yes,
+            "No" => Self::No,
+            "Ok" => Self::Ok,
+            "Cancel" => Self::Cancel,
+            _ => Self::Custom(value),
+        }
+    }
 }
@@ -1,5 +1,26 @@
 # Changelog

+## \[2.5.0]
+
+- [`e97a4ded`](https://github.com/tauri-apps/plugins-workspace/commit/e97a4dedab8608d9d57029784ee8a2607ca3a996) ([#3244](https://github.com/tauri-apps/plugins-workspace/pull/3244) by [@SeijiOkuda](https://github.com/tauri-apps/plugins-workspace/../../SeijiOkuda)) Add `encoding` option for `readTextFile` and `readTextFileLines`
+- [`f75d21db`](https://github.com/tauri-apps/plugins-workspace/commit/f75d21db3351d6f12adf585c2c797c20ece94f7f) ([#3360](https://github.com/tauri-apps/plugins-workspace/pull/3360) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Removed the dependency on `tauri-utils`'s `build` feature
+- [`f5f68063`](https://github.com/tauri-apps/plugins-workspace/commit/f5f68063e459c33522f44a04df3120d9d039ec13) ([#3185](https://github.com/tauri-apps/plugins-workspace/pull/3185) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Enable access for security-scoped resources on iOS by automatically calling `NSURL::startAccessingSecurityScopedResource` on resource access and adding the `stopAccessingSecurityScopedResource` API.
+
+## \[2.4.5]
+
+- [`521cd8b3`](https://github.com/tauri-apps/plugins-workspace/commit/521cd8b372c862d96b1637775710e4d7cf2443e2) ([#3155](https://github.com/tauri-apps/plugins-workspace/pull/3155) by [@EliasStar](https://github.com/tauri-apps/plugins-workspace/../../EliasStar)) Fix off by one error in the implementation of readTextFileLines causing all lines to end with an (additional) null byte.
+  Issue: [#3154](https://github.com/tauri-apps/plugins-workspace/issues/3154)
+  PR: [#3155](https://github.com/tauri-apps/plugins-workspace/pull/3155)
+
+## \[2.4.4]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.4.3]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+- [`6b5b1053`](https://github.com/tauri-apps/plugins-workspace/commit/6b5b1053ba8aeb789dd5cb5fb05b7e98f3b8de0b) ([#1939](https://github.com/tauri-apps/plugins-workspace/pull/1939) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Enhance error messages.
+
 ## \[2.4.2]

 - [`4eb36b0f`](https://github.com/tauri-apps/plugins-workspace/commit/4eb36b0ff57acb0bb1b911c583efa3bf2f56aa32) ([#2907](https://github.com/tauri-apps/plugins-workspace/pull/2907) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fixed calling `writeFile` with `data: ReadableStream` throws `Invalid argument`
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.4.2"
+version = "2.5.0"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }
@@ -9,10 +9,6 @@ rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-fs"

-[package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
-
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "Apps installed via MSI or NSIS in `perMachine` and `both` mode require admin permissions for write access in `$RESOURCES` folder" }
 linux = { level = "full", notes = "No write access to `$RESOURCES` folder" }
@@ -25,7 +21,7 @@ tauri-plugin = { workspace = true, features = ["build"] }
 schemars = { workspace = true }
 serde = { workspace = true }
 toml = "0.9"
-tauri-utils = { workspace = true, features = ["build"] }
+tauri-utils = { workspace = true }

 [dependencies]
 serde = { workspace = true }
@@ -34,6 +30,7 @@ serde_repr = "0.1"
 tauri = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
+log = { workspace = true }
 anyhow = "1"
 glob = { workspace = true }
 # TODO: Remove `serialization-compat-6` in v3
@@ -45,5 +42,8 @@ notify-debouncer-full = { version = "0.6", optional = true }
 dunce = { workspace = true }
 percent-encoding = "2"

+[target.'cfg(target_os = "ios")'.dependencies]
+objc2-foundation = { version = "0.3", features = ["NSURL", "NSString"] }
+
 [features]
 watch = ["notify", "notify-debouncer-full"]
@@ -5,11 +5,10 @@ plugins {

 android {
    namespace = "com.plugin.fs"
-    compileSdk = 34
+    compileSdk = 36

    defaultConfig {
        minSdk = 21
-        targetSdk = 34

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles("consumer-rules.pro")
@@ -104,6 +104,8 @@ const COMMANDS: &[(&str, &[&str])] = &[
    // TODO: Remove this in v3
    ("unwatch", &[]),
    ("size", &[]),
+    ("start_accessing_security_scoped_resource", &[]),
+    ("stop_accessing_security_scoped_resource", &[]),
 ];

 fn main() {
@@ -5,6 +5,19 @@
 /**
 * Access the file system.
 *
+ * ## iOS security-scoped resources
+ *
+ * On iOS, the `fs` plugin automatically manages access to security-scoped resources when a file URL is accessed.
+ * This is required for files outside the app's sandbox (e.g., from file picker).
+ *
+ * @example
+ * ```typescript
+ * import { open } from '@tauri-apps/plugin-fs';
+ *
+ * const file = await open('file:///path/to/file.txt');
+ * await file.close();
+ * ```
+ *
 * ## Security
 *
 * This module prevents path traversal, not allowing parent directory accessors to be used
@@ -723,6 +736,8 @@ async function readDir(
 interface ReadFileOptions {
  /** Base directory for `path` */
  baseDir?: BaseDirectory
+  /** Text encoding to use when reading a text file. Defaults to 'utf-8'. */
+  encoding?: string
 }

 /**
@@ -753,7 +768,7 @@ async function readFile(
 }

 /**
- * Reads and returns the entire contents of a file as UTF-8 string.
+ * Reads and returns the entire contents of a file as a string using the specified encoding (default: UTF-8).
 * @example
 * ```typescript
 * import { readTextFile, BaseDirectory } from '@tauri-apps/plugin-fs';
@@ -777,11 +792,11 @@ async function readTextFile(

  const bytes = arr instanceof ArrayBuffer ? arr : Uint8Array.from(arr)

-  return new TextDecoder().decode(bytes)
+  return new TextDecoder(options?.encoding ?? 'utf-8').decode(bytes)
 }

 /**
- * Returns an async {@linkcode AsyncIterableIterator} over the lines of a file as UTF-8 string.
+ * Returns an async {@linkcode AsyncIterableIterator} over the lines of a file, decoded using the specified encoding (default: UTF-8).
 * @example
 * ```typescript
 * import { readTextFileLines, BaseDirectory } from '@tauri-apps/plugin-fs';
@@ -810,10 +825,15 @@ async function readTextFileLines(
    rid: null as number | null,

    async next(): Promise<IteratorResult<string>> {
+      const decoder = new TextDecoder(options?.encoding ?? 'utf-8')
+
      if (this.rid === null) {
+        // Use the normalized encoding label for options.
+        const encoding = decoder.encoding
+
        this.rid = await invoke<number>('plugin:fs|read_text_file_lines', {
          path: pathStr,
-          options
+          options: options != null ? { ...options, encoding } : undefined
        })
      }

@@ -838,7 +858,7 @@ async function readTextFileLines(
        return { value: null, done }
      }

-      const line = new TextDecoder().decode(bytes.slice(0, bytes.byteLength))
+      const line = decoder.decode(bytes.slice(0, bytes.byteLength - 1))

      return {
        value: line,
@@ -1346,6 +1366,79 @@ async function size(path: string | URL): Promise<number> {
  })
 }

+/**
+ * Starts accessing a security-scoped resource for the given file URL.
+ * This should be called when you're accessing a file that was opened
+ * using a security-scoped URL (e.g., from a file picker).
+ *
+ * Note that accessing security-scoped resources is automatically managed by the plugin on iOS, so you don't need to call this function
+ * unless you want to manage the scope manually.
+ *
+ * You must call {@linkcode stopAccessingSecurityScopedResource} when you're done accessing the resource.
+ *
+ * #### Platform-specific
+ *
+ * - **iOS:** Starts accessing the security-scoped resource.
+ * - **Other platforms:** does nothing.
+ *
+ * @example
+ * ```typescript
+ * import { startAccessingSecurityScopedResource } from '@tauri-apps/plugin-fs';
+ *
+ * const filePath = 'file:///path/to/file.txt';
+ * await startAccessingSecurityScopedResource(filePath);
+ * // ... use the resource ...
+ * ```
+ *
+ * @since 2.5.0
+ */
+async function startAccessingSecurityScopedResource(
+  path: string | URL
+): Promise<void> {
+  if (path instanceof URL && path.protocol !== 'file:') {
+    throw new TypeError('Must be a file URL.')
+  }
+
+  await invoke('plugin:fs|start_accessing_security_scoped_resource', {
+    path: path instanceof URL ? path.toString() : path
+  })
+}
+
+/**
+ * Stops accessing a security-scoped resource for the given file URL.
+ * This should be called when you're done accessing a file that was opened
+ * using a security-scoped URL (e.g., from a file picker) when using manual tracking via {@linkcode startAccessingSecurityScopedResource}.
+ *
+ * #### Platform-specific
+ *
+ * - **iOS:** Stops accessing the security-scoped resource.
+ * - **Other platforms:** does nothing.
+ *
+ * @example
+ * ```typescript
+ * import { stopAccessingSecurityScopedResource } from '@tauri-apps/plugin-fs';
+ *
+ * const filePath = 'file:///path/to/file.txt';
+ * await startAccessingSecurityScopedResource(filePath);
+ * // ... use the resource ...
+ * // when you're done with the resource:
+ * await stopAccessingSecurityScopedResource(filePath);
+ * ```
+ *
+ * @since 2.5.0
+ */
+async function stopAccessingSecurityScopedResource(
+  path: string | URL
+): Promise<void> {
+  if (path instanceof URL && path.protocol !== 'file:') {
+    throw new TypeError('Must be a file URL.')
+  }
+
+  await invoke('plugin:fs|stop_accessing_security_scoped_resource', {
+    path: path instanceof URL ? path.toString() : path
+  })
+}
+
 export type {
  CreateOptions,
  OpenOptions,
@@ -1394,5 +1487,7 @@ export {
  exists,
  watch,
  watchImmediate,
-  size
+  size,
+  startAccessingSecurityScopedResource,
+  stopAccessingSecurityScopedResource
 }
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-fs",
-  "version": "2.4.2",
+  "version": "2.5.0",
  "description": "Access the file system.",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.8.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-start-accessing-security-scoped-resource"
+description = "Enables the start_accessing_security_scoped_resource command without any pre-configured scope."
+commands.allow = ["start_accessing_security_scoped_resource"]
+
+[[permission]]
+identifier = "deny-start-accessing-security-scoped-resource"
+description = "Denies the start_accessing_security_scoped_resource command without any pre-configured scope."
+commands.deny = ["start_accessing_security_scoped_resource"]
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-stop-accessing-security-scoped-resource"
+description = "Enables the stop_accessing_security_scoped_resource command without any pre-configured scope."
+commands.allow = ["stop_accessing_security_scoped_resource"]
+
+[[permission]]
+identifier = "deny-stop-accessing-security-scoped-resource"
+description = "Denies the stop_accessing_security_scoped_resource command without any pre-configured scope."
+commands.deny = ["stop_accessing_security_scoped_resource"]
@@ -3435,6 +3435,32 @@ Denies the size command without any pre-configured scope.
 <tr>
 <td>

+`fs:allow-start-accessing-security-scoped-resource`
+
+</td>
+<td>
+
+Enables the start_accessing_security_scoped_resource command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`fs:deny-start-accessing-security-scoped-resource`
+
+</td>
+<td>
+
+Denies the start_accessing_security_scoped_resource command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `fs:allow-stat`

 </td>
@@ -3461,6 +3487,32 @@ Denies the stat command without any pre-configured scope.
 <tr>
 <td>

+`fs:allow-stop-accessing-security-scoped-resource`
+
+</td>
+<td>
+
+Enables the stop_accessing_security_scoped_resource command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`fs:deny-stop-accessing-security-scoped-resource`
+
+</td>
+<td>
+
+Denies the stop_accessing_security_scoped_resource command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `fs:allow-truncate`

 </td>
@@ -3748,6 +3800,28 @@ This enables all index or metadata related commands without any pre-configured a

 An empty permission you can use to modify the global scope.

+## Example
+
+```json
+{
+  "identifier": "read-documents",
+  "windows": ["main"],
+  "permissions": [
+    "fs:allow-read",
+    {
+      "identifier": "fs:scope",
+      "allow": [
+        "$APPDATA/documents/**/*"
+      ],
+      "deny": [
+        "$APPDATA/documents/secret.txt"
+      ]
+    }
+  ]
+}
+```
+
+
 </td>
 </tr>

@@ -1860,6 +1860,18 @@
          "const": "deny-size",
          "markdownDescription": "Denies the size command without any pre-configured scope."
        },
+        {
+          "description": "Enables the start_accessing_security_scoped_resource command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-start-accessing-security-scoped-resource",
+          "markdownDescription": "Enables the start_accessing_security_scoped_resource command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the start_accessing_security_scoped_resource command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-start-accessing-security-scoped-resource",
+          "markdownDescription": "Denies the start_accessing_security_scoped_resource command without any pre-configured scope."
+        },
        {
          "description": "Enables the stat command without any pre-configured scope.",
          "type": "string",
@@ -1872,6 +1884,18 @@
          "const": "deny-stat",
          "markdownDescription": "Denies the stat command without any pre-configured scope."
        },
+        {
+          "description": "Enables the stop_accessing_security_scoped_resource command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-stop-accessing-security-scoped-resource",
+          "markdownDescription": "Enables the stop_accessing_security_scoped_resource command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the stop_accessing_security_scoped_resource command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-stop-accessing-security-scoped-resource",
+          "markdownDescription": "Denies the stop_accessing_security_scoped_resource command without any pre-configured scope."
+        },
        {
          "description": "Enables the truncate command without any pre-configured scope.",
          "type": "string",
@@ -2005,10 +2029,10 @@
          "markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
        },
        {
-          "description": "An empty permission you can use to modify the global scope.",
+          "description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n",
          "type": "string",
          "const": "scope",
-          "markdownDescription": "An empty permission you can use to modify the global scope."
+          "markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n  \"identifier\": \"read-documents\",\n  \"windows\": [\"main\"],\n  \"permissions\": [\n    \"fs:allow-read\",\n    {\n      \"identifier\": \"fs:scope\",\n      \"allow\": [\n        \"$APPDATA/documents/**/*\"\n      ],\n      \"deny\": [\n        \"$APPDATA/documents/secret.txt\"\n      ]\n    }\n  ]\n}\n```\n"
        },
        {
          "description": "This enables all write related commands without any pre-configured accessible paths.",
@@ -2,4 +2,27 @@

 [[permission]]
 identifier = "scope"
-description = "An empty permission you can use to modify the global scope."
+description = """
+An empty permission you can use to modify the global scope.
+
+## Example
+
+```json
+{
+  "identifier": "read-documents",
+  "windows": ["main"],
+  "permissions": [
+    "fs:allow-read",
+    {
+      "identifier": "fs:scope",
+      "allow": [
+        "$APPDATA/documents/**/*"
+      ],
+      "deny": [
+        "$APPDATA/documents/secret.txt"
+      ]
+    }
+  ]
+}
+```
+"""
@@ -3,37 +3,31 @@
 // SPDX-License-Identifier: MIT

 use serde::de::DeserializeOwned;
-use tauri::{
-    plugin::{PluginApi, PluginHandle},
-    AppHandle, Runtime,
-};
+use tauri::{plugin::PluginApi, AppHandle, Runtime};

 use crate::{models::*, FilePath, OpenOptions};

-#[cfg(target_os = "android")]
 const PLUGIN_IDENTIFIER: &str = "com.plugin.fs";

-#[cfg(target_os = "ios")]
-tauri::ios_plugin_binding!(init_plugin_fs);
+pub struct Fs<R: Runtime>(tauri::plugin::PluginHandle<R>);

-// initializes the Kotlin or Swift plugin classes
 pub fn init<R: Runtime, C: DeserializeOwned>(
    _app: &AppHandle<R>,
    api: PluginApi<R, C>,
 ) -> crate::Result<Fs<R>> {
-    #[cfg(target_os = "android")]
    let handle = api
        .register_android_plugin(PLUGIN_IDENTIFIER, "FsPlugin")
        .unwrap();
-    #[cfg(target_os = "ios")]
-    let handle = api.register_ios_plugin(init_plugin_android - intent - send)?;
    Ok(Fs(handle))
 }

-/// Access to the android-intent-send APIs.
-pub struct Fs<R: Runtime>(PluginHandle<R>);
-
 impl<R: Runtime> Fs<R> {
+    /// Open a file.
+    ///
+    /// # Platform-specific
+    ///
+    /// - **iOS**: This method will automatically start accessing a security-scoped resource if the path is a file URL.
+    ///   You must call `stop_accessing_security_scoped_resource` when you're done accessing the file.
    pub fn open<P: Into<FilePath>>(
        &self,
        path: P,
@@ -68,29 +62,25 @@ impl<R: Runtime> Fs<R> {
        }
    }

-    #[cfg(target_os = "android")]
    fn resolve_content_uri(
        &self,
        uri: impl Into<String>,
        mode: impl Into<String>,
    ) -> crate::Result<std::fs::File> {
-        #[cfg(target_os = "android")]
-        {
-            let result = self.0.run_mobile_plugin::<GetFileDescriptorResponse>(
-                "getFileDescriptor",
-                GetFileDescriptorPayload {
-                    uri: uri.into(),
-                    mode: mode.into(),
-                },
-            )?;
-            if let Some(fd) = result.fd {
-                Ok(unsafe {
-                    use std::os::fd::FromRawFd;
-                    std::fs::File::from_raw_fd(fd)
-                })
-            } else {
-                todo!()
-            }
+        let result = self.0.run_mobile_plugin::<GetFileDescriptorResponse>(
+            "getFileDescriptor",
+            GetFileDescriptorPayload {
+                uri: uri.into(),
+                mode: mode.into(),
+            },
+        )?;
+        if let Some(fd) = result.fd {
+            Ok(unsafe {
+                use std::os::fd::FromRawFd;
+                std::fs::File::from_raw_fd(fd)
+            })
+        } else {
+            unimplemented!()
        }
    }
 }
@@ -24,6 +24,12 @@ fn path_or_err<P: Into<FilePath>>(p: P) -> std::io::Result<PathBuf> {
 }

 impl<R: Runtime> Fs<R> {
+    /// Open a file.
+    ///
+    /// # Platform-specific
+    ///
+    /// - **iOS**: This method will automatically start accessing a security-scoped resource if the path is a file URL.
+    ///   You must call `stop_accessing_security_scoped_resource` when you're done accessing the file.
    pub fn open<P: Into<FilePath>>(
        &self,
        path: P,
@@ -0,0 +1,137 @@
+// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use serde::de::DeserializeOwned;
+use tauri::{plugin::PluginApi, AppHandle, Runtime};
+
+use crate::{FilePath, OpenOptions};
+
+pub struct Fs<R: Runtime> {
+    _phantom: std::marker::PhantomData<fn() -> R>,
+}
+
+pub fn init<R: Runtime, C: DeserializeOwned>(
+    _app: &AppHandle<R>,
+    _api: PluginApi<R, C>,
+) -> crate::Result<Fs<R>> {
+    Ok(Fs {
+        _phantom: std::marker::PhantomData,
+    })
+}
+
+impl<R: Runtime> Fs<R> {
+    /// Open a file.
+    ///
+    /// # Platform-specific
+    ///
+    /// - **iOS**: This method will automatically start accessing a security-scoped resource if the path is a file URL.
+    ///   You must call [`Self::stop_accessing_security_scoped_resource`] when you're done accessing the file.
+    pub fn open<P: Into<FilePath>>(
+        &self,
+        path: P,
+        opts: OpenOptions,
+    ) -> std::io::Result<std::fs::File> {
+        use objc2_foundation::{NSString, NSURL};
+
+        match path.into() {
+            FilePath::Url(url) if url.scheme() == "file" => {
+                // Handle security-scoped URLs on iOS
+                let url_string = url.as_str();
+                let url_nsstring = NSString::from_str(url_string);
+
+                // Create NSURL from the URL string
+                // URLWithString may return None for invalid URLs, but file:// URLs should be valid
+                let ns_url = unsafe { NSURL::URLWithString(&url_nsstring) };
+                if let Some(ns_url) = ns_url {
+                    // Start accessing the security-scoped resource
+                    // This is required for files outside the app's sandbox (e.g., from file picker)
+                    // Note: We don't call stopAccessingSecurityScopedResource here because
+                    // the file handle needs to remain accessible while the File is in use.
+                    // The access will be automatically stopped when the app is backgrounded or terminated.
+                    unsafe {
+                        let success = ns_url.startAccessingSecurityScopedResource();
+                        if success {
+                            log::debug!(
+                                "Started accessing security-scoped resource for URL: {}",
+                                url_string
+                            );
+                        } else {
+                            log::warn!(
+                                "Failed to start accessing security-scoped resource for URL: {}",
+                                url_string
+                            );
+                        }
+                    }
+                } else {
+                    log::debug!("Failed to create NSURL from URL: {}, ignoring security-scoped resource access request", url_string);
+                }
+
+                // Convert URL to path and open the file
+                let path = url.to_file_path().map_err(|_| {
+                    std::io::Error::new(std::io::ErrorKind::InvalidInput, "invalid file URL")
+                })?;
+                std::fs::OpenOptions::from(opts).open(path)
+            }
+            FilePath::Url(_) => Err(std::io::Error::new(
+                std::io::ErrorKind::InvalidInput,
+                "cannot use a non-file URL to load files on iOS",
+            )),
+            FilePath::Path(p) => {
+                // Regular path, no security-scoped resource handling needed
+                std::fs::OpenOptions::from(opts).open(p)
+            }
+        }
+    }
+
+    /// Stops accessing a security-scoped resource for the given file path or URL.
+    /// This should be called when you're done accessing a file that was opened
+    /// using a security-scoped URL (e.g., from a file picker).
+    ///
+    /// # Arguments
+    ///
+    /// * `path` - A file path or URL that was previously accessed via `startAccessingSecurityScopedResource`
+    ///
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if successful, or an error if the path/URL is invalid or not a file URL.
+    pub fn stop_accessing_security_scoped_resource<P: Into<FilePath>>(
+        &self,
+        path: P,
+    ) -> crate::Result<()> {
+        use objc2_foundation::{NSString, NSURL};
+
+        let file_path = path.into();
+        let url_string = match file_path {
+            FilePath::Url(url) => {
+                if url.scheme() != "file" {
+                    return Err(crate::Error::InvalidPathUrl);
+                }
+                url.as_str().to_string()
+            }
+            FilePath::Path(p) => {
+                // Convert path to file URL
+                url::Url::from_file_path(&p)
+                    .map_err(|_| crate::Error::InvalidPathUrl)?
+                    .as_str()
+                    .to_string()
+            }
+        };
+
+        let url_nsstring = NSString::from_str(&url_string);
+        let ns_url = unsafe { NSURL::URLWithString(&url_nsstring) };
+        if let Some(ns_url) = ns_url {
+            // Stop accessing the security-scoped resource
+            unsafe {
+                ns_url.stopAccessingSecurityScopedResource();
+            }
+        } else {
+            return Err(crate::Error::Io(std::io::Error::new(
+                std::io::ErrorKind::InvalidInput,
+                "failed to create NSURL from URL",
+            )));
+        }
+
+        Ok(())
+    }
+}
@@ -4,12 +4,17 @@

 //! Access the file system.

+// TODO(v3): consider redesign the API to implement automatic stopAccessingSecurityScopedResource on iOS
+// this likely requires returning a handle to a resource so we can impl Drop for it
+
 #![doc(
    html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png",
    html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png"
 )]

 use std::io::Read;
+#[cfg(target_os = "ios")]
+use std::sync::Mutex;

 use serde::Deserialize;
 use tauri::{
@@ -19,24 +24,28 @@ use tauri::{
    AppHandle, DragDropEvent, Manager, RunEvent, Runtime, WindowEvent,
 };

+#[cfg(target_os = "android")]
+mod android;
 mod commands;
 mod config;
-#[cfg(not(target_os = "android"))]
+#[cfg(desktop)]
 mod desktop;
 mod error;
 mod file_path;
-#[cfg(target_os = "android")]
-mod mobile;
+#[cfg(target_os = "ios")]
+mod ios;
 #[cfg(target_os = "android")]
 mod models;
 mod scope;
 #[cfg(feature = "watch")]
 mod watcher;

-#[cfg(not(target_os = "android"))]
-pub use desktop::Fs;
 #[cfg(target_os = "android")]
-pub use mobile::Fs;
+pub use android::Fs;
+#[cfg(desktop)]
+pub use desktop::Fs;
+#[cfg(target_os = "ios")]
+pub use ios::Fs;

 pub use error::Error;

@@ -369,6 +378,56 @@ pub(crate) struct Scope {
    pub(crate) require_literal_leading_dot: Option<bool>,
 }

+/// Tracks which paths have active security-scoped resource access on iOS.
+#[cfg(target_os = "ios")]
+pub(crate) struct SecurityScopedResources {
+    /// Set of file URLs that are currently accessing security-scoped resources.
+    /// The key is the URL string representation.
+    pub(crate) active_urls: Mutex<std::collections::HashSet<String>>,
+}
+
+#[cfg(target_os = "ios")]
+impl SecurityScopedResources {
+    pub(crate) fn new() -> Self {
+        Self {
+            active_urls: Mutex::new(std::collections::HashSet::new()),
+        }
+    }
+
+    pub(crate) fn is_tracked_manually(&self, url: &str) -> bool {
+        self.active_urls.lock().unwrap().contains(url)
+    }
+
+    pub(crate) fn track_manually(&self, url: String) {
+        self.active_urls.lock().unwrap().insert(url);
+    }
+
+    pub(crate) fn remove(&self, url: &str) {
+        self.active_urls.lock().unwrap().remove(url);
+    }
+}
+
+#[cfg(not(target_os = "ios"))]
+pub(crate) struct SecurityScopedResources;
+
+#[cfg(not(target_os = "ios"))]
+impl SecurityScopedResources {
+    pub(crate) fn new() -> Self {
+        Self
+    }
+
+    #[allow(dead_code)] // Used on iOS, but not on other platforms
+    pub(crate) fn is_tracked_manually(&self, _url: &str) -> bool {
+        false
+    }
+
+    #[allow(dead_code)] // Used on iOS, but not on other platforms
+    pub(crate) fn track_manually(&self, _url: String) {}
+
+    #[allow(dead_code)] // Used on iOS, but not on other platforms
+    pub(crate) fn remove(&self, _url: &str) {}
+}
+
 pub trait FsExt<R: Runtime> {
    fn fs_scope(&self) -> tauri::fs::Scope;
    fn try_fs_scope(&self) -> Option<tauri::fs::Scope>;
@@ -417,6 +476,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<config::Config>> {
            commands::write_text_file,
            commands::exists,
            commands::size,
+            commands::start_accessing_security_scoped_resource,
+            commands::stop_accessing_security_scoped_resource,
            #[cfg(feature = "watch")]
            watcher::watch,
        ])
@@ -431,13 +492,19 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<config::Config>> {

            #[cfg(target_os = "android")]
            {
-                let fs = mobile::init(app, api)?;
+                let fs = android::init(app, api)?;
                app.manage(fs);
            }
-            #[cfg(not(target_os = "android"))]
+            #[cfg(target_os = "ios")]
+            {
+                let fs = ios::init(app, api)?;
+                app.manage(fs);
+            }
+            #[cfg(desktop)]
            app.manage(Fs(app.clone()));

            app.manage(scope);
+            app.manage(SecurityScopedResources::new());
            Ok(())
        })
        .on_event(|app, event| {
--- a/Show More
+++ b/Show More