fix: don't panic on main pipe timeout, ref #1551 (#1699)

FabianLars · web-flow · commit a535fd95025d · 2026-03-23T10:43:47.000+01:00
diff --git a/.changes/android-timeout-crash.md b/.changes/android-timeout-crash.md
@@ -0,0 +1,5 @@
+---
+wry: patch
+---
+
+On Android, fixed panics on custom protocol timeouts. Increased timeout for non-internal requests to 30 seconds.
diff --git a/src/android/mod.rs b/src/android/mod.rs
@@ -279,7 +279,9 @@ impl InnerWebView {
                 });
 
               (custom_protocol_handler)(webview_id, request, RequestAsyncResponder { responder });
-              return Some(rx.recv_timeout(MAIN_PIPE_TIMEOUT).unwrap());
+              // 3x the timeout while we monitor https://github.com/tauri-apps/wry/issues/1551
+              // TODO: Remove timeout
+              return rx.recv_timeout(MAIN_PIPE_TIMEOUT * 3).inspect_err(|e| {eprintln!("custom protocol timed out: {e}");}).ok();
             }
             None
           },
@@ -493,7 +495,7 @@ pub fn platform_webview_version() -> Result<String> {
     }
   };
   MainPipe::send(activity_id, WebViewMessage::GetWebViewVersion(tx));
-  rx.recv_timeout(MAIN_PIPE_TIMEOUT).unwrap()
+  rx.recv_timeout(MAIN_PIPE_TIMEOUT)?
 }
 
 /// Finds a class in the project scope.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +wry: patch
 +---
++
 +On Android, fixed panics on custom protocol timeouts. Increased timeout for non-internal requests to 30 seconds.
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,9 @@ impl InnerWebView {`
`279`	`279`	`});`
`280`	`280`
`281`	`281`	`(custom_protocol_handler)(webview_id, request, RequestAsyncResponder { responder });`
`282`		`- return Some(rx.recv_timeout(MAIN_PIPE_TIMEOUT).unwrap());`
	`282`	`+ // 3x the timeout while we monitor https://github.com/tauri-apps/wry/issues/1551`
	`283`	`+ // TODO: Remove timeout`
	`284`	`+ return rx.recv_timeout(MAIN_PIPE_TIMEOUT * 3).inspect_err(\|e\| {eprintln!("custom protocol timed out: {e}");}).ok();`
`283`	`285`	`}`
`284`	`286`	`None`
`285`	`287`	`},`
`@@ -493,7 +495,7 @@ pub fn platform_webview_version() -> Result<String> {`
`493`	`495`	`}`
`494`	`496`	`};`
`495`	`497`	`MainPipe::send(activity_id, WebViewMessage::GetWebViewVersion(tx));`
`496`		`- rx.recv_timeout(MAIN_PIPE_TIMEOUT).unwrap()`
	`498`	`+ rx.recv_timeout(MAIN_PIPE_TIMEOUT)?`
`497`	`499`	`}`
`498`	`500`
`499`	`501`	`/// Finds a class in the project scope.`