mici wifi: fix connected status and saved SSID matching

selfdrive/ui/mici/layouts/settings/network/__init__.py

@@ -165,6 +165,20 @@ class NetworkLayoutMici(NavWidget):
     self._network_metered_btn.set_enabled(lambda: not tethering_active and bool(self._wifi_manager.ipv4_address))
     self._tethering_toggle_btn.set_checked(tethering_active)
 
+    connected_network = next((network for network in networks if network.is_connected), None)
+    if connected_network is not None:
+      self._wifi_button.set_value(normalize_ssid(connected_network.ssid))
+      strength = round(connected_network.strength / 100 * 2)
+      if strength >= 2:
+        self._wifi_button.set_icon(self._wifi_full_txt)
+      elif strength == 1:
+        self._wifi_button.set_icon(self._wifi_medium_txt)
+      else:
+        self._wifi_button.set_icon(self._wifi_low_txt)
+    else:
+      self._wifi_button.set_value("not connected")
+      self._wifi_button.set_icon(self._wifi_slash_txt)
+
     # Update IP address
     self._ip_address_btn.set_value(self._wifi_manager.ipv4_address or "Not connected")
 

system/ui/lib/wifi_manager.py

@@ -66,6 +66,11 @@ DESKTOP_FAKE_IP = "192.168.1.42"
 TRUE_VALUES = {"1", "true", "yes", "on"}
 
 
+def _canonicalize_ssid(ssid: str) -> str:
+  # iPhone hotspots can alternate between unicode and ASCII apostrophes.
+  return ssid.replace("’", "'")
+
+
 class SecurityType(IntEnum):
   OPEN = 0
   WPA = 1
@@ -1136,8 +1141,8 @@ class WifiManager:
         for line in saved.stdout.splitlines():
           parts = self._parse_nmcli_line(line)
           if len(parts) >= 3 and parts[1] == "802-11-wireless" and parts[2]:
-            saved_ssids.add(parts[2])
-            saved_ssids.add(parts[0])
+            saved_ssids.add(_canonicalize_ssid(parts[2]))
+            saved_ssids.add(_canonicalize_ssid(parts[0]))
       except Exception as e:
         cloudlog.warning(f"nmcli saved networks query failed: {e}")
 
@@ -1153,6 +1158,7 @@ class WifiManager:
           in_use, ssid, signal, security = parts[:4]
           if not ssid:
             continue
+          ssid_key = _canonicalize_ssid(ssid)
           try:
             strength = int(signal or 0)
           except ValueError:
@@ -1160,16 +1166,31 @@ class WifiManager:
 
           security_type = SecurityType.OPEN if security in ("", "--") else SecurityType.WPA
           is_connected = in_use.startswith("*")
-          is_saved = ssid in saved_ssids
+          is_saved = ssid_key in saved_ssids
 
-          existing = networks_by_ssid.get(ssid)
-          if existing is None or strength > existing.strength or is_connected:
-            networks_by_ssid[ssid] = Network(
+          existing = networks_by_ssid.get(ssid_key)
+          should_replace = (
+            existing is None or
+            (is_connected and not existing.is_connected) or
+            (existing is not None and is_connected == existing.is_connected and strength > existing.strength)
+          )
+
+          if should_replace:
+            prior_saved = existing.is_saved if existing is not None else False
+            networks_by_ssid[ssid_key] = Network(
               ssid=ssid,
               strength=strength,
-              is_connected=is_connected and is_saved,
+              is_connected=is_connected,
               security_type=security_type,
-              is_saved=is_saved,
+              is_saved=is_saved or prior_saved,
+            )
+          elif existing is not None:
+            networks_by_ssid[ssid_key] = Network(
+              ssid=existing.ssid,
+              strength=existing.strength,
+              is_connected=existing.is_connected or is_connected,
+              security_type=existing.security_type,
+              is_saved=existing.is_saved or is_saved,
             )
       except Exception as e:
         cloudlog.warning(f"nmcli scan failed: {e}")