fix: show signal of active AP

Author: cpwrs

src/network/nm/accesspoint.hpp

@@ -59,6 +59,8 @@ class NMAccessPoint: public QObject {
 	[[nodiscard]] NM80211ApSecurityFlags::Enum rsnFlags() const { return this->bRsnFlags; };
 	[[nodiscard]] NM80211Mode::Enum mode() const { return this->bMode; };
 	[[nodiscard]] NMWirelessSecurityType::Enum security() const { return this->bSecurity; };
+	[[nodiscard]] bool active() const { return this->mActive; };
+	void setActive(bool active) { this->mActive = active; };
 
 signals:
 	void ssidChanged(const QByteArray& ssid);
@@ -73,6 +75,8 @@ class NMAccessPoint: public QObject {
 
 private:
 	NMWirelessCapabilities::Enum mCaps;
+	bool mActive = false;
+
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPoint, QByteArray, bSsid, &NMAccessPoint::ssidChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMAccessPoint, quint8, bSignalStrength, &NMAccessPoint::signalStrengthChanged);

src/network/nm/device.cpp

@@ -61,8 +61,7 @@ void NMDevice::onActiveConnectionPathChanged(const QDBusObjectPath& path) {
 	if (stringPath != "/") {
 		auto* active = new NMActiveConnection(stringPath, this);
 		this->mActiveConnection = active;
-		qCDebug(logNetworkManager) << "Registered active connection" << stringPath;
-				QObject::connect(
+		QObject::connect(
 		    active,
 		    &NMActiveConnection::ready,
 		    this,

src/network/nm/wireless.cpp

@@ -85,6 +85,11 @@ void NMWirelessNetwork::updateSignalStrength() {
 	NMAccessPoint* selectedAp = nullptr;
 
 	for (auto* ap: this->mAccessPoints.values()) {
+		if (ap->active()) {
+			selectedStrength = ap->signalStrength();
+			selectedAp = ap;
+			break;
+		}
 		if (selectedStrength <= ap->signalStrength()) {
 			selectedStrength = ap->signalStrength();
 			selectedAp = ap;
@@ -212,10 +217,22 @@ void NMWirelessDevice::initWireless() {
 	QObject::connect(this, &NMWirelessDevice::accessPointLoaded, this, &NMWirelessDevice::onAccessPointLoaded);
 	QObject::connect(this, &NMWirelessDevice::connectionLoaded, this, &NMWirelessDevice::onConnectionLoaded);
 	QObject::connect(this, &NMWirelessDevice::activeConnectionLoaded, this, &NMWirelessDevice::onActiveConnectionLoaded);
+	QObject::connect(this, &NMWirelessDevice::activeAccessPointChanged, this, &NMWirelessDevice::onActiveAccessPointChanged);
 	// clang-format on
 	this->registerAccessPoints();
 }
 
+void NMWirelessDevice::onActiveAccessPointChanged(const QDBusObjectPath& path) {
+	// Make previous AP inactive
+	auto* prevAp = this->mAccessPoints.value(this->mActiveApPath);
+	if (prevAp) prevAp->setActive(false);
+
+	// Make current AP active
+	this->mActiveApPath = path.path();
+	auto* curAp = this->mAccessPoints.value(path.path());
+	if (curAp) curAp->setActive(true);
+}
+
 void NMWirelessDevice::onAccessPointPathAdded(const QDBusObjectPath& path) {
 	this->registerAccessPoint(path.path());
 }
@@ -262,6 +279,7 @@ void NMWirelessDevice::registerAccessPoint(const QString& path) {
 	}
 
 	auto* ap = new NMAccessPoint(path, this->capabilities(), this);
+	if (ap->path() == this->mActiveApPath) ap->setActive(true);
 
 	if (!ap->isValid()) {
 		qCWarning(logNetworkManager) << "Ignoring invalid registration of" << path;

src/network/nm/wireless.hpp

@@ -102,6 +102,7 @@ public slots:
 signals:
 	void lastScanChanged(qint64 lastScan);
 	void capabilitiesChanged(NMWirelessCapabilities::Enum caps);
+	void activeAccessPointChanged(const QDBusObjectPath& path);
 	void accessPointLoaded(NMAccessPoint* ap);
 	void accessPointRemoved(NMAccessPoint* ap);
 	void wifiNetworkAdded(WifiNetwork* net);
@@ -116,6 +117,7 @@ public slots:
 private slots:
 	void onAccessPointPathAdded(const QDBusObjectPath& path);
 	void onAccessPointPathRemoved(const QDBusObjectPath& path);
+	void onActiveAccessPointChanged(const QDBusObjectPath& path);
 	void onAccessPointLoaded(NMAccessPoint* ap);
 	void onConnectionLoaded(NMConnectionSettings* conn);
 	void onActiveConnectionLoaded(NMActiveConnection* active);
@@ -126,16 +128,19 @@ private slots:
 	void initWireless();
 	NMWirelessNetwork* registerNetwork(const QString& ssid);
 
+	QString mActiveApPath;
 	QHash<QString, NMAccessPoint*> mAccessPoints;
 	QHash<QString, NMWirelessNetwork*> mBackendNetworks;
 
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, qint64, bLastScan, &NMWirelessDevice::lastScanChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, NMWirelessCapabilities::Enum, bCapabilities, &NMWirelessDevice::capabilitiesChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, QDBusObjectPath, bActiveAccessPoint, &NMWirelessDevice::activeAccessPointChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMWireless, wirelessProperties);
 	QS_DBUS_PROPERTY_BINDING(NMWirelessDevice, pLastScan, bLastScan, wirelessProperties, "LastScan");
 	QS_DBUS_PROPERTY_BINDING(NMWirelessDevice, pCapabilities, bCapabilities, wirelessProperties, "WirelessCapabilities");
+	QS_DBUS_PROPERTY_BINDING(NMWirelessDevice, pActiveAccessPoint, bActiveAccessPoint, wirelessProperties, "ActiveAccessPoint");
 	// clang-format on
 
 	DBusNMWirelessProxy* wirelessProxy = nullptr;

src/network/test/network.qml

@@ -136,19 +136,21 @@ FloatingWindow {
 							}
 							Text { 
 								text: NMWirelessSecurityType.toString(modelData.nmSecurity)
-								Layout.preferredWidth: 80
+								Layout.preferredWidth: 100
 								horizontalAlignment: Text.AlignRight
 								elide: Text.ElideLeft
 							}
 							Text { 
-								text: modelData.known ? "KNOWN" : ""
-								Layout.preferredWidth: 50
+								text: modelData.known ? "Known" : ""
 								horizontalAlignment: Text.AlignLeft
 								elide: Text.ElideRight
 							}
 							Text {
 								text: modelData.signalStrength + "%"	
-								Layout.preferredWidth: 25
+								horizontalAlignment: Text.AlignLeft
+							}
+							Text {
+								text: NetworkConnectionState.toString(modelData.state)
 								horizontalAlignment: Text.AlignLeft
 							}
 						}

src/network/wifi.cpp

@@ -118,7 +118,6 @@ void Wifi::onEnabledSet(bool enabled) {
 void Wifi::setDefaultDevice(WifiDevice* dev) {
 	if (this->mDefaultDevice == dev) return;
 	this->mDefaultDevice = dev;
-	qCDebug(logWifi) << "Default device set to" << dev->name();
 	emit this->defaultDeviceChanged();
 }