ETM-Schurig/powersync-libnm
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it work with older NetworkManager versions

Browse Source
This commit is contained in:
Michael Zanetti 2022-10-25 23:06:49 +02:00
parent e1f01118ed
commit 14cb9d9e97
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libnymea-networkmanager/wirelessnetworkdevice.cpp
View File

@ -82,7 +82,10 @@ WirelessNetworkDevice::WirelessNetworkDevice(const QDBusObjectPath &objectPath,
QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "AccessPointAdded", this, SLOT(accessPointAdded(QDBusObjectPath))); QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "AccessPointAdded", this, SLOT(accessPointAdded(QDBusObjectPath)));
QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "AccessPointRemoved", this, SLOT(accessPointRemoved(QDBusObjectPath))); QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "AccessPointRemoved", this, SLOT(accessPointRemoved(QDBusObjectPath)));
// org.freedesktop.NetworkManager.Device.Wireless.PropertiesChanged(QVariantMap) is used in older versions of NetworkManager instead of the standard D-Bus properties changed signal
QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "PropertiesChanged", this, SLOT(propertiesChanged(QVariantMap))); QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), NetworkManagerUtils::wirelessInterfaceString(), "PropertiesChanged", this, SLOT(propertiesChanged(QVariantMap)));
// Newer versions of NetworkManager dropped the other and switched to the D-Bus standard PropertiesChanged
QDBusConnection::systemBus().connect(NetworkManagerUtils::networkManagerServiceString(), this->objectPath().path(), "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(propertiesChanged(QString, QVariantMap, QStringList)));
readAccessPoints(); readAccessPoints();
@ -219,36 +222,40 @@ void WirelessNetworkDevice::accessPointRemoved(const QDBusObjectPath &objectPath
accessPoint->deleteLater(); accessPoint->deleteLater();
} }
void WirelessNetworkDevice::propertiesChanged(const QString &interface_name, const QVariantMap &changed_properties, const QStringList &invalidated_properties) void WirelessNetworkDevice::propertiesChanged(const QVariantMap &properties)
{ {
Q_UNUSED(interface_name)
Q_UNUSED(invalidated_properties)
//qCDebug(dcNetworkManager()) << "WirelessNetworkDevice: Property changed" << properties; //qCDebug(dcNetworkManager()) << "WirelessNetworkDevice: Property changed" << properties;
if (changed_properties.contains("Bitrate")) { if (properties.contains("Bitrate")) {
m_bitRate = changed_properties.value("Bitrate").toInt() / 1000; m_bitRate = properties.value("Bitrate").toInt() / 1000;
emit bitRateChanged(m_bitRate); emit bitRateChanged(m_bitRate);
} }
if (changed_properties.contains("Mode")) { if (properties.contains("Mode")) {
m_wirelessMode = static_cast<WirelessMode>(m_wirelessInterface->property("Mode").toUInt()); m_wirelessMode = static_cast<WirelessMode>(m_wirelessInterface->property("Mode").toUInt());
emit wirelessModeChanged(m_wirelessMode); emit wirelessModeChanged(m_wirelessMode);
} }
// Note: available since 1.12 (-1 means never scanned) // Note: available since 1.12 (-1 means never scanned)
if (changed_properties.contains("LastScan")) { if (properties.contains("LastScan")) {
m_lastScan = m_wirelessInterface->property("LastScan").toInt(); m_lastScan = m_wirelessInterface->property("LastScan").toInt();
emit lastScanChanged(m_lastScan); emit lastScanChanged(m_lastScan);
} }
if (changed_properties.contains("ActiveAccessPoint")) { if (properties.contains("ActiveAccessPoint")) {
setActiveAccessPoint(qdbus_cast<QDBusObjectPath>(changed_properties.value("ActiveAccessPoint"))); setActiveAccessPoint(qdbus_cast<QDBusObjectPath>(properties.value("ActiveAccessPoint")));
} }
emit deviceChanged(); emit deviceChanged();
} }
void WirelessNetworkDevice::propertiesChanged(const QString &interface_name, const QVariantMap &changed_properties, const QStringList &invalidated_properties)
{
Q_UNUSED(interface_name)
Q_UNUSED(invalidated_properties)
propertiesChanged(changed_properties);
}
/*! Writes the given \a device to the given to \a debug. \sa WirelessNetworkDevice, */ /*! Writes the given \a device to the given to \a debug. \sa WirelessNetworkDevice, */
QDebug operator<<(QDebug debug, WirelessNetworkDevice *device) QDebug operator<<(QDebug debug, WirelessNetworkDevice *device)
{ {

1
libnymea-networkmanager/wirelessnetworkdevice.h
View File

@ -78,6 +78,7 @@ signals:
private slots: private slots:
void accessPointAdded(const QDBusObjectPath &objectPath); void accessPointAdded(const QDBusObjectPath &objectPath);
void accessPointRemoved(const QDBusObjectPath &objectPath); void accessPointRemoved(const QDBusObjectPath &objectPath);
void propertiesChanged(const QVariantMap &properties);
void propertiesChanged(const QString &interface_name, const QVariantMap &changed_properties, const QStringList &invalidated_properties); void propertiesChanged(const QString &interface_name, const QVariantMap &changed_properties, const QStringList &invalidated_properties);
private: private: