remove duplicate

system/ui/lib/wifi_manager.py

@@ -19,6 +19,7 @@ NM_WIRELESS_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless'
 NM_PROPERTIES_IFACE = 'org.freedesktop.DBus.Properties'
 NM_DEVICE_IFACE = "org.freedesktop.NetworkManager.Device"
 
+NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8
 
 # NetworkManager device states
 class NMDeviceState(IntEnum):
@@ -51,14 +52,15 @@ class NetworkInfo:
 class WifiManager:
   def __init__(self):
     self.networks: list[NetworkInfo] = []
-    self.bus: MessageBus | None = None
-    self.device_path: str | None = None
+    self.bus: MessageBus = None
+    self.device_path: str = ''
     self.device_proxy = None
     self.saved_connections: dict[str, str] = {}
     self.active_ap_path: str = ''
     self.scan_task: asyncio.Task | None = None
     self.running: bool = True
     self.need_auth_callback = None
+    self.activated_callback = None
 
   async def connect(self) -> None:
     """Connect to the DBus system bus."""
@@ -96,7 +98,7 @@ class WifiManager:
     except DBusError as e:
       cloudlog.warning(f"Scan request failed: {str(e)}")
 
-  async def get_active_access_point(self) -> str:
+  async def get_active_access_point(self):
     try:
       props_iface = self.device_proxy.get_interface(NM_PROPERTIES_IFACE)
       ap_path = await props_iface.call_get(NM_WIRELESS_IFACE, 'ActiveAccessPoint')
@@ -183,7 +185,7 @@ class WifiManager:
       device = await self.bus.introspect(NM, device_path)
       device_proxy = self.bus.get_proxy_object(NM, device_path, device)
       device_interface = device_proxy.get_interface(NM_DEVICE_IFACE)
-      device_type = await device_interface.get_device_type()
+      device_type = await device_interface.get_device_type()  # type: ignore[attr-defined]
       if device_type == 2:  # WiFi device
         self.device_path = device_path
         self.device_proxy = device_proxy
@@ -232,11 +234,17 @@ class WifiManager:
   def _on_state_changed(self, new_state: int, old_state: int, reason: int):
     print(f"State changed: {old_state} -> {new_state}, reason: {reason}")
     if new_state == NMDeviceState.ACTIVATED:
+      if self.activated_callback:
+          self.activated_callback()
       asyncio.create_task(self._update_connection_status())
     elif new_state in (NMDeviceState.DISCONNECTED, NMDeviceState.NEED_AUTH):
       for network in self.networks:
         network.is_connected = False
-      if new_state == NMDeviceState.NEED_AUTH and self.need_auth_callback:
+      if (
+        new_state == NMDeviceState.NEED_AUTH
+        and reason == NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT
+        and self.need_auth_callback
+      ):
         self.need_auth_callback()
 
   def _on_new_connection(self, path: str) -> None:
@@ -289,10 +297,9 @@ class WifiManager:
 
   async def _get_available_networks(self):
     """Get a list of available networks via NetworkManager."""
-    networks = []
     wifi_iface = self.device_proxy.get_interface(NM_WIRELESS_IFACE)
     access_points = await wifi_iface.get_access_points()
-
+    network_dict = {}
     for ap_path in access_points:
       try:
         props_iface = await self._get_interface(NM, ap_path, NM_PROPERTIES_IFACE)
@@ -303,27 +310,28 @@ class WifiManager:
           continue
 
         bssid = properties.get('HwAddress', Variant('s', '')).value
+        strength = properties['Strength'].value
         flags = properties['Flags'].value
         wpa_flags = properties['WpaFlags'].value
         rsn_flags = properties['RsnFlags'].value
-
-        networks.append(
-          NetworkInfo(
+        existing_network = network_dict.get(ssid)
+        if not existing_network or ((not existing_network.bssid and bssid) or (existing_network.strength < strength)):
+          network_dict[ssid] = NetworkInfo(
             ssid=ssid,
-            strength=properties['Strength'].value,
+            strength=strength,
             security_type=self._get_security_type(flags, wpa_flags, rsn_flags),
             path=ap_path,
             bssid=bssid,
             is_connected=self.active_ap_path == ap_path,
           )
-        )
+
       except DBusError as e:
         cloudlog.error(f"Error fetching networks: {e}")
       except Exception as e:
         cloudlog.error({e})
 
     self.networks = sorted(
-      networks,
+      network_dict.values(),
       key=lambda network: (
         not network.is_connected,
         -network.strength,  # Higher signal strength first

system/ui/widgets/keyboard.py

@@ -50,7 +50,7 @@ class Keyboard:
     self._clear()
 
   @property
-  def text(self) -> str:
+  def text(self):
     result = rl.ffi.string(self._string_pointer).decode('utf-8')
     self._clear()
     return result

system/ui/widgets/network.py

@@ -1,7 +1,6 @@
 import asyncio
 import pyray as rl
 from enum import IntEnum
-from dbus_next.constants import MessageType
 from openpilot.system.ui.lib.wifi_manager import WifiManager, NetworkInfo
 from openpilot.system.ui.lib.application import gui_app
 from openpilot.system.ui.lib.button import gui_button
@@ -26,7 +25,8 @@ class ActionState(IntEnum):
 class WifiManagerUI:
   def __init__(self, wifi_manager):
     self.wifi_manager = wifi_manager
-    self.wifi_manager.need_auth_callback = self._need_auth
+    self.wifi_manager.need_auth_callback = self._on_need_auth
+    self.wifi_manager.activated_callback = self._on_activated
     self._selected_network = None
     self.btn_width = 200
     self.current_action: ActionState = ActionState.NONE
@@ -128,11 +128,15 @@ class WifiManagerUI:
       await self.wifi_manager.activate_connection(self._selected_network.ssid)
     else:
       await self.wifi_manager.connect_to_network(self._selected_network.ssid, password)
-    self.current_action = ActionState.NONE
 
-  def _need_auth(self):
+  def _on_need_auth(self):
+    if self.current_action == ActionState.CONNECTING and self._selected_network:
       self.current_action = ActionState.NEED_AUTH
 
+  def _on_activated(self):
+    if self.current_action == ActionState.CONNECTING:
+      self.current_action = ActionState.NONE
+
 
 async def main():
   gui_app.init_window("Wifi Manager")