WifiUi: use WifiManager forget (#37208)

* start

* clean up forget
This commit is contained in:
Shane Smiskol
2026-02-13 17:30:59 -08:00
committed by GitHub
parent 9bb6e997aa
commit 5a9fdde156
3 changed files with 11 additions and 16 deletions
@@ -342,7 +342,7 @@ class WifiUIMici(BigMultiOptionDialog):
# Set up back navigation
self.set_back_callback(back_callback)
self._network_info_page = NetworkInfoPage(wifi_manager, self._connect_to_network, self._forget_network, self._open_network_manage_page)
self._network_info_page = NetworkInfoPage(wifi_manager, self._connect_to_network, wifi_manager.forget_connection, self._open_network_manage_page)
self._network_info_page.set_connecting(lambda: self._connecting)
self._loading_animation = LoadingAnimation()
@@ -371,14 +371,6 @@ class WifiUIMici(BigMultiOptionDialog):
self._network_info_page.update_networks(self._networks)
gui_app.set_modal_overlay(self._network_info_page)
def _forget_network(self, ssid: str):
network = self._networks.get(ssid)
if network is None:
cloudlog.warning(f"Trying to forget unknown network: {ssid}")
return
self._wifi_manager.forget_connection(network.ssid)
def _on_network_updated(self, networks: list[Network]):
self._networks = {network.ssid: network for network in networks}
self._update_buttons()
+9 -6
View File
@@ -498,13 +498,16 @@ class WifiManager:
def forget_connection(self, ssid: str, block: bool = False):
def worker():
conn_path = self._connections.get(ssid, None)
if conn_path is not None:
conn_addr = DBusAddress(conn_path, bus_name=NM, interface=NM_CONNECTION_IFACE)
self._router_main.send_and_get_reply(new_method_call(conn_addr, 'Delete'))
if conn_path is None:
cloudlog.warning(f"Trying to forget unknown connection: {ssid}")
return
if len(self._forgotten):
self._update_networks()
self._enqueue_callbacks(self._forgotten, ssid)
conn_addr = DBusAddress(conn_path, bus_name=NM, interface=NM_CONNECTION_IFACE)
self._router_main.send_and_get_reply(new_method_call(conn_addr, 'Delete'))
if len(self._forgotten):
self._update_networks()
self._enqueue_callbacks(self._forgotten, ssid)
if block:
worker()
+1 -1
View File
@@ -267,7 +267,7 @@ class Scroller(Widget):
rl.begin_scissor_mode(int(self._rect.x), int(self._rect.y),
int(self._rect.width), int(self._rect.height))
for item in self._visible_items:
for item in reversed(self._visible_items):
# Skip rendering if not in viewport
if not rl.check_collision_recs(item.rect, self._rect):
continue