[systemsettings] Remove qt5-qtsysteminfo usage. Fixes JB#56948

Add DeviceInfo::wlanMacAddress().

Change AboutSettings::wlanMacAddress() so that it uses DeviceInfo
instead of QNetworkinfo.

Remove AboutSettings::imei() as it has not been in active use since
introduction of dual sim support and it relies on QDeviceInfo.

Remove qt5-qtsysteminfo build dependencies.

Signed-off-by: Simo Piiroinen <[email protected]>

Author: spiiroin

rpm/nemo-qml-plugin-systemsettings.spec

@@ -16,7 +16,6 @@ Requires:       udisks2 >= 2.8.1+git6
 Requires:       mlite-qt5 >= 0.3.6
 Requires(post): coreutils
 BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5SystemInfo)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
 BuildRequires:  pkgconfig(timed-qt5)

src/aboutsettings.cpp

@@ -35,9 +35,6 @@
 #include <QDebug>
 #include <QStringList>
 
-#include <QNetworkInfo>
-
-#include <QDeviceInfo>
 #include <QFile>
 #include <QByteArray>
 #include <QRegularExpression>
@@ -157,13 +154,14 @@ void parseLocalizationFile(const QString &filename, QMap<QString, QString> *resu
 
 AboutSettingsPrivate::AboutSettingsPrivate(QObject *parent)
     : QObject(parent)
+    , deviceInfo(new DeviceInfo())
 {
-
 }
 
 AboutSettingsPrivate::~AboutSettingsPrivate()
 {
-
+    delete deviceInfo;
+    deviceInfo = nullptr;
 }
 
 
@@ -184,19 +182,11 @@ AboutSettings::~AboutSettings()
 QString AboutSettings::wlanMacAddress() const
 {
     Q_D(const AboutSettings);
-    return d->networkInfo.macAddress(QNetworkInfo::WlanMode, 0);
-}
-
-QString AboutSettings::imei() const
-{
-    Q_D(const AboutSettings);
-    return d->deviceInfo.imei(0);
+    return d->deviceInfo->wlanMacAddress();
 }
 
 QString AboutSettings::serial() const
 {
-    // TODO: eventually we should use QDeviceInfo's uniqueDeviceID()
-
     QStringList serialFiles;
 
     serialFiles

src/aboutsettings.h

@@ -45,7 +45,6 @@ class SYSTEMSETTINGS_EXPORT AboutSettings: public QObject
     Q_OBJECT
 
     Q_PROPERTY(QString wlanMacAddress READ wlanMacAddress CONSTANT)
-    Q_PROPERTY(QString imei READ imei CONSTANT)
     Q_PROPERTY(QString serial READ serial CONSTANT)
     Q_PROPERTY(QString localizedOperatingSystemName READ localizedOperatingSystemName CONSTANT)
     Q_PROPERTY(QString baseOperatingSystemName READ baseOperatingSystemName CONSTANT)
@@ -62,7 +61,6 @@ class SYSTEMSETTINGS_EXPORT AboutSettings: public QObject
     virtual ~AboutSettings();
 
     QString wlanMacAddress() const;
-    QString imei() const;
     QString serial() const;
     QString localizedOperatingSystemName() const;
     QString baseOperatingSystemName() const;

src/aboutsettings_p.h

@@ -33,10 +33,10 @@
 #define ABOUTSETTINGS_P_H
 
 #include <QObject>
-#include <QNetworkInfo>
-#include <QDeviceInfo>
 #include <QVariantList>
 
+#include "deviceinfo.h"
+
 class AboutSettingsPrivate : public QObject
 {
     Q_OBJECT
@@ -45,8 +45,7 @@ class AboutSettingsPrivate : public QObject
     AboutSettingsPrivate(QObject *parent = nullptr);
     virtual ~AboutSettingsPrivate();
 
-    QNetworkInfo networkInfo;
-    QDeviceInfo deviceInfo;
+    DeviceInfo *deviceInfo;
 
     mutable QMap<QString, QString> osRelease;
     mutable QMap<QString, QString> osReleaseLocalization;

src/deviceinfo.cpp

@@ -44,6 +44,7 @@ class DeviceInfoPrivate: public QObject
     DeviceInfoPrivate(DeviceInfo *deviceInfo, bool synchronousInit);
     ~DeviceInfoPrivate();
     QStringList imeiNumbers();
+    QString wlanMacAddress();
 
     QSet<DeviceInfo::Feature> m_features;
     QSet<Qt::Key> m_keys;
@@ -60,10 +61,20 @@ private slots:
     void modemSerialChanged(const QString &serial);
     void updateModemProperties();
 private:
+    enum NetworkMode {
+        /* Subset of QNetworkInfo::NetworkMode enum */
+        WlanMode = 4,
+        EthernetMode = 5,
+    };
+
     void modemAdded(const QString &modem);
     void modemRemoved(const QString &modem);
     QSharedPointer<QOfonoManager> ofonoManager();
     void updateModemPropertiesLater();
+    int networkInterfaceCount(DeviceInfoPrivate::NetworkMode mode);
+    QString macAddress(DeviceInfoPrivate::NetworkMode mode, int interface);
+    const QStringList &networkModeDirectoryList(DeviceInfoPrivate::NetworkMode mode);
+    static QString readSimpleFile(const QString &path);
 
     DeviceInfo *q_ptr;
     bool m_synchronousInit;
@@ -72,6 +83,7 @@ private slots:
     QStringList m_modemList;
     QStringList m_imeiNumbers;
     QTimer *m_updateModemPropertiesTimer;
+    QHash<DeviceInfoPrivate::NetworkMode, QStringList> m_networkModeDirectoryListHash;
     Q_DISABLE_COPY(DeviceInfoPrivate);
     Q_DECLARE_PUBLIC(DeviceInfo);
 };
@@ -205,6 +217,52 @@ void DeviceInfoPrivate::modemSerialChanged(const QString &serial)
     updateModemPropertiesLater();
 }
 
+QString DeviceInfoPrivate::wlanMacAddress()
+{
+    return macAddress(DeviceInfoPrivate::WlanMode, 0);
+}
+
+int DeviceInfoPrivate::networkInterfaceCount(DeviceInfoPrivate::NetworkMode mode)
+{
+    /* Like QNetworkInfo::networkInterfaceCount() */
+    return networkModeDirectoryList(mode).size();
+}
+
+QString DeviceInfoPrivate::macAddress(DeviceInfoPrivate::NetworkMode mode, int interface)
+{
+    /* Like QNetworkInfo::macAddress() */
+    if (interface >= 0 && interface < networkInterfaceCount(mode))
+        return readSimpleFile(QDir(networkModeDirectoryList(mode).at(interface)).filePath("address"));
+    return QString();
+}
+
+const QStringList &DeviceInfoPrivate::networkModeDirectoryList(DeviceInfoPrivate::NetworkMode mode)
+{
+    if (!m_networkModeDirectoryListHash.contains(mode)) {
+        QStringList &modeDirectoryList(m_networkModeDirectoryListHash[mode]);
+        QDir baseDir(QStringLiteral("/sys/class/net"));
+        QStringList stemList;
+        if (mode == DeviceInfoPrivate::WlanMode)
+            stemList << QStringLiteral("wlan");
+        else if (mode == DeviceInfoPrivate::EthernetMode)
+            stemList << QStringLiteral("eth") << QStringLiteral("usb") << QStringLiteral("rndis");
+        for (auto stemIter = stemList.cbegin(); stemIter != stemList.cend(); ++stemIter) {
+            QFileInfoList modeDirList(baseDir.entryInfoList(QStringList() << QStringLiteral("%1*").arg(*stemIter), QDir::Dirs, QDir::Name));
+            for (auto modeDirIter = modeDirList.cbegin(); modeDirIter != modeDirList.cend(); ++modeDirIter)
+                modeDirectoryList.append((*modeDirIter).filePath());
+        }
+    }
+    return m_networkModeDirectoryListHash[mode];
+}
+
+QString DeviceInfoPrivate::readSimpleFile(const QString &path)
+{
+    QFile file(path);
+    if (file.open(QIODevice::ReadOnly))
+        return QString::fromLocal8Bit(file.readAll().simplified().data());
+    return QString();
+}
+
 DeviceInfo::DeviceInfo(bool synchronousInit, QObject *parent)
     : QObject(parent)
     , d_ptr(new DeviceInfoPrivate(this, synchronousInit))
@@ -291,4 +349,10 @@ QStringList DeviceInfo::imeiNumbers()
     return d->imeiNumbers();
 }
 
+QString DeviceInfo::wlanMacAddress()
+{
+    Q_D(DeviceInfo);
+    return d->wlanMacAddress();
+}
+
 #include "deviceinfo.moc"

src/deviceinfo.h

@@ -52,6 +52,7 @@ class SYSTEMSETTINGS_EXPORT DeviceInfo: public QObject
     Q_PROPERTY(QString osVersion READ osVersion CONSTANT)
     Q_PROPERTY(QString adaptationVersion READ adaptationVersion CONSTANT)
     Q_PROPERTY(QStringList imeiNumbers READ imeiNumbers NOTIFY imeiNumbersChanged)
+    Q_PROPERTY(QString wlanMacAddress READ wlanMacAddress CONSTANT)
 
 public:
     enum Feature {
@@ -250,6 +251,14 @@ class SYSTEMSETTINGS_EXPORT DeviceInfo: public QObject
      */
     QStringList imeiNumbers();
 
+    /*!
+     * Get wlan mac address
+     *
+     * Note: Interface availability is cached on the first call, but
+     *       mac address itself is re-read from sysfs on every call.
+     */
+    QString wlanMacAddress();
+
 Q_SIGNALS:
     void imeiNumbersChanged();
 

src/plugin/plugins.qmltypes

@@ -14,7 +14,6 @@ Module {
         exports: ["org.nemomobile.systemsettings/AboutSettings 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "wlanMacAddress"; type: "string"; isReadonly: true }
-        Property { name: "imei"; type: "string"; isReadonly: true }
         Property { name: "serial"; type: "string"; isReadonly: true }
         Property { name: "localizedOperatingSystemName"; type: "string"; isReadonly: true }
         Property { name: "baseOperatingSystemName"; type: "string"; isReadonly: true }
@@ -236,6 +235,11 @@ Module {
         Property { name: "designation"; type: "string"; isReadonly: true }
         Property { name: "manufacturer"; type: "string"; isReadonly: true }
         Property { name: "prettyName"; type: "string"; isReadonly: true }
+        Property { name: "osName"; type: "string"; isReadonly: true }
+        Property { name: "osVersion"; type: "string"; isReadonly: true }
+        Property { name: "adaptationVersion"; type: "string"; isReadonly: true }
+        Property { name: "imeiNumbers"; type: "QStringList"; isReadonly: true }
+        Property { name: "wlanMacAddress"; type: "string"; isReadonly: true }
         Method {
             name: "hasFeature"
             type: "bool"

src/src.pro

@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = systemsettings
 
 CONFIG += qt create_pc create_prl no_install_prl c++11
-QT += qml dbus systeminfo xmlpatterns
+QT += qml dbus xmlpatterns
 QT -= gui
 
 CONFIG += c++11 hide_symbols link_pkgconfig

tests/tests.pro

@@ -2,7 +2,7 @@
 
 PACKAGENAME = nemo-qml-plugin-systemsettings
 
-QT += testlib qml dbus systeminfo
+QT += testlib qml dbus
 QT -= gui
 
 TEMPLATE = app