Merge lp:~jonas-drange/ubuntu-system-settings/rtm-techswitch into lp:ubuntu-system-settings/rtm-14.09

[Jonas G. Drange]

[cellular] using libqofono-0.7 and including functionality for enabling users to change what modem has 3G

(included https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/libqofono-0.70-ready/+merge/246371 )

[cellular] using libqofono-0.7 and including functionality for enabling users to change what modem has 3G

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/57/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/58/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/37/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/36
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17821

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/rtm-techswitch]

986. By Jonas G. Drange on 2015-02-09

fix dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:986
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/37/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/59/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/37
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17874

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/rtm-techswitch]

987. By Jonas G. Drange on 2015-02-09

need u-s-s module for title

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/59/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/60/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/38
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17882

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks, looks good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-01-30 18:36:21 +0000
+++ debian/control	2015-02-09 14:18:57 +0000
@@ -68,7 +68,7 @@
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
          qml-module-ubuntu-connectivity,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
-         qtdeclarative5-ofono0.2 (>=0.53),
+         qtdeclarative5-ofono0.2 (>=0.70~),
          qtdeclarative5-systeminfo-plugin,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-settings-components (>> 0.2),
 
=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-01-16 15:27:56 +0000
+++ plugins/about/PageComponent.qml	2015-02-09 14:18:57 +0000
@@ -33,7 +33,7 @@
 
     title: i18n.tr("About this phone")
     flickable: scrollWidget
-    property var modemsSorted: manager.modems.slice(0).sort()
+    property var modemsSorted: []
 
     UbuntuStorageAboutPanel {
         id: backendInfos
@@ -49,11 +49,16 @@
 
     OfonoManager {
         id: manager
-        Component.onCompleted: {
-            if (manager.modems.length === 1) {
-                phoneNumbers.setSource("PhoneNumber.qml", {path: manager.modems[0]})
-            } else if (manager.modems.length > 1) {
-                phoneNumbers.setSource("PhoneNumbers.qml", {paths: modemsSorted})
+        onModemsChanged: {
+            root.modemsSorted = modems.slice(0).sort();
+            if (modems.length === 1) {
+                phoneNumbers.setSource("PhoneNumber.qml", {
+                    path: manager.modems[0]
+                });
+            } else if (modems.length > 1) {
+                phoneNumbers.setSource("PhoneNumbers.qml", {
+                    paths: root.modemsSorted
+                });
             }
         }
     }
 
=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2014-12-16 16:22:29 +0000
+++ plugins/cellular/CMakeLists.txt	2015-02-09 14:18:57 +0000
@@ -24,6 +24,8 @@
   hotspotmanager.h
   ofonoactivator.cpp
   ofonoactivator.h
+  connectivity.cpp
+  connectivity.h
   nm_manager_proxy.h
   nm_settings_proxy.h
   nm_settings_connection_proxy.h
 
=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
--- plugins/cellular/Components/DataMultiSim.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2015-02-09 14:18:57 +0000
@@ -23,6 +23,8 @@
 
 Column {
 
+    property string prevOnlineModem: parent.prevOnlineModem
+
     function getNameFromIndex (index) {
         if (index === 0) {
             return i18n.tr("Off");
@@ -50,8 +52,14 @@
             objectName: "use" + modelData
             text: getNameFromIndex(index)
         }
-        selectedIndex: [true, sims[0].connMan.powered, sims[1].connMan.powered]
-            .lastIndexOf(true)
+        selectedIndex: {
+            if (prevOnlineModem) {
+                return model.indexOf(prevOnlineModem);
+            } else {
+                return [true, sims[0].connMan.powered, sims[1].connMan.powered]
+                    .lastIndexOf(true);
+            }
+        }
 
         onDelegateClicked: {
             // power all sims on or off
 
=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-12-16 16:22:29 +0000
+++ plugins/cellular/Components/MultiSim.qml	2015-02-09 14:18:57 +0000
@@ -19,6 +19,7 @@
 */
 import QtQuick 2.0
 import GSettings 1.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -36,14 +37,17 @@
         return s;
     }
     property var modems
-    // make settings available to all children of root
     property var settings: phoneSettings
+    property string prevOnlineModem: ""
+
+    /*  @sim a Sim.qml component containing libqofono bindings
+        @prevOnlineModem path to modem that was online before modem reset */
+    signal umtsModemChanged (var sim, string prevOnlineModem);
 
     DataMultiSim {
         anchors { left: parent.left; right: parent.right }
     }
 
-
     ListItem.SingleValue {
         text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
         visible: showAllUI && !hotspotItem.visible
@@ -95,13 +99,7 @@
 
     ListItem.Divider {}
 
-    function techToString (tech) {
-        return {
-            'gsm': i18n.tr("2G only (saves battery)"),
-            'umts': i18n.tr("2G/3G (faster)"),
-            'lte': i18n.tr("2G/3G/4G (faster)")
-        }[tech]
-    }
+    SettingsItemTitle { text: i18n.tr("Connection type:") }
 
     Repeater {
         model: sims
@@ -109,27 +107,54 @@
         ListItem.ItemSelector {
             id: radio
             property var sim: modelData
-            property var rSettings: sim.radioSettings
-            property string techPref: rSettings.technologyPreference
-            property var modemTechs: rSettings.modemTechnologies
+
             expanded: true
-            text: i18n.tr("Connection type:")
-            model: modemTechs || []
+            text: sim.title
+            model: sim.radioSettings.modemTechnologies
             delegate: OptionSelectorDelegate {
                 objectName: sim.path + "_radio_" + modelData
-                text: techToString(modelData)
-            }
-            enabled: techPref !== ""
-            visible: sim.connMan.powered
-            selectedIndex: techPref !== "" ? model.indexOf(techPref) : -1
-            onDelegateClicked: rSettings.technologyPreference = model[index];
+                text: sim.techToString(modelData)
+            }
+            enabled: sim.radioSettings.technologyPreference !== ""
+            selectedIndex: sim.radioSettings.technologyPreference !== "" ?
+                model.indexOf(sim.radioSettings.technologyPreference) : -1
+
+            onDelegateClicked: {
+                if (model[index] === 'umts_enable') {
+                    sim.radioSettings.technologyPreference = 'umts';
+                    umtsModemChanged(sim, poweredSim ? poweredSim.path : "");
+                    sim.mtkSettings.has3G = true;
+                } else {
+                    sim.radioSettings.technologyPreference = model[index];
+                }
+            }
+
             Connections {
-                target: rSettings
-                onTechnologyPreferenceChanged: {
-                    radio.selectedIndex = modemTechs.indexOf(preference)
+                target: sim.radioSettings
+                onTechnologyPreferenceChanged: radio.selectedIndex =
+                    sim.radioSettings.modemTechnologies.indexOf(preference)
+
+                onModemTechnologiesChanged: {
+                    if ((technologies.indexOf('umts') === -1)
+                         && (sim.mtkSettings.has3G === false)) {
+                        radio.model = sim.addUmtsEnableToModel(technologies);
+                    } else {
+                        radio.model = technologies;
+                    }
+                    radio.selectedIndex = sim.radioSettings.technologyPreference !== "" ?
+                        model.indexOf(sim.radioSettings.technologyPreference) : -1
                 }
                 ignoreUnknownSignals: true
             }
+
+            Component.onCompleted: {
+                if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
+                     && (sim.mtkSettings.has3G === false)) {
+                    radio.model = sim.addUmtsEnableToModel(sim.radioSettings.modemTechnologies);
+                } else {
+                    radio.model = sim.radioSettings.modemTechnologies;
+                }
+            }
         }
     }
 
 
=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	2014-12-16 16:22:29 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2015-02-09 14:18:57 +0000
@@ -22,36 +22,66 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
+    id: radioSingleSim
     height: childrenRect.height
 
     property bool enabled: sim.radioSettings.technologyPreference !== ""
 
     ListItem.ItemSelector {
         id: selector
-        text: i18n.tr("Connection type:")
         showDivider: false
         expanded: true
 
         // an empty string is not a valid preference, which means
         // we disregard the interace and disable the selector
         enabled: parent.enabled
-        model: sim.radioSettings.modemTechnologies || []
-
+        model: sim.radioSettings.modemTechnologies
         delegate: OptionSelectorDelegate {
             objectName: sim.path + "_radio_" + modelData
-            text: {
-                return {
-                    'gsm': i18n.tr("2G only (saves battery)"),
-                    'umts': i18n.tr("2G/3G (faster)"),
-                    'lte': i18n.tr("2G/3G/4G (faster)")
-                }[modelData]
-            }
+            text: sim.techToString(modelData)
             showDivider: false
         }
-        selectedIndex: model.length ?
-            model.indexOf(sim.radioSettings.technologyPreference) : -1
+        selectedIndex:
+            sim.radioSettings.technologyPreference !== "" ?
+                    model.indexOf(sim.radioSettings.technologyPreference) : -1
+
         onDelegateClicked: {
-            sim.radioSettings.technologyPreference = model[index];
+            if (model[index] === 'umts_enable') {
+                sim.radioSettings.technologyPreference = 'umts';
+                radioSingleSim.parent.umtsModemChanged(sim, sim.connMan.powered ? sim.path : "");
+                sim.mtkSettings.has3G = true;
+            } else {
+                sim.radioSettings.technologyPreference = model[index];
+            }
+        }
+
+        Connections {
+            target: sim.radioSettings
+
+            onTechnologyPreferenceChanged: selector.selectedIndex =
+                sim.radioSettings.modemTechnologies.indexOf(preference)
+
+            onModemTechnologiesChanged: {
+                if ((technologies.indexOf('umts') === -1)
+                     && (sim.mtkSettings.has3G === false)) {
+                    selector.model = sim.addUmtsEnableToModel(technologies);
+                } else {
+                    selector.model = technologies;
+                }
+                selector.selectedIndex = sim.radioSettings.technologyPreference !== "" ?
+                    selector.model.indexOf(sim.radioSettings.technologyPreference) : -1
+            }
+            ignoreUnknownSignals: true
+        }
+
+        Component.onCompleted: {
+            if ((sim.radioSettings.modemTechnologies.indexOf('umts') === -1)
+                 && (sim.mtkSettings.has3G === false)) {
+                selector.model = sim.addUmtsEnableToModel(
+                    sim.radioSettings.modemTechnologies);
+            } else {
+                selector.model = sim.radioSettings.modemTechnologies;
+            }
         }
     }
 }
 
=== modified file 'plugins/cellular/Components/Sim.qml'
--- plugins/cellular/Components/Sim.qml	2014-10-07 15:41:44 +0000
+++ plugins/cellular/Components/Sim.qml	2015-02-09 14:18:57 +0000
@@ -27,6 +27,7 @@
     property alias radioSettings: radioSettings
     property alias simMng: simMng
     property alias connMan: connMan
+    property alias mtkSettings: mtkSettings
 
     property alias present: simMng.present
     property string path
@@ -36,14 +37,31 @@
         return name + (number ? " (" + number + ")" : "");
     }
 
+    function techToString (tech) {
+        var strings = {
+            'gsm': i18n.tr("2G only (saves battery)"),
+            'umts': i18n.tr("2G/3G (faster)"),
+            'lte': i18n.tr("2G/3G/4G (faster)")
+        };
+        strings['umts_enable'] = strings['umts'];
+        return strings[tech];
+    }
+
+    // adds umts_enable to an copy of model
+    function addUmtsEnableToModel (model) {
+        var newModel = model.slice(0);
+        newModel.push('umts_enable');
+        return newModel;
+    }
+
     OfonoModem {
         id: modem
         modemPath: path
         onInterfacesChanged: {
-            if (interfaces.indexOf('org.ofono.ConnectionManager') >= 0) {
-                connMan._valid = true;
+            if (interfaces.indexOf('org.ofono.MtkSettings') >= 0) {
+                mtkSettings._valid = true;
             } else {
-                connMan._valid = false;
+                mtkSettings._valid = false;
             }
         }
     }
@@ -65,6 +83,11 @@
 
     OfonoConnMan {
         id: connMan
+        modemPath: path
+    }
+
+    OfonoMtkSettings {
+        id: mtkSettings
         property bool _valid: true
         modemPath: path
         on_ValidChanged: {
 
=== modified file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	2014-12-16 16:22:29 +0000
+++ plugins/cellular/Components/SingleSim.qml	2015-02-09 14:18:57 +0000
@@ -28,6 +28,10 @@
 
     property var sim
 
+    /*  @sim a Sim.qml component containing libqofono bindings
+        @prevOnlineModem path to modem that was online before this event */
+    signal umtsModemChanged (var sim, string prevOnlineModem);
+
     ListItem.Standard {
         id: selector
         text: i18n.tr("Cellular data:")
 
=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/PageComponent.qml	2015-02-09 14:18:57 +0000
@@ -20,6 +20,7 @@
 
 import QtQuick 2.0
 import SystemSettings 1.0
+import Ubuntu.SystemSettings.Cellular 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import MeeGo.QOfono 0.2
@@ -32,11 +33,31 @@
     title: i18n.tr("Cellular")
     objectName: "cellularPage"
 
-    property var modemsSorted: manager.modems.slice(0).sort()
+    property var modemsSorted: []
     property int simsLoaded: 0
 
+    // waiting during modem reboots or for modems to come online
+    property bool waiting: true
+
+    QtObject {
+        id: priv
+        property string prevOnlineModem: ""
+    }
+
     states: [
         State {
+            name: "waiting"
+            when: waiting
+            PropertyChanges {
+                target: waitIndicator
+                opacity: 1
+            }
+            PropertyChanges {
+                target: flick
+                opacity: 0
+            }
+        },
+        State {
             name: "noSim"
             when: (simsLoaded === 0) || (Sims.getPresentCount() === 0)
             StateChangeScript {
@@ -47,7 +68,8 @@
             name: "singleSim"
             StateChangeScript {
                 script: loader.setSource("Components/SingleSim.qml", {
-                    sim: Sims.getFirstPresent()
+                    sim: Sims.getFirstPresent(),
+                    prevOnlineModem: priv.prevOnlineModem
                 })
             }
             when: simsLoaded && (Sims.getPresentCount() === 1)
@@ -57,7 +79,8 @@
             StateChangeScript {
                 script: loader.setSource("Components/MultiSim.qml", {
                     sims: Sims.getAll(),
-                    modems: modemsSorted
+                    modems: modemsSorted,
+                    prevOnlineModem: priv.prevOnlineModem
                 })
             }
             when: simsLoaded && (Sims.getPresentCount() > 1)
@@ -66,19 +89,10 @@
 
     OfonoManager {
         id: manager
-        Component.onCompleted: {
-            var component = Qt.createComponent("Components/Sim.qml");
-            modemsSorted.forEach(function (path) {
-                var sim = component.createObject(root, {
-                    path: path
-                });
-                if (sim === null) {
-                    console.warn('Failed to create Sim qml:',
-                        component.errorString());
-                } else {
-                    Sims.add(sim);
-                }
-            });
+        onModemsChanged: {
+            root.modemsSorted = modems.slice(0).sort();
+            Sims.createQML();
+            root.waiting = false;
         }
     }
 
@@ -95,12 +109,30 @@
         }
     }
 
+    Item {
+        id: waitIndicator
+        anchors.fill: parent
+        opacity: 0
+
+        ActivityIndicator {
+            anchors.centerIn: parent
+            running: true
+        }
+
+        Behavior on opacity {
+            PropertyAnimation {
+               duration: UbuntuAnimation.SleepyDuration
+            }
+        }
+    }
+
     Flickable {
         id: flick
         anchors.fill: parent
         contentWidth: parent.width
         contentHeight: contentItem.childrenRect.height
         boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
         Column {
             anchors { left: parent.left; right: parent.right }
             Loader {
@@ -108,5 +140,37 @@
                 anchors { left: parent.left; right: parent.right }
             }
         }
+
+        Behavior on opacity {
+            PropertyAnimation {
+                duration: UbuntuAnimation.SleepyDuration
+            }
+        }
+
+        Connections {
+            target: loader.item
+
+            onUmtsModemChanged: {
+                var path = sim.path;
+                var e = sim.simMng.presenceChanged;
+
+                function presenceHandler (ispresent) {
+                    if (ispresent) {
+                        root.waiting = false;
+                        Connectivity.unlockAllModems();
+                        e.disconnect(presenceHandler);
+                    }
+                }
+
+                priv.prevOnlineModem = prevOnlineModem ?
+                    prevOnlineModem : "";
+                root.waiting = true;
+
+                /* When the SIM comes back online, set waiting to false:
+                the modem reboot is done.*/
+                sim.simMng.presenceChanged.connect(presenceHandler);
+            }
+            ignoreUnknownSignals: true
+        }
     }
 }
 
=== added file 'plugins/cellular/connectivity.cpp'
--- plugins/cellular/connectivity.cpp	1970-01-01 00:00:00 +0000
+++ plugins/cellular/connectivity.cpp	2015-02-09 14:18:57 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDBusReply>
+#include <QtDebug>
+#include <QDBusInterface>
+#include "connectivity.h"
+
+namespace {
+    const QString conn_service("com.ubuntu.connectivity1");
+    const QString conn_object("/com/ubuntu/connectivity1/Private");
+    const QString conn_interface("com.ubuntu.connectivity1.Private");
+    const QString conn_unlockall_method("UnlockAllModems");
+}
+
+Connectivity::Connectivity(QObject *parent) : QObject(parent)
+{
+}
+
+void Connectivity::unlockAllModems() {
+
+    QDBusInterface connectivityIface (
+        conn_service,
+        conn_object,
+        conn_interface,
+        QDBusConnection::sessionBus(),
+        this);
+
+    auto reply = connectivityIface.call(conn_unlockall_method);
+    if (reply.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << "Failed to unlock modems" << reply.errorMessage();
+    }
+}
 
=== added file 'plugins/cellular/connectivity.h'
--- plugins/cellular/connectivity.h	1970-01-01 00:00:00 +0000
+++ plugins/cellular/connectivity.h	2015-02-09 14:18:57 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CELLULAR_CONNECTIVITY_HELPER
+#define CELLULAR_CONNECTIVITY_HELPER
+
+#include <QObject>
+
+class Connectivity : public QObject {
+    Q_OBJECT
+
+public:
+    explicit Connectivity(QObject *parent = nullptr);
+    ~Connectivity() {};
+
+    Q_INVOKABLE void unlockAllModems();
+};
+
+#endif
 
=== modified file 'plugins/cellular/plugin.cpp'
--- plugins/cellular/plugin.cpp	2014-08-29 14:32:28 +0000
+++ plugins/cellular/plugin.cpp	2015-02-09 14:18:57 +0000
@@ -19,12 +19,23 @@
 
 #include <QtQml>
 #include <QtQml/QQmlContext>
+#include "connectivity.h"
 #include "hotspotmanager.h"
 #include "ofonoactivator.h"
 
+static QObject *connectivitySingeltonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    Connectivity *connectivity = new Connectivity();
+    return connectivity;
+}
+
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
+    qmlRegisterSingletonType<Connectivity>(uri, 1, 0, "Connectivity", connectivitySingeltonProvider);
     qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
     qmlRegisterType<OfonoActivator>(uri, 1, 0, "OfonoActivator");
 }
 
=== modified file 'plugins/cellular/sims.js'
--- plugins/cellular/sims.js	2014-11-18 20:13:35 +0000
+++ plugins/cellular/sims.js	2015-02-09 14:18:57 +0000
@@ -46,3 +46,24 @@
 function getPresentCount () {
     return getPresent().length;
 }
+
+function createQML () {
+    var component = Qt.createComponent("Components/Sim.qml");
+
+    sims.forEach(function (sim) {
+        sim.destroy();
+    });
+    sims = [];
+
+    root.modemsSorted.forEach(function (path) {
+        var sim = component.createObject(root, {
+            path: path
+        });
+        if (sim === null) {
+            console.warn('Failed to create Sim qml:',
+                component.errorString());
+        } else {
+            Sims.add(sim);
+        }
+    });
+}
 
=== modified file 'plugins/phone/PageComponent.qml'
--- plugins/phone/PageComponent.qml	2014-11-10 17:59:34 +0000
+++ plugins/phone/PageComponent.qml	2015-02-09 14:18:57 +0000
@@ -32,7 +32,7 @@
     title: i18n.tr("Phone")
     flickable: flick
 
-    property var modemsSorted: manager.modems.slice(0).sort()
+    property var modemsSorted: []
     property var simsLoaded: 0
 
     states: [
@@ -65,19 +65,9 @@
 
     OfonoManager {
         id: manager
-        Component.onCompleted: {
-            // create ofono bindings for all modem paths
-            var component = Qt.createComponent("Ofono.qml");
-            modemsSorted.forEach(function (path) {
-                var sim = component.createObject(root, {
-                    path: path
-                });
-                if (sim === null) {
-                    console.warn('failed to create sim object');
-                } else {
-                    Sims.add(sim);
-                }
-            });
+        onModemsChanged: {
+            root.modemsSorted = modems.slice(0).sort();
+            Sims.createQML();
         }
     }
 
 
=== modified file 'plugins/phone/sims.js'
--- plugins/phone/sims.js	2014-10-03 14:08:08 +0000
+++ plugins/phone/sims.js	2015-02-09 14:18:57 +0000
@@ -36,3 +36,24 @@
 function getPresentCount () {
     return getPresent().length;
 }
+
+function createQML () {
+    var component = Qt.createComponent("Ofono.qml");
+
+    sims.forEach(function (sim) {
+        sim.destroy();
+    });
+    sims = [];
+
+    root.modemsSorted.forEach(function (path) {
+        var sim = component.createObject(root, {
+            path: path
+        });
+        if (sim === null) {
+            console.warn('Failed to create Sim qml:',
+                component.errorString());
+        } else {
+            Sims.add(sim);
+        }
+    });
+}
 
=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2014-11-12 16:28:12 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-02-09 14:18:57 +0000
@@ -39,9 +39,11 @@
 
     property alias usePowerd: batteryBackend.powerdRunning
     property bool lockOnSuspend
-    property var modemsSorted: manager.modems.slice(0).sort()
-    property var sims
-    property int simsPresent: 0
+    property var modemsSorted: []
+    property var sims: []
+    /* glue to something that will emit change events
+    TODO: fix this so that the present count emits events of its own */
+    property int simsPresent: simsLoaded ? Sims.getPresentCount() : 0
     property int simsLoaded: 0
     property int simsLocked: {
         var t = 0;
@@ -66,23 +68,10 @@
 
     OfonoManager {
         id: manager
-        Component.onCompleted: {
-            // create ofono bindings for all modem paths
-            var component = Qt.createComponent("Ofono.qml");
-            modemsSorted.forEach(function (path, index) {
-                var sim = component.createObject(root, {
-                    path: path,
-                    name: phoneSettings.simNames[path] ?
-                            phoneSettings.simNames[path] :
-                            "SIM " + (index + 1)
-                });
-                if (sim === null)
-                    console.warn('failed to create sim object');
-                else
-                    Sims.add(sim);
-            });
+        onModemsChanged: {
+            root.modemsSorted = modems.slice(0).sort();
+            Sims.createQML();
             root.sims = Sims.getAll();
-            root.simsPresent = Sims.getPresentCount();
         }
     }
 
 
=== modified file 'plugins/security-privacy/sims.js'
--- plugins/security-privacy/sims.js	2014-08-27 05:19:24 +0000
+++ plugins/security-privacy/sims.js	2015-02-09 14:18:57 +0000
@@ -32,3 +32,28 @@
 function getPresentCount () {
     return getPresent().length;
 }
+
+function createQML () {
+    var component = Qt.createComponent("Ofono.qml");
+
+    sims.forEach(function (sim) {
+        sim.destroy();
+    });
+    sims = [];
+
+    root.modemsSorted.forEach(function (path, index) {
+        var sim = component.createObject(root, {
+            path: path,
+            name: phoneSettings.simNames[path] ?
+                phoneSettings.simNames[path] :
+                "SIM " + (index + 1)
+        });
+        if (sim === null) {
+            console.warn('Failed to create Sim qml:',
+                component.errorString());
+        } else {
+            Sims.add(sim);
+        }
+    });
+}
+
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-01-29 19:50:34 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-02-09 14:18:57 +0000
@@ -143,7 +143,7 @@
 
     def mock_connection_manager(self, modem):
         modem.AddProperty(CONNMAN_IFACE, 'Powered', dbus.Boolean(1))
-        modem.AddProperty(CONNMAN_IFACE, 'RoamingAllowed', False)
+        modem.AddProperty(CONNMAN_IFACE, 'RoamingAllowed', dbus.Boolean(0))
         modem.AddMethods(
             CONNMAN_IFACE,
             [
@@ -156,6 +156,9 @@
                     'self.EmitSignal("IFACE", "PropertyChanged", "sv",\
                         [args[0], args[1]])'.replace("IFACE", CONNMAN_IFACE)),
             ])
+        interfaces = modem.GetProperties()['Interfaces']
+        interfaces.append(CONNMAN_IFACE)
+        modem.SetProperty('Interfaces', interfaces)
 
     def mock_carriers(self, name):
         self.dbusmock.AddObject(
@@ -208,6 +211,10 @@
                  "PropertyChanged", "sv", [args[0], args[1]])'
                     .replace('IFACE', RDO_IFACE)), ])
 
+        interfaces = modem.GetProperties()['Interfaces']
+        interfaces.append(RDO_IFACE)
+        modem.SetProperty('Interfaces', interfaces)
+
     def mock_call_forwarding(self, modem):
         modem.AddProperty(
             CALL_FWD_IFACE, 'VoiceUnconditional', '')
@@ -220,6 +227,9 @@
                  'self.EmitSignal("IFACE",\
                  "PropertyChanged", "sv", [args[0], args[1]])'
                     .replace('IFACE', CALL_FWD_IFACE)), ])
+        interfaces = modem.GetProperties()['Interfaces']
+        interfaces.append(CALL_FWD_IFACE)
+        modem.SetProperty('Interfaces', interfaces)
 
     def mock_call_settings(self, modem):
         modem.AddProperty(
@@ -233,6 +243,9 @@
                  'self.EmitSignal("IFACE",\
                  "PropertyChanged", "sv", [args[0], args[1]])'
                     .replace('IFACE', CALL_SETTINGS_IFACE)), ])
+        interfaces = modem.GetProperties()['Interfaces']
+        interfaces.append(CALL_SETTINGS_IFACE)
+        modem.SetProperty('Interfaces', interfaces)
 
     def add_sim1(self):
         # create modem_0 proxy