dbus: forget method, disconnecting and forgetting associated networks

Author: cachebag

nmrs-core/src/dbus.rs

@@ -547,4 +547,123 @@ impl NetworkManager {
             _ => "Unknown",
         }
     }
+
+    pub async fn forget(&self, ssid: &str) -> zbus::Result<()> {
+        use std::collections::HashMap;
+        use zvariant::{OwnedObjectPath, Value};
+
+        let nm = NMProxy::new(&self.conn).await?;
+
+        // 1) Disconnect any Wi-Fi device currently connected to this SSID
+        let devices = nm.get_devices().await?;
+        for dev_path in &devices {
+            let dev = NMDeviceProxy::builder(&self.conn)
+                .path(dev_path.clone())?
+                .build()
+                .await?;
+            if dev.device_type().await? != 2 {
+                continue;
+            }
+
+            let wifi = NMWirelessProxy::builder(&self.conn)
+                .path(dev_path.clone())?
+                .build()
+                .await?;
+            if let Ok(ap_path) = wifi.active_access_point().await
+                && ap_path.as_str() != "/"
+            {
+                let ap = NMAccessPointProxy::builder(&self.conn)
+                    .path(ap_path.clone())?
+                    .build()
+                    .await?;
+                if let Ok(bytes) = ap.ssid().await
+                    && std::str::from_utf8(&bytes).ok() == Some(ssid)
+                {
+                    let dev_proxy: zbus::Proxy<'_> = zbus::proxy::Builder::new(&self.conn)
+                        .destination("org.freedesktop.NetworkManager")?
+                        .path(dev_path.clone())?
+                        .interface("org.freedesktop.NetworkManager.Device")?
+                        .build()
+                        .await?;
+                    let _ = dev_proxy.call_method("Disconnect", &()).await;
+
+                    for _ in 0..10 {
+                        if dev.state().await? == 30 {
+                            break;
+                        }
+                        tokio::time::sleep(std::time::Duration::from_millis(200)).await;
+                    }
+                }
+            }
+        }
+
+        // 2) Delete any saved profiles for this SSID
+        let settings: zbus::Proxy<'_> = zbus::proxy::Builder::new(&self.conn)
+            .destination("org.freedesktop.NetworkManager")?
+            .path("/org/freedesktop/NetworkManager/Settings")?
+            .interface("org.freedesktop.NetworkManager.Settings")?
+            .build()
+            .await?;
+
+        let list_reply = settings.call_method("ListConnections", &()).await?;
+        let conns: Vec<OwnedObjectPath> = list_reply.body().deserialize()?;
+
+        let mut deleted_any = false;
+
+        for cpath in conns {
+            let cproxy: zbus::Proxy<'_> = zbus::proxy::Builder::new(&self.conn)
+                .destination("org.freedesktop.NetworkManager")?
+                .path(cpath.clone())?
+                .interface("org.freedesktop.NetworkManager.Settings.Connection")?
+                .build()
+                .await?;
+
+            if let Ok(id) = cproxy.get_property::<String>("Id").await
+                && id == ssid
+            {
+                let _ = cproxy.call_method("Delete", &()).await;
+                deleted_any = true;
+                continue;
+            }
+
+            if let Ok(msg) = cproxy.call_method("GetSettings", &()).await {
+                let body = msg.body();
+                let settings_map: HashMap<String, HashMap<String, Value>> = body.deserialize()?;
+
+                if let Some(conn_sec) = settings_map.get("connection")
+                    && let Some(Value::Str(id)) = conn_sec.get("id")
+                    && id.as_str() == ssid
+                {
+                    let _ = cproxy.call_method("Delete", &()).await;
+                    deleted_any = true;
+                    continue;
+                }
+
+                if let Some(wifi_sec) = settings_map.get("802-11-wireless")
+                    && let Some(Value::Array(arr)) = wifi_sec.get("ssid")
+                {
+                    let mut raw = Vec::new();
+                    for v in arr.iter() {
+                        if let Ok(b) = u8::try_from(v.clone()) {
+                            raw.push(b);
+                        }
+                    }
+                    if std::str::from_utf8(&raw).ok() == Some(ssid) {
+                        let _ = cproxy.call_method("Delete", &()).await;
+                        deleted_any = true;
+                        continue;
+                    }
+                }
+            }
+        }
+
+        if deleted_any {
+            println!("Forgot and disconnected '{ssid}'");
+            Ok(())
+        } else {
+            Err(zbus::Error::Failure(format!(
+                "No saved connection for {ssid}"
+            )))
+        }
+    }
 }

nmrs-core/src/models.rs

@@ -13,6 +13,7 @@ pub struct Network {
     pub is_eap: bool,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct NetworkInfo {
     pub ssid: String,
     pub bssid: String,

nmrs-ui/src/style.css

@@ -168,3 +168,19 @@ label.network-poor { color: #ef4444; }
 .wifi-open {
   color: white;
 }
+
+.loading-spinner {
+  margin-top: 12px;
+  margin-bottom: 12px;
+  opacity: 0.6;
+}
+
+.forget-button {
+    font-size: 0.85em;
+    opacity: 0.7;
+    padding: 2px 6px;
+    border-radius: 6px;
+}
+.forget-button:hover {
+    opacity: 1;
+}

nmrs-ui/src/ui/header.rs

@@ -37,6 +37,7 @@ pub fn build_header(
     let wifi_switch = Switch::new();
     wifi_switch.set_valign(gtk::Align::Center);
     header.pack_end(&wifi_switch);
+    wifi_switch.set_size_request(24, 24);
 
     header.pack_end(&status);
 
@@ -48,6 +49,7 @@ pub fn build_header(
         let stack_clone = stack.clone();
 
         glib::MainContext::default().spawn_local(async move {
+            stack_clone.set_visible_child_name("loading");
             clear_children(&list_container_clone);
 
             match NetworkManager::new().await {
@@ -56,12 +58,15 @@ pub fn build_header(
                         wifi_switch_clone.set_active(enabled);
 
                         if enabled {
-                            status_clone.set_text("");
+                            status_clone.set_text("Scanning...");
+                            let _ = nm.scan_networks().await;
+                            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
                             match nm.list_networks().await {
                                 Ok(nets) => {
                                     let list: ListBox =
                                         networks::networks_view(&nets, &pw, &stack_clone);
                                     list_container_clone.append(&list);
+                                    stack_clone.set_visible_child_name("networks");
                                 }
                                 Err(err) => {
                                     status_clone
@@ -117,6 +122,7 @@ pub fn build_header(
                                         let list: ListBox =
                                             networks::networks_view(&nets, &pw, &stack_inner);
                                         list_container_clone.append(&list);
+                                        stack_inner.set_visible_child_name("networks");
                                     }
                                     Err(err) => {
                                         status_clone

nmrs-ui/src/ui/mod.rs

@@ -5,7 +5,8 @@ pub mod networks;
 
 use gtk::prelude::*;
 use gtk::{
-    Application, ApplicationWindow, Box as GtkBox, Label, Orientation, ScrolledWindow, Stack,
+    Application, ApplicationWindow, Box as GtkBox, Label, Orientation, ScrolledWindow, Spinner,
+    Stack,
 };
 
 pub fn build_ui(app: &Application) {
@@ -18,8 +19,19 @@ pub fn build_ui(app: &Application) {
     let list_container = GtkBox::new(Orientation::Vertical, 0);
 
     let stack = Stack::new();
+
+    let spinner = Spinner::new();
+    spinner.set_halign(gtk::Align::Center);
+    spinner.set_valign(gtk::Align::Center);
+    spinner.set_property("width-request", 24i32);
+    spinner.set_property("height-request", 24i32);
+    spinner.add_css_class("loading-spinner");
+    spinner.start();
+
+    stack.add_named(&spinner, Some("loading"));
+    stack.set_visible_child_name("loading");
+
     stack.add_named(&list_container, Some("networks"));
-    stack.set_visible_child_name("networks");
 
     let header = header::build_header(&status, &list_container, &win, &stack);
     vbox.append(&header);

nmrs-ui/src/ui/network_page.rs

@@ -1,9 +1,10 @@
 use glib::clone;
 use gtk::prelude::*;
 use gtk::{Align, Box, Button, Image, Label, Orientation};
+use nmrs_core::NetworkManager;
 use nmrs_core::models::NetworkInfo;
 
-pub fn network_page(info: &NetworkInfo, stack: &gtk::Stack) -> Box {
+pub fn network_page(info: NetworkInfo, stack: &gtk::Stack) -> Box {
     let container = Box::new(Orientation::Vertical, 12);
     container.add_css_class("network-page");
 
@@ -27,8 +28,36 @@ pub fn network_page(info: &NetworkInfo, stack: &gtk::Stack) -> Box {
     icon.set_pixel_size(24);
     let title = Label::new(Some(&info.ssid));
     title.add_css_class("network-title");
+
+    let spacer = Box::new(Orientation::Horizontal, 0);
+    spacer.set_hexpand(true);
+
+    let forget_btn = Button::with_label("Forget");
+    forget_btn.add_css_class("forget-button");
+    forget_btn.set_halign(Align::End);
+    forget_btn.set_valign(Align::Center);
+    forget_btn.set_cursor_from_name(Some("pointer"));
+
+    forget_btn.connect_clicked(clone!(
+        #[strong]
+        info,
+        #[weak]
+        stack,
+        move |_| {
+            let ssid = info.ssid.clone();
+            glib::MainContext::default().spawn_local(async move {
+                if let Ok(nm) = NetworkManager::new().await {
+                    let _ = nm.forget(&ssid).await;
+                    stack.set_visible_child_name("networks");
+                }
+            });
+        }
+    ));
+
     header.append(&icon);
     header.append(&title);
+    header.append(&spacer);
+    header.append(&forget_btn);
     container.append(&header);
 
     // Basic info section

nmrs-ui/src/ui/networks.rs

@@ -74,7 +74,7 @@ pub fn networks_view(
                     if let Ok(nm) = NetworkManager::new().await
                         && let Ok(details) = nm.show_details(&net_data).await
                     {
-                        let container = network_page(&details, &stack);
+                        let container = network_page(details, &stack);
 
                         if let Some(old) = stack.child_by_name("details") {
                             stack.remove(&old);