update lock file

tauri-apps · Oct 11, 2024 · 9bd6fe7 · 9bd6fe7
1 parent d1b985b
commit 9bd6fe7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs
@@ -4194,7 +4194,7 @@ fn create_webview<T: UserEvent>(
       scheme,
       move |webview_id, request, responder| {
         protocol(
-          webview_id.as_deref(),
+          webview_id,
           request,
           Box::new(move |response| responder.respond(response)),
         )

diff --git a/crates/tauri-runtime/src/webview.rs b/crates/tauri-runtime/src/webview.rs
@@ -18,11 +18,8 @@ use std::{
   sync::Arc,
 };
 
-type UriSchemeProtocol = dyn Fn(
-    Option<&str>,
-    http::Request<Vec<u8>>,
-    Box<dyn FnOnce(http::Response<Cow<'static, [u8]>>) + Send>,
-  ) + Send
+type UriSchemeProtocol = dyn Fn(&str, http::Request<Vec<u8>>, Box<dyn FnOnce(http::Response<Cow<'static, [u8]>>) + Send>)
+  + Send
   + Sync
   + 'static;
 
@@ -132,11 +129,8 @@ impl<T: UserEvent, R: Runtime<T>> PendingWebview<T, R> {
 
   pub fn register_uri_scheme_protocol<
     N: Into<String>,
-    H: Fn(
-        Option<&str>,
-        http::Request<Vec<u8>>,
-        Box<dyn FnOnce(http::Response<Cow<'static, [u8]>>) + Send>,
-      ) + Send
+    H: Fn(&str, http::Request<Vec<u8>>, Box<dyn FnOnce(http::Response<Cow<'static, [u8]>>) + Send>)
+      + Send
       + Sync
       + 'static,
   >(

diff --git a/crates/tauri/src/manager/webview.rs b/crates/tauri/src/manager/webview.rs
@@ -212,14 +212,13 @@ impl<R: Runtime> WebviewManager<R> {
       registered_scheme_protocols.push(uri_scheme.clone());
       let protocol = protocol.clone();
       let app_handle = manager.app_handle().clone();
-      let webview_label = label.to_string();
 
       pending.register_uri_scheme_protocol(
         uri_scheme.clone(),
         move |webview_id, request, responder| {
           let context = UriSchemeContext {
             app_handle: &app_handle,
-            webview_label: webview_id.unwrap_or(&webview_label),
+            webview_label: webview_id,
           };
           (protocol.protocol)(context, request, UriSchemeResponder(responder))
         },
@@ -256,24 +255,15 @@ impl<R: Runtime> WebviewManager<R> {
         web_resource_request_handler,
       );
       pending.register_uri_scheme_protocol("tauri", move |webview_id, request, responder| {
-        protocol(
-          webview_id.unwrap_or_default(),
-          request,
-          UriSchemeResponder(responder),
-        )
+        protocol(webview_id, request, UriSchemeResponder(responder))
       });
       registered_scheme_protocols.push("tauri".into());
     }
 
     if !registered_scheme_protocols.contains(&"ipc".into()) {
       let protocol = crate::ipc::protocol::get(manager.manager_owned());
-      let webview_label = pending.label.clone();
       pending.register_uri_scheme_protocol("ipc", move |webview_id, request, responder| {
-        protocol(
-          webview_id.unwrap_or(&webview_label),
-          request,
-          UriSchemeResponder(responder),
-        )
+        protocol(webview_id, request, UriSchemeResponder(responder))
       });
       registered_scheme_protocols.push("ipc".into());
     }
@@ -312,11 +302,7 @@ impl<R: Runtime> WebviewManager<R> {
         .clone();
       let protocol = crate::protocol::asset::get(asset_scope.clone(), window_origin.clone());
       pending.register_uri_scheme_protocol("asset", move |webview_id, request, responder| {
-        protocol(
-          webview_id.unwrap_or_default(),
-          request,
-          UriSchemeResponder(responder),
-        )
+        protocol(webview_id, request, UriSchemeResponder(responder))
       });
     }
 
@@ -336,11 +322,7 @@ impl<R: Runtime> WebviewManager<R> {
         window_origin,
       );
       pending.register_uri_scheme_protocol(schema, move |webview_id, request, responder| {
-        protocol(
-          webview_id.unwrap_or_default(),
-          request,
-          UriSchemeResponder(responder),
-        )
+        protocol(webview_id, request, UriSchemeResponder(responder))
       });
     }