From ca169a93548e730e296f99a5defafc33dd148fcf Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Wed, 19 Feb 2025 10:46:44 -0700
Subject: [PATCH] musikr: fix jni env borrows

---
 musikr/src/main/jni/src/jbuilder.rs | 10 +++--
 musikr/src/main/jni/src/tagmap.rs   | 67 +++++++++++------------------
 2 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/musikr/src/main/jni/src/jbuilder.rs b/musikr/src/main/jni/src/jbuilder.rs
index d2b716c74..caf65bb3a 100644
--- a/musikr/src/main/jni/src/jbuilder.rs
+++ b/musikr/src/main/jni/src/jbuilder.rs
@@ -240,13 +240,17 @@ impl<'local, 'file_ref> JMetadataBuilder<'local, 'file_ref> {
             .borrow_mut()
             .find_class("org/oxycblt/musikr/metadata/Metadata")
             .unwrap();
+        // Get the objects first since they need the env borrow first
+        let id3v2 = self.id3v2.get_object();
+        let xiph = self.xiph.get_object();
+        let mp4 = self.mp4.get_object();
         self.env.borrow_mut().new_object(
             metadata_class,
             "(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;[BLorg/oxycblt/musikr/metadata/Properties;)V",
             &[
-                JValueGen::from(&self.id3v2.get_object()),
-                JValueGen::from(&self.xiph.get_object()),
-                JValueGen::from(&self.mp4.get_object()),
+                JValueGen::from(&id3v2),
+                JValueGen::from(&xiph),
+                JValueGen::from(&mp4),
                 JValueGen::from(&cover_array),
                 JValueGen::from(&properties),
             ],
diff --git a/musikr/src/main/jni/src/tagmap.rs b/musikr/src/main/jni/src/tagmap.rs
index b466fdc3d..65c7eb075 100644
--- a/musikr/src/main/jni/src/tagmap.rs
+++ b/musikr/src/main/jni/src/tagmap.rs
@@ -44,57 +44,40 @@ impl<'local> JTagMap<'local> {
     }
 
     pub fn get_object(&self) -> JObject {
-        let map_class = self
-            .env
-            .borrow_mut()
-            .find_class("java/util/HashMap")
-            .unwrap();
-        let map = self
-            .env
-            .borrow_mut()
-            .new_object(&map_class, "()V", &[])
-            .unwrap();
+        let mut env = self.env.borrow_mut();
+        
+        let map_class = env.find_class("java/util/HashMap").unwrap();
+        let map = env.new_object(&map_class, "()V", &[]).unwrap();
+        let array_list_class = env.find_class("java/util/ArrayList").unwrap();
 
         for (key, values) in &self.map {
-            let j_key = self.env.borrow().new_string(key).unwrap();
+            let j_key = env.new_string(key).unwrap();
+            
+            // Create ArrayList for values
+            let array_list = env.new_object(&array_list_class, "()V", &[]).unwrap();
+
+            // Convert all values to Java strings first
             let j_values: Vec<JObject> = values
                 .iter()
-                .map(|v| self.env.borrow().new_string(v).unwrap().into())
+                .map(|v| env.new_string(v).unwrap().into())
                 .collect();
 
-            // Create ArrayList for values
-            let array_list_class = self
-                .env
-                .borrow_mut()
-                .find_class("java/util/ArrayList")
-                .unwrap();
-            let array_list = self
-                .env
-                .borrow_mut()
-                .new_object(array_list_class, "()V", &[])
-                .unwrap();
-
+            // Add all values to ArrayList
             for value in j_values {
-                self.env
-                    .borrow_mut()
-                    .call_method(
-                        &array_list,
-                        "add",
-                        "(Ljava/lang/Object;)Z",
-                        &[JValueGen::from(&value)],
-                    )
-                    .unwrap();
+                env.call_method(
+                    &array_list,
+                    "add",
+                    "(Ljava/lang/Object;)Z",
+                    &[JValueGen::from(&value)],
+                ).unwrap();
             }
 
-            self.env
-                .borrow_mut()
-                .call_method(
-                    &map,
-                    "put",
-                    "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;",
-                    &[JValueGen::from(&j_key), JValueGen::from(&array_list)],
-                )
-                .unwrap();
+            env.call_method(
+                &map,
+                "put",
+                "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;",
+                &[JValueGen::from(&j_key), JValueGen::from(&array_list)],
+            ).unwrap();
         }
 
         map