wip

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Author: patrickelectric

core/services/wifi/wifi_handlers/networkmanager/networkmanager.py

@@ -116,40 +116,29 @@ async def start(self) -> None:
         # Find WiFi device
         assert self._nm is not None
         devices = await self._nm.get_devices()
-
-        # First, try to use configured interface if set
-        configured_interface = self._settings_manager.settings.primary_interface
-        if configured_interface:
-            for device_path in devices:
-                device = NetworkDeviceWireless(device_path, self._bus)
-                if await device.device_type == DeviceType.WIFI:
-                    if await device.interface == configured_interface:
-                        self._device_path = device_path
-                        logger.info(f"Using configured WiFi interface: {configured_interface}")
-                        break
-
-        # Fallback to first available WiFi device
-        if not self._device_path:
-            for device_path in devices:
-                device = NetworkDeviceWireless(device_path, self._bus)
-                if await device.device_type == DeviceType.WIFI:
-                    self._device_path = device_path
-                    break
+        for device_path in devices:
+            device = NetworkDeviceWireless(device_path, self._bus)
+            if await device.device_type == DeviceType.WIFI:
+                self._device_path = device_path
+                break
 
         # Create virtual AP interface if needed
         await self._create_virtual_interface()
         self._tasks.append(asyncio.get_event_loop().create_task(self._autoscan()))
         self._tasks.append(asyncio.get_event_loop().create_task(self.hotspot_watchdog()))
 
     async def _get_wifi_devices(self) -> List[tuple[str, str]]:
-        """Get all WiFi devices as (device_path, interface_name) tuples."""
+        """Get all WiFi devices as (device_path, interface_name) tuples, excluding virtual AP interfaces."""
         assert self._nm is not None
         wifi_devices: List[tuple[str, str]] = []
         devices = await self._nm.get_devices()
         for device_path in devices:
             device = NetworkDeviceWireless(device_path, self._bus)
             if await device.device_type == DeviceType.WIFI:
                 interface_name = await device.interface
+                # Skip virtual AP interface used for hotspot
+                if interface_name == self._ap_interface:
+                    continue
                 wifi_devices.append((device_path, interface_name))
         return wifi_devices
 
@@ -166,13 +155,28 @@ async def _select_wifi_device(self) -> None:
                 if interface_name == configured_interface:
                     self._device_path = device_path
                     logger.info(f"Using configured WiFi interface: {configured_interface}")
+                    # Trigger a scan on the newly selected device
+                    await self._request_scan()
                     return
 
             logger.warning(f"Configured interface {configured_interface} not found, using first available")
 
         # Use first available device
         self._device_path = wifi_devices[0][0]
         logger.info(f"Using WiFi interface: {wifi_devices[0][1]}")
+        # Trigger a scan on the newly selected device
+        await self._request_scan()
+
+    async def _request_scan(self) -> None:
+        """Request a WiFi scan on the current device."""
+        if not self._device_path:
+            return
+        try:
+            device = NetworkDeviceWireless(self._device_path, self._bus)
+            await device.request_scan({})
+            logger.info("Requested WiFi scan on new interface")
+        except Exception as e:
+            logger.warning(f"Failed to request scan: {e}")
 
     async def _autoscan(self) -> None:
 
@@ -274,16 +278,11 @@ async def wait_for_connection(timeout: int = 30) -> bool:
             return
 
         # If no existing connection, create a new one
-        # Get the interface name from the current device
-        assert self._device_path is not None
-        current_device = NetworkDeviceWireless(self._device_path, self._bus)
-        interface_name = await current_device.interface
-
         connection: dict[str, dict[str, tuple[str, Any]]] = {
             "connection": {
                 "type": ("s", "802-11-wireless"),
                 "id": ("s", credentials.ssid),
-                "interface-name": ("s", interface_name),
+                "interface-name": ("s", "wlan0"),
                 "autoconnect": ("b", True),
             },
             "802-11-wireless": {