WifiPage: show SSID in sidebar when connected (#403)

elementary · Jun 21, 2024 · 0269d2e · 0269d2e
1 parent cd94f06
commit 0269d2e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/data/network.metainfo.xml.in b/data/network.metainfo.xml.in
@@ -33,6 +33,7 @@
         <p>Minor updates</p>
         <ul>
           <li>Provide description text on the VPN page</li>
+          <li>Show connected Wi-Fi network name in sidebar</li>
           <li>Updated translations</li>
         </ul>
       </description>

diff --git a/src/Views/WifiPage.vala b/src/Views/WifiPage.vala
@@ -427,6 +427,37 @@ public class Network.WifiInterface : Network.Widgets.Page {
         }
     }
 
+    protected override void update_status () {
+        switch (device.state) {
+            case ACTIVATED:
+                status_type = SUCCESS;
+                break;
+            case DISCONNECTED:
+                status_type = OFFLINE;
+                break;
+            case FAILED:
+                status_type = ERROR;
+                break;
+            default:
+                status_type = WARNING;
+                break;
+        }
+
+        switch (device.state) {
+            case UNAVAILABLE:
+                status = _("Disabled");
+                break;
+            case ACTIVATED:
+                status = NM.Utils.ssid_to_utf8 (
+                    ((NM.DeviceWifi) device).active_access_point.get_ssid ().get_data ()
+                );
+                break;
+            default:
+                status = Utils.state_to_string (device.state);
+                break;
+        }
+    }
+
     protected override void update_switch () {
         status_switch.active = !software_locked;
     }

diff --git a/src/Widgets/Page.vala b/src/Widgets/Page.vala
@@ -59,7 +59,7 @@ namespace Network.Widgets {
             show_end_title_buttons = true;
         }
 
-        private void update_status () {
+        public virtual void update_status () {
             switch (device.state) {
                 case ACTIVATED:
                     status_type = SUCCESS;
@@ -75,11 +75,7 @@ namespace Network.Widgets {
                     break;
             }
 
-            if (device is NM.DeviceWifi && state == UNAVAILABLE) {
-                status = _("Disabled");
-            } else {
-                status = Utils.state_to_string (device.state);
-            }
+            status = Utils.state_to_string (device.state);
         }
 
         public virtual void update () {