Merge lp:~jonas-drange/ubuntu-system-settings/tech-switch into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular] allow user to change 3g modem

* Added connectivity C++ binding used for SIM unlock
* Added a sleepy opacity transition for when modems go away/come back.
* Changed invalidation of the ConnectionManager libqofono binding to invalidate MtkSettings libqofono binding. Most libqofono bindings will not require invalidating anymore, except for the Mtk Settings libqofono binding. See [1].

[1] https://bugs.launchpad.net/ubuntu/+source/libqofono/+bug/1410785

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1257
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/tech-switch/+merge/246503/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1901/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/808/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/171
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/704/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17090

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1260
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1903/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/173
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17111

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1262
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1905/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/175
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/819
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17120

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1262
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1912/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/182
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/837
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/837/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17158

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Tested this on krillin, it works. There is a brief time after the UI returns and it shows data is off, after 10 seconds or so it comes back on. That might be confusing, any ideas how to handle that case?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1262
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1913/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/842
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17165

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

review: Approve (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

1263. By Jonas G. Drange on 2015-01-16

wait even though there's multiple modems present

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1263
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1915/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/846
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/846/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17171

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

review: Approve (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

1264. By Jonas G. Drange on 2015-01-20

cache what modem was online before the tech switch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1264
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1916/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/186
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/872
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17228

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1264
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1917/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/877
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17237

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

review: Approve (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

1265. By Jonas G. Drange on 2015-01-20

moving repeated functions to sims.js

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1265
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1918/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/888
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/888/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17255

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Note: I haven’t tested the functionality (I’ll leave that to someone who understands the problem and its context). This is only a code review (from someone who doesn’t know the code base at all).

469 + #define UNLOCKALL_METHOD_NAME "UnlockAllModems"

Why is this one a #define and not a const QString like the others?

486 + if (reply.type() == 3) {

"3" should be QDBusMessage::ErrorMessage.

552 +++ plugins/cellular/sims.js

It doesn’t look like the strings extraction is run on JS files, so if I run `make pot` the strings in that file get excluded from the translation template.
Also, I don’t know what’s the policy for updating the POT file in the source tree, but it looks quite outdated at the moment, you might want to consider updating it (not necessarily as part of this MR though).

545 + qmlRegisterType<Connectivity>(uri, 1, 0, "Connectivity");

If the Connectivity type is only meant to have static invokable methods, then you probably want to register it as a singleton, using qmlRegisterSingletonType(…).

review: Needs Fixing (code)

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

1266. By Jonas G. Drange on 2015-01-21

move sim related functionality into the SIM qml for now, let connectivity be a singleton

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1266
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1920/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/914
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/190
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/912
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/912/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17310

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

1267. By Jonas G. Drange on 2015-01-30

merge trunk

1268. By Jonas G. Drange on 2015-01-30

detach event handler after the sim comes back

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1947/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/217
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1082
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17630

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1953/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/223
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1115
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17684

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1959/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/229
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17780

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

I tried testing this on krillin and had some problems. Understandably I can't really switch to 3g because in the US the best I can get is edge. In my testing it ultimate would change the tech pref, but it would take several minutes for the connection to come back. It looked as if it had worked, but had no connection and the indicator didn't show the connection. Watching it with monitor-ofono I could see stuff happening, but it would take several minutes to connect.

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

@ken, could you attach the monitor ouput to bug 1379850? Thanks

[Jonas G. Drange (jonas-drange)]

@ken, this might be a long shot, but did you at any point hot swap and not reboot? I've seen something similar to what you describe after a hot swap.

[lp:~jonas-drange/ubuntu-system-settings/tech-switch]

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

fix dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1965/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1096
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17875

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks good now, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-01-30 18:09:06 +0000
+++ debian/control	2015-02-09 12:52:48 +0000
@@ -72,7 +72,7 @@
          qtdeclarative5-folderlistmodel-plugin,
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
-         qtdeclarative5-ofono0.2 (>=0.70),
+         qtdeclarative5-ofono0.2 (>=0.70~),
          qtdeclarative5-systeminfo-plugin,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-settings-components (>> 0.2),

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2014-11-10 15:20:57 +0000
+++ plugins/cellular/CMakeLists.txt	2015-02-09 12:52:48 +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-12 19:26:36 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2015-02-09 12:52:48 +0000
@@ -24,6 +24,8 @@
 
 Column {
 
+    property string prevOnlineModem: parent.prevOnlineModem
+
     function getNameFromIndex (index) {
         if (index === 0) {
             return i18n.tr("Off");
@@ -52,8 +54,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-11 21:14:43 +0000
+++ plugins/cellular/Components/MultiSim.qml	2015-02-09 12:52:48 +0000
@@ -37,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
@@ -96,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
@@ -110,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-02 15:09:50 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2015-02-09 12:52:48 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
+    id: radioSingleSim
     height: childrenRect.height
 
     property bool enabled: sim.radioSettings.technologyPreference !== ""
@@ -31,29 +32,60 @@
 
     ListItem.ItemSelector {
         id: selector
+
         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 12:52:48 +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-05 15:34:38 +0000
+++ plugins/cellular/Components/SingleSim.qml	2015-02-09 12:52:48 +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	2015-01-14 00:00:41 +0000
+++ plugins/cellular/PageComponent.qml	2015-02-09 12:52:48 +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
@@ -35,8 +36,28 @@
     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)
@@ -69,6 +92,7 @@
         onModemsChanged: {
             root.modemsSorted = modems.slice(0).sort();
             Sims.createQML();
+            root.waiting = false;
         }
     }
 
@@ -85,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 {
@@ -98,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 12:52:48 +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 12:52:48 +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 12:52:48 +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");
 }