From 8fd0e25844ae4d8ade4c56c0e5be3c84966c5bc6 Mon Sep 17 00:00:00 2001 From: Carson Powers Date: Fri, 2 Oct 2026 11:54:31 -0500 Subject: [PATCH] networking: prefer AP security --- changelog/next.md | 1 + src/network/nm/network.cpp | 6 +++--- src/network/nm/utils.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/changelog/next.md b/changelog/next.md index 850d4524e..589d7c327 100644 --- a/changelog/next.md +++ b/changelog/next.md @@ -14,3 +14,4 @@ - Fixed PipeWire route volume writes for devices without a reported volume step. - Fixed a crash when quitting or reloading while a `Loader` was still loading asynchronously. - Fixed future `Socket` connection attempts after a failed connection attempt. +- Fixed Open wifi networks showing as Unknown security. diff --git a/src/network/nm/network.cpp b/src/network/nm/network.cpp index a3e0ef974..30c60cda4 100644 --- a/src/network/nm/network.cpp +++ b/src/network/nm/network.cpp @@ -186,10 +186,10 @@ NMWirelessNetwork::NMWirelessNetwork(const QString& ssid, NetworkDevice* device, , bSecurity(WifiSecurityType::Unknown) { auto updateSecurity = [this]() { - if (NMSettings* settings = this->bReferenceSettings) { - this->bSecurity.setBinding([settings]() { return securityFromSettingsMap(settings->map()); }); - } else if (NMAccessPoint* ap = this->bReferenceAp) { + if (NMAccessPoint* ap = this->bReferenceAp) { this->bSecurity.setBinding([ap]() { return ap->security(); }); + } else if (NMSettings* settings = this->bReferenceSettings) { + this->bSecurity.setBinding([settings]() { return securityFromSettingsMap(settings->map()); }); } else { this->bSecurity = WifiSecurityType::Unknown; } diff --git a/src/network/nm/utils.cpp b/src/network/nm/utils.cpp index 14b37b08d..8e21ca92a 100644 --- a/src/network/nm/utils.cpp +++ b/src/network/nm/utils.cpp @@ -20,7 +20,7 @@ namespace qs::network { WifiSecurityType::Enum securityFromSettingsMap(const NMSettingsMap& settings) { const QString mapName = "802-11-wireless-security"; - if (!settings.contains(mapName)) return WifiSecurityType::Unknown; + if (!settings.contains(mapName)) return WifiSecurityType::Open; const QVariantMap& security = settings.value(mapName); if (security.isEmpty()) return WifiSecurityType::Open;