jni-rs update to v0.22

Cargo.toml

@@ -45,11 +45,11 @@ dbus = "0.9.10"
 bluez-async = "0.8.2"
 
 [target.'cfg(target_os = "android")'.dependencies]
-jni = "0.19.0"
+jni = "0.22"
 once_cell = "1.21.3"
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-jni = { version = "0.19.0", optional = true }
+jni = { version = "0.22", optional = true }
 once_cell = { version = "1.21.3", optional = true }
 
 [target.'cfg(target_vendor = "apple")'.dependencies]

src/bluez/adapter.rs

@@ -206,14 +206,11 @@ async fn central_events(
         },
         BluetoothEvent::Adapter {
             id,
-            event: adapter_event,
-        } if id == adapter_id => match adapter_event {
-            AdapterEvent::Powered { powered } => {
-                let state = get_central_state(powered);
-                Some(vec![CentralEvent::StateUpdate(state)])
-            }
-            _ => None,
-        },
+            event: AdapterEvent::Powered { powered },
+        } if id == adapter_id => {
+            let state = get_central_state(powered);
+            Some(vec![CentralEvent::StateUpdate(state)])
+        }
         _ => None,
     }
 }

src/bluez/peripheral.rs

@@ -141,7 +141,7 @@ impl api::Peripheral for Peripheral {
     fn mtu(&self) -> u16 {
         let services = self.services.lock().unwrap();
         for (_, service) in services.iter() {
-            for (_, characteristic) in service.characteristics.iter() {
+            if let Some((_, characteristic)) = service.characteristics.iter().next() {
                 return characteristic.info.mtu.unwrap();
             }
         }
@@ -202,9 +202,7 @@ impl api::Peripheral for Peripheral {
                         // This "should" be unique, but of course it's not enforced
                         HashMap::<Uuid, CharacteristicInfo>::new(),
                         |mut map, characteristic| {
-                            if !map.contains_key(&characteristic.uuid) {
-                                map.insert(characteristic.uuid, characteristic);
-                            }
+                            map.entry(characteristic.uuid).or_insert(characteristic);
                             map
                         },
                     )
@@ -391,8 +389,8 @@ fn make_characteristic(
         uuid: info.uuid,
         properties: info.flags.into(),
         descriptors: descriptors
-            .iter()
-            .map(|(_, descriptor)| make_descriptor(descriptor, info.uuid, service_uuid))
+            .values()
+            .map(|descriptor| make_descriptor(descriptor, info.uuid, service_uuid))
             .collect(),
         service_uuid,
     }