on xenial help sign in
Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.
commit7d501b210e7cf32019a79d37b13f8461154cf96d authorMichael Terry <michael.terry@canonical.com> dateThu 19 Feb 2015, 13:53 (12 years ago) parent3585722
1 file changed+5−1
qml/Wizard/Pages/20-sim.qml+5−1
qml/Wizard/Pages/20-sim.qml+5−1
@@ -25,11 +25,15 @@ LocalComponents.Page {
2525 title: i18n.tr("Add a SIM card and restart your device")
2626 forwardButtonSourceComponent: forwardButton
2727
28− // No need for skipValid, since OfonoManager does everything synchronously
28+ skipValid: !manager.available ||
29+ (manager.ready && (manager.modems.length < 1 || simManager0.ready)
30+ && (manager.modems.length < 2 || simManager1.ready))
2931 skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
3032
3133 OfonoManager {
3234 id: manager
35+ property bool ready: false
36+ onModemsChanged: ready = true
3337 }
3438
3539 // Ideally we would query the system more cleverly than hardcoding two