Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: fix incorrect borrowing in jtagmap

Browse source
This commit is contained in:
Alexander Capehart 2025-02-19 11:27:20 -07:00
parent a3d853226f
commit 03c596e03c
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
musikr/src/main/jni/src/jtagmap.rs
View file

@ -31,8 +31,13 @@ impl<'local> JTagMap<'local> {
let mut env = self.env.borrow_mut(); let mut env = self.env.borrow_mut();
let array_list = env.new_object(&self.array_list_class, "()V", &[]).unwrap(); let array_list = env.new_object(&self.array_list_class, "()V", &[]).unwrap();
for value in values { // Create all JString values first
let j_value = env.new_string(value).unwrap(); let j_values: Vec<JString> = values.iter()
.map(|value| env.new_string(value).unwrap())
.collect();
// Then add them to the ArrayList
for j_value in j_values {
env.call_method( env.call_method(
&array_list, &array_list,
"add", "add",
@ -58,9 +63,12 @@ impl<'local> JTagMap<'local> {
} }
pub fn add_id_list(&self, id: impl Into<String>, values: Vec<String>) { pub fn add_id_list(&self, id: impl Into<String>, values: Vec<String>) {
// Create array list first while holding the borrow
let j_values = self.create_array_list(&values);
// Then create the id and make the call with a new borrow
let mut env = self.env.borrow_mut(); let mut env = self.env.borrow_mut();
let j_id = env.new_string(id.into()).unwrap(); let j_id = env.new_string(id.into()).unwrap();
let j_values = self.create_array_list(&values);
env.call_method( env.call_method(
&self.tag_map, &self.tag_map,
@ -84,9 +92,10 @@ impl<'local> JTagMap<'local> {
} }
pub fn add_custom_list(&self, description: impl Into<String>, values: Vec<String>) { pub fn add_custom_list(&self, description: impl Into<String>, values: Vec<String>) {
let j_values = self.create_array_list(&values);
let mut env = self.env.borrow_mut(); let mut env = self.env.borrow_mut();
let j_description = env.new_string(description.into()).unwrap(); let j_description = env.new_string(description.into()).unwrap();
let j_values = self.create_array_list(&values);
env.call_method( env.call_method(
&self.tag_map, &self.tag_map,
@ -111,10 +120,11 @@ impl<'local> JTagMap<'local> {
} }
pub fn add_combined_list(&self, id: impl Into<String>, description: impl Into<String>, values: Vec<String>) { pub fn add_combined_list(&self, id: impl Into<String>, description: impl Into<String>, values: Vec<String>) {
let j_values = self.create_array_list(&values);
let mut env = self.env.borrow_mut(); let mut env = self.env.borrow_mut();
let j_id = env.new_string(id.into()).unwrap(); let j_id = env.new_string(id.into()).unwrap();
let j_description = env.new_string(description.into()).unwrap(); let j_description = env.new_string(description.into()).unwrap();
let j_values = self.create_array_list(&values);
env.call_method( env.call_method(
&self.tag_map, &self.tag_map,