From 70d8ae057c5e8b81db4aac28e5fa2dd3424b3307 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.studio>
Date: Wed, 16 Aug 2023 15:50:15 -0700
Subject: [PATCH] fix(android): handle request freezes due to wrong usage of
 iterator (#1009)

---
 .changes/fix-endless-loop-handle-request.md | 5 +++++
 src/webview/android/binding.rs              | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/fix-endless-loop-handle-request.md

diff --git a/.changes/fix-endless-loop-handle-request.md b/.changes/fix-endless-loop-handle-request.md
new file mode 100644
index 000000000..62117d42e
--- /dev/null
+++ b/.changes/fix-endless-loop-handle-request.md
@@ -0,0 +1,5 @@
+---
+"wry": patch
+---
+
+Fixes Android freezing when handling request due to endless iteration when reading request headers.
diff --git a/src/webview/android/binding.rs b/src/webview/android/binding.rs
index a625e035d..a35447a30 100644
--- a/src/webview/android/binding.rs
+++ b/src/webview/android/binding.rs
@@ -49,7 +49,8 @@ fn handle_request(env: &mut JNIEnv, request: JObject) -> Result<jobject, JniErro
     .call_method(request, "getRequestHeaders", "()Ljava/util/Map;", &[])?
     .l()?;
   let request_headers = JMap::from_env(env, &request_headers)?;
-  while let Some((header, value)) = request_headers.iter(env)?.next(env)? {
+  let mut iter = request_headers.iter(env)?;
+  while let Some((header, value)) = iter.next(env)? {
     let header = JString::from(header);
     let value = JString::from(value);
     let header = env.get_string(&header)?;