Merge lp:~mterry/ubuntu-system-settings/wait-for-qofono into lp:ubuntu-system-settings/rtm-14.09

[Michael Terry]

Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.

libqofono recently became asynchronous, which the wizard was not prepared for.

Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.

libqofono recently became asynchronous, which the wizard was not prepared for.

== 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?
 Just QML

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Just QML

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Not the full thing

 * 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?
 Just wizard

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

[Jonas G. Drange (jonas-drange)]

WFM, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:975
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/43
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18214

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

review: Approve (continuous-integration)

=== modified file 'wizard/qml/Pages/20-sim.qml'
--- wizard/qml/Pages/20-sim.qml	2014-09-29 20:45:30 +0000
+++ wizard/qml/Pages/20-sim.qml	2015-02-19 16:50:33 +0000
@@ -23,11 +23,15 @@
     title: i18n.tr("Add a SIM card and restart your device")
     forwardButtonSourceComponent: forwardButton
 
-    // No need for skipValid, since OfonoManager does everything synchronously
+    skipValid: !manager.available ||
+               (manager.ready && (manager.modems.length < 1 || simManager0.ready)
+                              && (manager.modems.length < 2 || simManager1.ready))
     skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
 
     OfonoManager {
         id: manager
+        property bool ready: false
+        onModemsChanged: ready = true
     }
 
     // Ideally we would query the system more cleverly than hardcoding two