chore: Update android for local_name/advertising_name split

Author: qdot

src/droidplug/java/src/main/java/com/nonpolynomial/btleplug/android/impl/Peripheral.java

@@ -125,6 +125,11 @@ public boolean isConnected() {
         return this.connected;
     }
 
+    @SuppressLint("MissingPermission")
+    public String getDeviceName() {
+        return this.device.getName();
+    }
+
     @SuppressLint("MissingPermission")
     public Future<byte[]> read(UUID uuid) {
         SimpleFuture<byte[]> future = new SimpleFuture<>();

src/droidplug/jni/objects.rs

@@ -24,6 +24,7 @@ pub struct JPeripheral<'a: 'b, 'b> {
     get_notifications: JMethodID<'a>,
     read_descriptor: JMethodID<'a>,
     write_descriptor: JMethodID<'a>,
+    get_device_name: JMethodID<'a>,
     env: &'b JNIEnv<'a>,
 }
 
@@ -102,6 +103,8 @@ impl<'a: 'b, 'b> JPeripheral<'a, 'b> {
             "writeDescriptor",
             "(Ljava/util/UUID;Ljava/util/UUID;[BI)Lio/github/gedgygedgy/rust/future/Future;",
         )?;
+        let get_device_name =
+            env.get_method_id(class, "getDeviceName", "()Ljava/lang/String;")?;
         Ok(Self {
             internal: obj,
             connect,
@@ -114,6 +117,7 @@ impl<'a: 'b, 'b> JPeripheral<'a, 'b> {
             get_notifications,
             read_descriptor,
             write_descriptor,
+            get_device_name,
             env,
         })
     }
@@ -265,6 +269,24 @@ impl<'a: 'b, 'b> JPeripheral<'a, 'b> {
         JFuture::from_env(self.env, future_obj)
     }
 
+    pub fn get_device_name(&self) -> Result<Option<String>> {
+        let obj = self
+            .env
+            .call_method_unchecked(
+                self.internal,
+                self.get_device_name,
+                JavaType::Object("Ljava/lang/String;".to_string()),
+                &[],
+            )?
+            .l()?;
+        if obj.is_null() {
+            Ok(None)
+        } else {
+            let name_str = self.env.get_string(obj.into())?;
+            Ok(Some(name_str.into()))
+        }
+    }
+
     pub fn write_descriptor(
         &self,
         characteristic: JUuid<'a, 'b>,
@@ -732,8 +754,8 @@ impl<'a: 'b, 'b> TryFrom<JScanResult<'a, 'b>> for (BDAddr, Option<PeripheralProp
             Some(PeripheralProperties {
                 address: addr,
                 address_type: None,
-                local_name: device_name,
-                advertisement_name: None,
+                local_name: device_name.clone(),
+                advertisement_name: device_name,
                 tx_power_level,
                 manufacturer_data,
                 service_data,

src/droidplug/peripheral.rs

@@ -249,7 +249,18 @@ impl api::Peripheral for Peripheral {
         self.with_obj(|env, _obj| {
             let result = JPollResult::from_env(env, result_ref.as_obj())?;
             get_poll_result(env, result).map(|_| {})
-        })
+        })?;
+        // Query the system-cached device name and update local_name
+        self.with_obj(|_env, obj| -> std::result::Result<(), Error> {
+            if let Ok(Some(name)) = obj.get_device_name() {
+                let mut guard = self.shared.lock().map_err(Into::<Error>::into)?;
+                if let Some(ref mut props) = guard.properties {
+                    props.local_name = Some(name);
+                }
+            }
+            Ok(())
+        })?;
+        Ok(())
     }
 
     async fn disconnect(&self) -> Result<()> {