@@ -29,12 +29,6 @@ LocalComponents.Page {
2929 customTitle: true
3030 hasBackButton: false
3131
32− skipValid: modemManager.gotSimCard
33−
34− // skip this page altogether if...
35− skip: !modemManager.available || modemManager.modems.length === 0 || // .. we don't have any modem
36− simManager0.present || simManager1.present // ... or we already have a SIM card inserted
37−
3832 property bool hadSIM: simManager0.present || simManager1.present
3933
4034 Timer {
@@ -45,24 +39,9 @@ LocalComponents.Page {
4539 print("=== SIM page: timer triggered");
4640 hadSIM = simManager0.present || simManager1.present;
4741 print("=== SIM page: had sim:", hadSIM);
48− if (hadSIM) {
49− skip = true;
50− skipValid = true;
51− }
52− else {
53− checkSkipValid();
54− }
5542 }
5643 }
5744
58− function checkSkipValid() {
59− skipValid = (modemManager.available && modemManager.modems.length === 0) || // got modem with no SIM card slots
60− !modemManager.available || // modem not available
61− (simManager0.ready && !simManager0.present) || (simManager1.ready && !simManager1.present) || // empty SIM card slots
62− simManager0.present || simManager1.present; // already have a SIM card inserted
63− print("=== SIM page: check skipValid:", skipValid);
64− }
65−
6645 Connections {
6746 target: modemManager
6847 onGotSimCardChanged: {
@@ -122,7 +101,10 @@ LocalComponents.Page {
122101 id: forwardButton
123102 LocalComponents.StackButton {
124103 text: i18n.tr("Skip")
125− onClicked: pageStack.next()
104+ onClicked: {
105+ seenSIMPage = true;
106+ pageStack.next();
107+ }
126108 }
127109 }
128110}