@@ -29,10 +29,10 @@ LocalComponents.Page {
2929 customTitle: true
3030 hasBackButton: false
3131
32− skipValid: !manager.available ||
33− (manager.ready && (manager.modems.length < 1 || simManager0.ready)
34− && (manager.modems.length < 2 || simManager1.ready))
35− skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
32+ skipValid: !modemManager.available ||
33+ (modemManager.ready && (modemManager.modems.length < 1 || simManager0.ready)
34+ && (modemManager.modems.length < 2 || simManager1.ready))
35+ skip: !modemManager.available || modemManager.modems.length === 0 || simManager0.present || simManager1.present
3636
3737 property bool hadModem: false
3838
@@ -57,30 +57,15 @@ LocalComponents.Page {
5757 }
5858 }
5959
60− OfonoManager {
61− id: manager
62− property bool ready: false
60+ Connections {
61+ target: modemManager
6362 onModemsChanged: {
64− print("Modems changed " + modems)
65− ready = true
6663 if (!hadModem && (simManager0.present || simManager1.present)) { // show the restart dialog in case a SIM gets inserted
67− PopupUtils.open(restartDialog)
64+ restartDialog.visible = true
6865 }
6966 }
7067 }
7168
72− // Ideally we would query the system more cleverly than hardcoding two
73− // sims. But we don't yet have a more clever way. :(
74− OfonoSimManager {
75− id: simManager0
76− modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
77− }
78−
79− OfonoSimManager {
80− id: simManager1
81− modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
82− }
83−
8469 Column {
8570 anchors.fill: content
8671 spacing: units.gu(4)