Merge lp:~jonas-drange/ubuntu-system-settings/about-bad-mac-fix-1399723 into lp:ubuntu-system-settings

[Jonas G. Drange]

[about] use networkinfo to pull the wifi device MAC

[about] use networkinfo to pull the wifi device MAC

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1224
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1848/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/118
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/513
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/513/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16497

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1848/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1224
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1866/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/136
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/643
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/643/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16797

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1866/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good to me, tested on vivid-proposed 58 (mako).

review: Approve

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-11-19 11:24:23 +0000
+++ plugins/about/PageComponent.qml	2014-12-11 14:05:07 +0000
@@ -62,6 +62,10 @@
         id: network
     }
 
+    NetworkInfo {
+        id: wlinfo
+    }
+
     Flickable {
         id: scrollWidget
         anchors.fill: parent
@@ -138,9 +142,10 @@
             }
 
             ListItem.SingleValue {
+                property string address: wlinfo.macAddress(NetworkInfo.WlanMode, 0)
                 text: i18n.tr("Wi-Fi address")
-                value: network.networkMacAddresses[0]
-                visible: network.networkMacAddresses.length > 0
+                value: address ? address.toUpperCase() : ""
+                visible: address
                 showDivider: bthwaddr.visible
             }
 

=== modified file 'plugins/about/networkabout.cpp'
--- plugins/about/networkabout.cpp	2014-08-28 10:33:41 +0000
+++ plugins/about/networkabout.cpp	2014-12-11 14:05:07 +0000
@@ -28,27 +28,9 @@
     m_systemBusConnection(QDBusConnection::systemBus())
 {
 
-    setupNetworkMacAddresses();
     setupBluetoothMacAddress();
 }
 
-void NetworkAbout::setupNetworkMacAddresses()
-{
-    QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
-    int count = ifaces.count();
-
-    QString str = QString();
-    for(int i=0;i<count;i++)
-    {
-        QNetworkInterface iface = ifaces.at(i);
-        str = iface.hardwareAddress();
-        // add interfaces that are not loopback
-        if (!iface.flags().testFlag(QNetworkInterface::IsLoopBack)) {
-            m_networkMacAddresses << str;
-        }
-    }
-}
-
 void NetworkAbout::setupBluetoothMacAddress()
 {
     QDBusInterface bluezManagerInterface (
@@ -84,11 +66,6 @@
     m_bluetoothMacAddress = props.value()["Address"].toString();
 }
 
-QStringList NetworkAbout::networkMacAddresses()
-{
-    return m_networkMacAddresses;
-}
-
 QString NetworkAbout::bluetoothMacAddress()
 {
     return m_bluetoothMacAddress;

=== modified file 'plugins/about/networkabout.h'
--- plugins/about/networkabout.h	2014-08-28 10:33:41 +0000
+++ plugins/about/networkabout.h	2014-12-11 14:05:07 +0000
@@ -23,33 +23,25 @@
 
 #include <QObject>
 #include <QStringList>
-#include <QtNetwork>
 #include <QtDBus/QDBusInterface>
 
 
 class NetworkAbout : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY( QStringList networkMacAddresses
-                READ networkMacAddresses
-                NOTIFY networkMacAddressesChanged )
     Q_PROPERTY( QString bluetoothMacAddress
                 READ bluetoothMacAddress
                 NOTIFY bluetoothMacAddressChanged )
 
 public:
     explicit NetworkAbout (QObject *parent = 0);
-    QStringList networkMacAddresses();
     QString bluetoothMacAddress();
 
 Q_SIGNALS:
-    void networkMacAddressesChanged(QStringList addresses);
     void bluetoothMacAddressChanged(QString addresses);
 
 private:
-    QStringList m_networkMacAddresses;
     QString m_bluetoothMacAddress;
-    void setupNetworkMacAddresses();
     void setupBluetoothMacAddress();
     QDBusConnection m_systemBusConnection;
 };