refactor: active AP is handled by NMWirelessNetwork

Author: cpwrs

src/network/nm/accesspoint.hpp

@@ -59,8 +59,6 @@ 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);

src/network/nm/backend.cpp

@@ -27,6 +27,8 @@ const QString NM_SERVICE = "org.freedesktop.NetworkManager";
 const QString NM_PATH = "/org/freedesktop/NetworkManager";
 
 NetworkManager::NetworkManager(QObject* parent): NetworkBackend(parent) {
+	qDBusRegisterMetaType<ConnectionSettingsMap>();
+
 	auto bus = QDBusConnection::systemBus();
 	if (!bus.isConnected()) {
 		qCWarning(logNetworkManager

src/network/nm/wireless.cpp

@@ -62,6 +62,11 @@ void NMWirelessNetwork::updateReferenceConnection() {
 	}
 }
 
+void NMWirelessNetwork::setActiveApPath(const QDBusObjectPath& path) {
+	if (this->mActiveApPath == path) return;
+	this->mActiveApPath = path;
+}
+
 void NMWirelessNetwork::setState(NMConnectionState::Enum state) {
 	if (this->mState == state) return;
 	this->mState = state;
@@ -85,15 +90,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;
 		}
+		if (ap->path() == this->mActiveApPath.path()) break;
 	}
 
 	if (selectedStrength != this->mSignalStrength) {
@@ -217,22 +218,10 @@ 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());
 }
@@ -279,7 +268,6 @@ 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;
@@ -298,9 +286,13 @@ void NMWirelessDevice::registerAccessPoint(const QString& path) {
 }
 
 NMWirelessNetwork* NMWirelessDevice::registerNetwork(const QString& ssid) {
-	auto* frontend = new WifiNetwork(ssid, this);
 	auto* backend = new NMWirelessNetwork(ssid, this);
+	// clang-format off
+	backend->setActiveApPath(this->activeApPath());
+	QObject::connect(this, &NMWirelessDevice::activeAccessPointChanged, backend, &NMWirelessNetwork::setActiveApPath);
+	// clang-format on
 
+	auto* frontend = new WifiNetwork(ssid, this);
 	// clang-format off
 	frontend->setSignalStrength(backend->signalStrength());
 	frontend->setState(static_cast<NetworkConnectionState::Enum>(backend->state()));

src/network/nm/wireless.hpp

@@ -56,10 +56,11 @@ class NMWirelessNetwork: public QObject {
 	[[nodiscard]] QList<NMConnectionSettings*> connections() const { return this->mConnections.values(); };
 
 public slots:
+	void setActiveApPath(const QDBusObjectPath& path);
 	void setState(NMConnectionState::Enum state);
 	void setReason(NMConnectionStateReason::Enum reason);
 	void setKnown(bool known);
-
+	
 signals:
 	void signalStrengthChanged(quint8 signal);
 	void stateChanged(NMConnectionState::Enum state);
@@ -73,6 +74,7 @@ public slots:
 	QHash<QString, NMAccessPoint*> mAccessPoints;
 	QHash<QString, NMConnectionSettings*> mConnections;
 	NMActiveConnection* mActiveConnection = nullptr;
+	QDBusObjectPath mActiveApPath;
 	NMAccessPoint* mReferenceAp = nullptr;
 	NMConnectionSettings* mReferenceConn = nullptr;
 	NMConnectionState::Enum mState = NMConnectionState::Deactivated;
@@ -95,6 +97,7 @@ class NMWirelessDevice: public NMDevice {
 	[[nodiscard]] bool isWirelessValid() const;
 	[[nodiscard]] qint64 getLastScan() { return this->bLastScan; };
 	[[nodiscard]] NMWirelessCapabilities::Enum capabilities() { return this->bCapabilities; };
+	[[nodiscard]] const QDBusObjectPath& activeApPath() { return this->bActiveAccessPoint; };
 
 public slots:
 	void scan();
@@ -117,7 +120,6 @@ 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);
@@ -128,7 +130,6 @@ private slots:
 	void initWireless();
 	NMWirelessNetwork* registerNetwork(const QString& ssid);
 
-	QString mActiveApPath;
 	QHash<QString, NMAccessPoint*> mAccessPoints;
 	QHash<QString, NMWirelessNetwork*> mBackendNetworks;