From b786d54a08b1e26afe86299f3f76d48557749dc2 Mon Sep 17 00:00:00 2001
From: S4NKALP <sankalptharu50028@gmail.com>
Date: Wed, 22 Jul 2026 10:24:15 +0545
Subject: [PATCH] fix(bluetooth): late Battery1 interface attachment

- Add attach_battery_proxy() for devices where Battery1 appears after Device1
- Handle BLUEZ_BATTERY_IFACE in InterfacesAdded signal
- Search existing devices by object path to attach late battery proxy
---
 src/services/bluetooth.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/services/bluetooth.py b/src/services/bluetooth.py
index 3def3ce..0285924 100644
--- a/src/services/bluetooth.py
+++ b/src/services/bluetooth.py
@@ -256,6 +256,34 @@ class BluetoothDevice(Service):
             self.notify("battery-percentage")
             self.emit("changed")
 
+    def attach_battery_proxy(self):
+        """Attach Battery1 proxy if not already present (late Battery1 appearance)."""
+        if self._battery_proxy is not None:
+            return
+        try:
+            self._battery_proxy = _make_proxy(
+                self._bus, self._object_path, BLUEZ_BATTERY_IFACE
+            )
+            if not self._battery_sub_id:
+                self._battery_sub_id = self._bus.signal_subscribe(
+                    BLUEZ_SERVICE,
+                    DBUS_PROPS_IFACE,
+                    "PropertiesChanged",
+                    self._object_path,
+                    BLUEZ_BATTERY_IFACE,
+                    Gio.DBusSignalFlags.NONE,
+                    self._on_battery_properties_changed,
+                    None,
+                )
+            self.notify("battery-level")
+            self.notify("battery-percentage")
+            self.emit("changed")
+            logger.info(f"[bluetooth] Attached Battery1 proxy for {self._object_path}")
+        except Exception as e:
+            logger.warning(
+                f"[bluetooth] attach_battery_proxy failed for {self._object_path}: {e}"
+            )
+
     def pair(self, callback: Callable | None = None):
         """Initiate pairing with the device."""
 
@@ -757,6 +785,16 @@ class BluetoothClient(Service):
             self._add_adapter(obj_path, ifaces[BLUEZ_ADAPTER_IFACE])
         if BLUEZ_DEVICE_IFACE in ifaces:
             self._add_device(obj_path, ifaces[BLUEZ_DEVICE_IFACE])
+        if BLUEZ_BATTERY_IFACE in ifaces:
+            self._attach_battery_to_existing_device(obj_path)
+
+    def _attach_battery_to_existing_device(self, obj_path: str):
+        """Attach Battery1 proxy to an already-known device when Battery1 appears late."""
+        for adapter in self._adapters.values():
+            for device in adapter.devices:
+                if device._object_path == obj_path:
+                    device.attach_battery_proxy()
+                    return
 
     def _on_interfaces_removed(
         self, _conn, _sender, _path, _iface, _signal, params, _data