diff --git a/Cargo.lock b/Cargo.lock index ed09c5f9..cd1a445e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1831,9 +1831,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes 1.4.0", "fnv", @@ -2707,6 +2707,15 @@ dependencies = [ "syn", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "objc" version = "0.2.7" @@ -3108,7 +3117,7 @@ dependencies = [ "line-wrap", "quick-xml", "serde", - "time 0.3.18", + "time 0.3.15", ] [[package]] @@ -4273,7 +4282,7 @@ dependencies = [ [[package]] name = "tauri" version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "anyhow", "attohttpc", @@ -4323,7 +4332,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "anyhow", "cargo_toml", @@ -4342,7 +4351,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "base64 0.21.0", "brotli", @@ -4358,7 +4367,7 @@ dependencies = [ "sha2 0.10.6", "tauri-utils", "thiserror", - "time 0.3.18", + "time 0.3.15", "url", "uuid", "walkdir", @@ -4367,7 +4376,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "heck", "proc-macro2", @@ -4469,7 +4478,17 @@ dependencies = [ "serde_json", "serde_repr", "tauri", - "time 0.3.18", + "time 0.3.15", +] + +[[package]] +name = "tauri-plugin-path" +version = "0.0.0" +dependencies = [ + "serde", + "tauri", + "tauri-build", + "thiserror", ] [[package]] @@ -4598,7 +4617,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "gtk", "http", @@ -4619,7 +4638,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "cocoa", "gtk", @@ -4639,7 +4658,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#6aaba83476339fa413fe34d28877a932cb485117" +source = "git+https://github.com/tauri-apps/tauri?branch=next#6fca895695e220995802bfbed2486056402ab535" dependencies = [ "brotli", "ctor", @@ -4756,29 +4775,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.18" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0097eaf301d576d0b2aead7a59facab6d53cc636340f0291fab8446a2e8613" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" dependencies = [ "itoa 1.0.5", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", + "libc", + "num_threads", ] [[package]] @@ -5709,7 +5712,7 @@ dependencies = [ [[package]] name = "wry" version = "0.27.0" -source = "git+https://github.com/tauri-apps/wry?branch=dev#9975dda12a122051b375ec6485650546d2d91c26" +source = "git+https://github.com/tauri-apps/wry?branch=dev#7795356a45b1bd015fad0e9973fc5af58c8c339b" dependencies = [ "base64 0.13.1", "block", diff --git a/plugins/camera/android/src/main/java/app/tauri/camera/CameraPlugin.kt b/plugins/camera/android/src/main/java/app/tauri/camera/CameraPlugin.kt index ada2984c..00aa3475 100644 --- a/plugins/camera/android/src/main/java/app/tauri/camera/CameraPlugin.kt +++ b/plugins/camera/android/src/main/java/app/tauri/camera/CameraPlugin.kt @@ -193,9 +193,7 @@ class CameraPlugin(private val activity: Activity): Plugin(activity) { */ @PermissionCallback private fun cameraPermissionsCallback(invoke: Invoke) { - // TODO: invoke.methodName() - val methodName = "pickImages" - if (methodName == "pickImages") { + if (invoke.command == "pickImages") { openPhotos(invoke, multiple = true, skipPermission = true) } else { if (settings.source === CameraSource.CAMERA && getPermissionState(CAMERA) !== PermissionState.GRANTED) {