git.iko.soy/unity8
on xenial help sign in
Wait for libqofono to finish initializing before we decide whether to skip the wizard's SIM page or not.
7d501b2Michael Terry
qml/Wizard/Pages/20-sim.qml+5−1
compare with xenial
unifiedsplit
@@ -25,11 +25,15 @@ LocalComponents.Page {
25 title: i18n.tr("Add a SIM card and restart your device")
25 title: i18n.tr("Add a SIM card and restart your device")
26 forwardButtonSourceComponent: forwardButton
26 forwardButtonSourceComponent: forwardButton
27
27
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))
29 skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
31 skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
30
32
31 OfonoManager {
33 OfonoManager {
32 id: manager
34 id: manager
35+ property bool ready: false
36+ onModemsChanged: ready = true
33 }
37 }
34
38
35 // Ideally we would query the system more cleverly than hardcoding two
39 // Ideally we would query the system more cleverly than hardcoding two