Merge lp:~mterry/ubuntu-system-settings/check-both-sims into lp:ubuntu-system-settings

[Michael Terry]

Make the wizard properly handle devices with zero, one, or two SIM modem slots. Previously it assumed exactly one slot.

Make the wizard properly handle devices with zero, one, or two SIM modem slots. Previously it assumed exactly one slot.

The method I chose here is hard-coded to max of two slots, because dual SIM isn't uncommong. I'd like a better way, but that API apparently doesn't exist yet [1]. So this is fine for now.

[1] I *could* run a for loop, creating dynamic OfonoSimManager objects, checking their 'present' properties, then destroying the objects. But that seems not very QML-like.

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 - Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 - NA, just QML changes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 - NA, just QML changes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 - Yeah

 * Has a 5 minute exploratory testing run been executed on N4?
 - Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 - NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 - NA

 * What components might get impacted by your changes?
 - None

 * Have you requested review by the teams of these owning components?
 - NA

[Jonas G. Drange (jonas-drange)]

You could use states and Loader elements to dynamically create Ofono objects for one or two sims, as demonstrated in this non-functional example[1].

Either way, the current code LGTM.

[1] http://pastebin.ubuntu.com/7983861

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:874
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1175/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4452/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2792/console

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/ubuntu-system-settings/check-both-sims]

875. By Michael Terry on 2014-08-14

Merge from trunk

[Michael Terry (mterry)]

Your code example is fine, but it's not the static OfonoSimManager stanzas that bother me, but rather the fact that we hard-code two of them instead of however many modems there are (like, what about some insane phone with five SIM slots?). And in your example at least, two is still hard-coded.

Anyway, I think hard-coding is good enough to deal with the immediate problem, and 99% of phones anyway. If it looks good to you, please-rereview/approve. Thanks!

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:875
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1230/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/419
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4799
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4799/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3070
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3070/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'wizard/qml/Pages/10-welcome.qml'
--- wizard/qml/Pages/10-welcome.qml	2014-07-14 19:00:38 +0000
+++ wizard/qml/Pages/10-welcome.qml	2014-08-14 13:18:50 +0000
@@ -33,9 +33,16 @@
         id: manager
     }
 
-    OfonoSimManager {
-        id: simManager
-        modemPath: manager.modems[0]
+    // Ideally we would query the system more cleverly than hardcoding two
+    // modems.  But we don't yet have a more clever way.  :(
+    OfonoSimManager {
+        id: simManager0
+        modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
+    }
+
+    OfonoSimManager {
+        id: simManager1
+        modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
     }
 
     Item {
@@ -82,7 +89,7 @@
             text: i18n.tr("Start")
             onClicked: {
                 plugin.currentLanguage = languageList.selectedIndex
-                if (simManager.present)
+                if (manager.modems.length == 0 || simManager0.present || simManager1.present)
                     pageStack.next()
                 else
                     pageStack.push(Qt.resolvedUrl("no-sim.qml"))