fix: scanning is bindable on backend

Author: cpwrs

src/network/nm/backend.cpp

@@ -149,10 +149,7 @@ void NetworkManager::registerWifiDevice(const QString& path) {
 	device->bindableState().setBinding([wireless]() {
 		return qs::network::NetworkManager::toNetworkDeviceState(wireless->state());
 	});
-	device->bindableScanning().setBinding([wireless]() {
-		(void)wireless->lastScan();
-		return false;
-	});
+	device->bindableScanning().setBinding([wireless]() { return wireless->scanning(); });
 	// clang-format off
 	QObject::connect(wireless, &NMWirelessDevice::addAndActivateConnection, this, &NetworkManager::addAndActivateConnection);
 	QObject::connect(wireless, &NMWirelessDevice::activateConnection, this, &NetworkManager::activateConnection);

src/network/nm/wireless.cpp

@@ -193,6 +193,7 @@ 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::lastScanChanged, this, [this]() { this->bScanning = false; });
 	// clang-format on
 	this->registerAccessPoints();
 }
@@ -344,7 +345,11 @@ void NMWirelessDevice::onActiveConnectionLoaded(NMActiveConnection* active) {
 	}
 }
 
-void NMWirelessDevice::scan() { this->wirelessProxy->RequestScan({}); }
+void NMWirelessDevice::scan() { 
+	this->wirelessProxy->RequestScan({}); 
+	this->bScanning = true;
+}
+
 bool NMWirelessDevice::isWirelessValid() const {
 	return this->wirelessProxy && this->wirelessProxy->isValid();
 }

src/network/nm/wireless.hpp

@@ -95,12 +95,14 @@ class NMWirelessDevice: public NMDevice {
 	[[nodiscard]] qint64 lastScan() { return this->bLastScan; };
 	[[nodiscard]] NMWirelessCapabilities::Enum capabilities() { return this->bCapabilities; };
 	[[nodiscard]] const QDBusObjectPath& activeApPath() { return this->bActiveAccessPoint; };
+	[[nodiscard]] bool scanning() { return this->bScanning; };
 
 public slots:
 	void scan();
 
 signals:
 	void lastScanChanged(qint64 lastScan);
+	void scanningChanged(bool scanning);
 	void capabilitiesChanged(NMWirelessCapabilities::Enum caps);
 	void activeAccessPointChanged(const QDBusObjectPath& path);
 	void accessPointLoaded(NMAccessPoint* ap);
@@ -132,6 +134,7 @@ private slots:
 
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, qint64, bLastScan, &NMWirelessDevice::lastScanChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, bool, bScanning, &NMWirelessDevice::scanningChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, NMWirelessCapabilities::Enum, bCapabilities, &NMWirelessDevice::capabilitiesChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessDevice, QDBusObjectPath, bActiveAccessPoint, &NMWirelessDevice::activeAccessPointChanged);
 

src/network/wifi.cpp

@@ -20,9 +20,7 @@ void WifiDevice::scan() {
 		qCCritical(logWifiDevice) << this << "is already scanning";
 		return;
 	}
-
 	qCDebug(logWifiDevice) << "Requesting scan on" << this;
-	this->bScanning = true;
 	this->requestScan();
 }