1
=== modified file 'plugins/cellular/CMakeLists.txt'
2
--- plugins/cellular/CMakeLists.txt	2014-08-17 14:50:51 +0000
3
+++ plugins/cellular/CMakeLists.txt	2014-10-03 20:40:51 +0000
4
@@ -4,6 +4,8 @@
5
4
install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
4
install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
6
5
5
7
6
set(QML_SOURCES
6
set(QML_SOURCES
8
7
    CustomApnEditor.qml
9
8
    PageChooseApn.qml
10
7
    PageChooseCarrier.qml
9
    PageChooseCarrier.qml
11
8
    PageChooseCarriers.qml
10
    PageChooseCarriers.qml
12
9
    PageComponent.qml
11
    PageComponent.qml
13
@@ -18,6 +20,8 @@
14
18
  plugin.h
20
  plugin.h
15
19
  hotspotmanager.cpp
21
  hotspotmanager.cpp
16
20
  hotspotmanager.h
22
  hotspotmanager.h
17
23
  ofonoactivator.cpp
18
24
  ofonoactivator.h
19
21
  nm_manager_proxy.h
25
  nm_manager_proxy.h
20
22
  nm_settings_proxy.h
26
  nm_settings_proxy.h
21
23
  nm_settings_connection_proxy.h
27
  nm_settings_connection_proxy.h
22
24
28
23
=== modified file 'plugins/cellular/Components/CMakeLists.txt'
24
--- plugins/cellular/Components/CMakeLists.txt	2014-08-21 20:25:08 +0000
25
+++ plugins/cellular/Components/CMakeLists.txt	2014-10-03 20:40:51 +0000
26
@@ -9,3 +9,9 @@
27
9
    SimEditor.qml
9
    SimEditor.qml
28
10
)
10
)
29
11
install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
11
install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
30
12
31
13
# add a phony target to get the files visible in Qt Creator.
32
14
add_custom_target(
33
15
    plugins_cellular_components_sources
34
16
    SOURCES ${QML_SOURCES}
35
17
)
36
12
18
37
=== modified file 'plugins/cellular/Components/MultiSim.qml'
38
--- plugins/cellular/Components/MultiSim.qml	2014-08-19 23:24:04 +0000
39
+++ plugins/cellular/Components/MultiSim.qml	2014-10-03 20:40:51 +0000
40
@@ -33,7 +33,7 @@
41
33
    property var settings: phoneSettings
33
    property var settings: phoneSettings
42
34
34
43
35
    CellularMultiSim {
35
    CellularMultiSim {
45
36
        anchors { left: parent.left; right: parent.right }
36
        anchors { left: parent.left; right: parent.right }
46
37
    }
37
    }
47
38
38
48
39
    ListItem.Divider {}
39
    ListItem.Divider {}
49
@@ -68,6 +68,7 @@
50
68
        text: i18n.tr("Carriers")
68
        text: i18n.tr("Carriers")
51
69
        id: chooseCarrier
69
        id: chooseCarrier
52
70
        objectName: "chooseCarrier"
70
        objectName: "chooseCarrier"
53
71
        enabled: sim.netReg.status !== ""
54
71
        progression: enabled
72
        progression: enabled
55
72
        onClicked: {
73
        onClicked: {
56
73
            pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
74
            pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
57
@@ -79,13 +80,13 @@
58
79
    ListItem.Divider {}
80
    ListItem.Divider {}
59
80
81
60
81
    SimEditor {
82
    SimEditor {
62
82
        anchors { left: parent.left; right: parent.right }
83
        anchors { left: parent.left; right: parent.right }
63
83
    }
84
    }
64
84
85
65
85
    ListItem.Divider {}
86
    ListItem.Divider {}
66
86
87
67
87
    DefaultSim {
88
    DefaultSim {
69
88
        anchors { left: parent.left; right: parent.right }
89
        anchors { left: parent.left; right: parent.right }
70
89
    }
90
    }
71
90
91
72
91
    GSettings {
92
    GSettings {
73
@@ -99,7 +100,7 @@
74
99
            if (!simNames[m0]) {
100
            if (!simNames[m0]) {
75
100
                simNames[m0] = "SIM 1";
101
                simNames[m0] = "SIM 1";
76
101
            }
102
            }
78
102
            if (!simNames[m1]) {
103
            if (!simNames[m1]) {
79
103
                simNames[m1] = "SIM 2";
104
                simNames[m1] = "SIM 2";
80
104
            }
105
            }
81
105
            phoneSettings.simNames = simNames;
106
            phoneSettings.simNames = simNames;
82
106
107
83
=== modified file 'plugins/cellular/Components/SingleSim.qml'
84
--- plugins/cellular/Components/SingleSim.qml	2014-08-22 10:53:16 +0000
85
+++ plugins/cellular/Components/SingleSim.qml	2014-10-03 20:40:51 +0000
86
@@ -28,10 +28,10 @@
87
28
    property var sim
28
    property var sim
88
29
29
89
30
    CellularSingleSim {
30
    CellularSingleSim {
91
31
        anchors { left: parent.left; right: parent.right }
31
        anchors { left: parent.left; right: parent.right }
92
32
    }
32
    }
93
33
33
95
34
    ListItem.Divider {}
34
    ListItem.Divider {}
96
35
35
97
36
    ListItem.SingleValue {
36
    ListItem.SingleValue {
98
37
        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
37
        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
99
@@ -60,9 +60,10 @@
100
60
        objectName: "chooseCarrier"
60
        objectName: "chooseCarrier"
101
61
        progression: enabled
61
        progression: enabled
102
62
        value: sim.netReg.name || i18n.tr("N/A")
62
        value: sim.netReg.name || i18n.tr("N/A")
103
63
        enabled: sim.netReg.status !== ""
104
63
        onClicked: {
64
        onClicked: {
105
64
            pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
65
            pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
107
65
                netReg: sim.netReg,
66
                sim: sim,
108
66
                title: i18n.tr("Carrier")
67
                title: i18n.tr("Carrier")
109
67
            })
68
            })
110
68
        }
69
        }
111
69
70
112
=== added file 'plugins/cellular/CustomApnEditor.qml'
113
--- plugins/cellular/CustomApnEditor.qml	1970-01-01 00:00:00 +0000
114
+++ plugins/cellular/CustomApnEditor.qml	2014-10-03 20:40:51 +0000
115
@@ -0,0 +1,322 @@
116
1
/*
117
2
 * This file is part of system-settings
118
3
 *
119
4
 * Copyright (C) 2014 Canonical Ltd.
120
5
 *
121
6
 * Contact: Pat McGowan <pat.mcgowan@canonical.com>
122
7
 *
123
8
 * This program is free software: you can redistribute it and/or modify it
124
9
 * under the terms of the GNU General Public License version 3, as published
125
10
 * by the Free Software Foundation.
126
11
 *
127
12
 * This program is distributed in the hope that it will be useful, but
128
13
 * WITHOUT ANY WARRANTY; without even the implied warranties of
129
14
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
130
15
 * PURPOSE.  See the GNU General Public License for more details.
131
16
 *
132
17
 * You should have received a copy of the GNU General Public License along
133
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
134
19
 */
135
20
136
21
import QtQuick 2.0
137
22
import QtQuick.Layouts 1.1
138
23
import SystemSettings 1.0
139
24
import Ubuntu.Components 1.1
140
25
import Ubuntu.Components.ListItems 1.0 as ListItem
141
26
142
27
ItemPage {
143
28
    objectName: "customapnPage"
144
29
    id: root
145
30
146
31
    // "internet" or "mms"
147
32
    property var type
148
33
149
34
    // dict of "type" : ctx
150
35
    property var contexts;
151
36
152
37
    /// work around LP(#1361919)
153
38
    property var activateCb;
154
39
155
40
    QtObject {
156
41
        id: d
157
42
        property var typeText : type === "internet" ? i18n.tr("Internet") : i18n.tr("MMS")
158
43
        property bool isMms : type === "mms"
159
44
160
45
        property bool isValid : false
161
46
162
47
        function validateFields() {
163
48
            if (apnName.text === "") {
164
49
                isValid = false;
165
50
                return
166
51
            }
167
52
            if (isMms) {
168
53
                if (mmsc.text === "") {
169
54
                    isValid = false;
170
55
                    return;
171
56
                }
172
57
                /// @todo validate proxy
173
58
                /// @todo force port to be integer and validate it's value
174
59
            }
175
60
176
61
            // @todo the rest
177
62
            isValid = true;
178
63
        }
179
64
    }
180
65
181
66
    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
182
67
    title: i18n.tr("Custom %1 APN").arg(d.typeText)
183
68
184
69
    // workaround of getting the following error on startup:
185
70
    // WARNING - ... : QML Page: Binding loop detected for property "flickable"
186
71
    flickable: null
187
72
    Component.onCompleted: {
188
73
        flickable: scrollWidget
189
74
190
75
        var ctx;
191
76
        if (d.isMms) {
192
77
            ctx = contexts["mms"];
193
78
            if (ctx === undefined) {
194
79
                // @bug LP(:#1362795)
195
80
                return;
196
81
            }
197
82
        } else {
198
83
            ctx = contexts["internet"]
199
84
        }
200
85
201
86
        apnName.text = ctx.accessPointName;
202
87
        userName.text = ctx.username;
203
88
        pword.text = ctx.password;
204
89
        mmsc.text = ctx.messageCenter;
205
90
        var proxyText = ctx.messageProxy.split(":");
206
91
        proxy.text = proxyText[0] !== undefined ? proxyText[0] : "";
207
92
        port.text = proxyText[1] !== undefined ? proxyText[1] : "";
208
93
        /// @todo protocol values
209
94
210
95
        if (d.isMms) {
211
96
            /// @todo disabled for now
212
97
            doBoth.checked = false;
213
98
            return;
214
99
            var internetApn = contexts["internet"]
215
100
            if (ctx.accessPointName === internetApn.accessPointName &&
216
101
                ctx.username == internetApn.username &&
217
102
                ctx.password == internetApn.password
218
103
                /* auth + procol */) {
219
104
                doBoth.checked = true;
220
105
            }
221
106
            else
222
107
                doBoth.checked = false;
223
108
        }
224
109
    }
225
110
226
111
    Flickable {
227
112
        id: scrollWidget
228
113
        anchors {
229
114
            top: parent.top
230
115
            left: parent.left
231
116
            right: parent.right
232
117
            bottom: parent.bottom
233
118
        }
234
119
        contentWidth: parent.width
235
120
        clip: true
236
121
        contentHeight: theContents.height
237
122
        boundsBehavior: (contentHeight > height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
238
123
        flickableDirection: Flickable.VerticalFlick
239
124
240
125
        Item {
241
126
            id: theContents
242
127
            height: sameSwitch.height + theGrid.height
243
128
            width: parent.width
244
129
245
130
            ListItem.Standard {
246
131
                id: sameSwitch
247
132
                anchors.top: parent.top
248
133
                /// @todo disable for now
249
134
                //visible: d.isMms
250
135
                visible: false
251
136
                text: i18n.tr("Same APN as for Internet")
252
137
                control: Switch {
253
138
                    id: doBoth
254
139
                    checked: false
255
140
                    anchors.verticalCenter: parent.verticalCenter
256
141
                    onClicked: {
257
142
                        if (checked) {
258
143
                            var internetApn = contexts["internet"]
259
144
                            apnName.text = internetApn.accessPointName;
260
145
                            userName.text = internetApn.username;
261
146
                            pword.text = internetApn.password;
262
147
                        }
263
148
                    }
264
149
                }
265
150
            }
266
151
267
152
            GridLayout {
268
153
                id: theGrid
269
154
                columns: 2
270
155
                columnSpacing: units.gu(1)
271
156
                rowSpacing: units.gu(1)
272
157
                anchors{
273
158
                    top: d.isMms ? sameSwitch.bottom : parent.top
274
159
                    right: parent.right
275
160
                    left:parent.left
276
161
                    margins: units.gu(0.5)
277
162
                }
278
163
279
164
                Label {
280
165
                    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
281
166
                    text: i18n.tr("%1 APN").arg(d.typeText)
282
167
                }
283
168
                TextField {
284
169
                    id: apnName
285
170
                    enabled: !doBoth.checked
286
171
                    onTextChanged: d.validateFields()
287
172
                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
288
173
                }
289
174
290
175
                Label {
291
176
                    text: i18n.tr("MMSC")
292
177
                    visible: d.isMms
293
178
                }
294
179
                TextField {
295
180
                    id: mmsc
296
181
                    visible: d.isMms
297
182
                    onTextChanged: d.validateFields()
298
183
                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
299
184
                }
300
185
                Label {
301
186
                    text: i18n.tr("Proxy")
302
187
                    visible: d.isMms
303
188
                }
304
189
                TextField {
305
190
                    id: proxy
306
191
                    visible: d.isMms
307
192
                    onTextChanged: d.validateFields()
308
193
                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
309
194
                }
310
195
                Label {
311
196
                    text: "Port"
312
197
                    visible: d.isMms
313
198
                }
314
199
                TextField {
315
200
                    id: port
316
201
                    visible: d.isMms
317
202
                    maximumLength: 4
318
203
                    onTextChanged: d.validateFields()
319
204
                    inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
320
205
                }
321
206
322
207
                Label {
323
208
                    text: i18n.tr("Username")
324
209
                }
325
210
                TextField {
326
211
                    id: userName
327
212
                    enabled: !doBoth.checked
328
213
                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
329
214
                }
330
215
331
216
                Label {
332
217
                    text: i18n.tr("Password")
333
218
                }
334
219
                TextField {
335
220
                    id: pword
336
221
                    enabled: !doBoth.checked
337
222
                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
338
223
                }
339
224
                /// @todo support for ipv6 will be added after RTM
340
225
            }
341
226
            Item {
342
227
                id: buttonRectangle
343
228
344
229
                height: cancelButton.height + units.gu(2)
345
230
346
231
                anchors {
347
232
                    left: parent.left
348
233
                    right: parent.right
349
234
                    top: theGrid.bottom
350
235
                }
351
236
352
237
                Button {
353
238
                    id: cancelButton
354
239
355
240
                    text: i18n.tr("Cancel")
356
241
357
242
                    anchors {
358
243
                        left: parent.left
359
244
                        right: parent.horizontalCenter
360
245
                        bottom: parent.bottom
361
246
                        topMargin: units.gu(1)
362
247
                        leftMargin: units.gu(2)
363
248
                        rightMargin: units.gu(1)
364
249
                        bottomMargin: units.gu(1)
365
250
                    }
366
251
367
252
                    onClicked: {
368
253
                        pageStack.pop()
369
254
                    }
370
255
                }
371
256
372
257
                Button {
373
258
                    id: confirmButton
374
259
375
260
                    text: d.isMms ? i18n.tr("Save") : i18n.tr("Activate")
376
261
377
262
                    anchors {
378
263
                        left: parent.horizontalCenter
379
264
                        right: parent.right
380
265
                        bottom: parent.bottom
381
266
                        topMargin: units.gu(1)
382
267
                        leftMargin: units.gu(1)
383
268
                        rightMargin: units.gu(2)
384
269
                        bottomMargin: units.gu(1)
385
270
                    }
386
271
387
272
                    enabled: d.isValid;
388
273
389
274
                    onClicked: {
390
275
                        var ctx;
391
276
                        if (d.isMms)
392
277
                            ctx = contexts["mms"];
393
278
                        else
394
279
                            ctx = contexts["internet"];
395
280
396
281
                        /// @bug LP(:#1362795)
397
282
                        if (d.isMms && ctx === undefined) {
398
283
                            var mmsData = ({})
399
284
                            mmsData["accessPointName"] = apnName.text;
400
285
                            mmsData["username"] = userName.text;
401
286
                            mmsData["password"] = pword.text;
402
287
                            mmsData["messageCenter"] = mmsc.text
403
288
                            var proxyValue = "";
404
289
                            if (proxy.text !== "") {
405
290
                                proxyValue = proxy.text;
406
291
                                if (port.text !== "")
407
292
                                    proxyValue = proxyValue + ":" + port.text;
408
293
                            }
409
294
                            mmsData["messageProxy"] = proxyValue;
410
295
                            activateCb("mms", undefined, mmsData);
411
296
                            pageStack.pop();
412
297
                            return;
413
298
                        }
414
299
415
300
                        ctx.accessPointName = apnName.text;
416
301
                        ctx.username = userName.text;
417
302
                        ctx.password = pword.text;
418
303
                        if (d.isMms) {
419
304
                            ctx.messageCenter = mmsc.text;
420
305
                            var proxyValue = "";
421
306
                            if (proxy.text !== "") {
422
307
                                proxyValue = proxy.text;
423
308
                                if (port.text !== "")
424
309
                                    proxyValue = proxyValue + ":" + port.text;
425
310
                            }
426
311
                            ctx.messageProxy = proxyValue
427
312
                        }
428
313
                        /// @todo map protocol values
429
314
430
315
                        activateCb(ctx.type, ctx.contextPath);
431
316
                        pageStack.pop();
432
317
                    }
433
318
                }
434
319
            } // item for buttons
435
320
        } // the contents
436
321
    } // the flickable
437
322
}
438
0
323
439
=== added file 'plugins/cellular/PageChooseApn.qml'
440
--- plugins/cellular/PageChooseApn.qml	1970-01-01 00:00:00 +0000
441
+++ plugins/cellular/PageChooseApn.qml	2014-10-03 20:40:51 +0000
442
@@ -0,0 +1,580 @@
443
1
/*
444
2
 * This file is part of system-settings
445
3
 *
446
4
 * Copyright (C) 2014 Canonical Ltd.
447
5
 *
448
6
 * Contact: Pat McGowan <pat.mcgowan@canonical.com>
449
7
 *
450
8
 * This program is free software: you can redistribute it and/or modify it
451
9
 * under the terms of the GNU General Public License version 3, as published
452
10
 * by the Free Software Foundation.
453
11
 *
454
12
 * This program is distributed in the hope that it will be useful, but
455
13
 * WITHOUT ANY WARRANTY; without even the implied warranties of
456
14
 * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
457
15
 * PURPOSE.  See the GNU General Public License for more details.
458
16
 *
459
17
 * You should have received a copy of the GNU General Public License along
460
18
 * with this program.  If not, see <http://www.gnu.org/licenses/>.
461
19
 */
462
20
463
21
import QtQuick 2.0
464
22
import SystemSettings 1.0
465
23
import Ubuntu.Components 1.1
466
24
import Ubuntu.Components.Popups 0.1
467
25
import Ubuntu.Components.ListItems 0.1 as ListItem
468
26
import MeeGo.QOfono 0.2
469
27
import Ubuntu.SystemSettings.Cellular 1.0
470
28
471
29
ItemPage {
472
30
    id: root
473
31
    title: i18n.tr("APN")
474
32
    objectName: "apnPage"
475
33
476
34
    property var sim
477
35
478
36
    QtObject {
479
37
        id: d
480
38
481
39
        // map of contextPath : connCtx
482
40
        property var mContexts: ({})
483
41
484
42
        readonly property string mCustomContextNameInternet: "___ubuntu_custom_apn_internet"
485
43
        readonly property string mCustomContextNameMms: "___ubuntu_custom_apn_mms"
486
44
        property var mCustomContextInternet : undefined
487
45
        property var mCustomContextMms : undefined
488
46
489
47
        // LP(:#1362795)
490
48
        property var pendingCustomMmsData : ({})
491
49
492
50
        // suppress any actions that we don't want to take
493
51
        // when updating selectedIndexes, etc
494
52
        property bool __suppressActivation : true;
495
53
496
54
        function isEmptyCustom (type, ctx)
497
55
        {
498
56
            /* OK, this sucks _hard_,
499
57
             * QOfono does not return the added context, so instead we have to "figure it out"
500
58
             * by looking for "contextAdded" for totally empty context with default Name values.
501
59
             * LP(#1361864)
502
60
             */
503
61
504
62
            var targetName = "";
505
63
            var targetAccessPointName = "";
506
64
            if (type === "internet") {
507
65
                targetName = "Internet";
508
66
                targetAccessPointName = "";
509
67
            } else if (type == "mms") {
510
68
                targetName = "MMS";
511
69
                targetAccessPointName = "";
512
70
            }
513
71
514
72
            if (ctx.type === type &&
515
73
                ctx.name === targetName &&
516
74
                ctx.accessPointName === targetAccessPointName)
517
75
                return true;
518
76
            return false;
519
77
        }
520
78
521
79
        function updateContexts()
522
80
        {
523
81
            var tmp = sim.connMan.contexts.slice(0);
524
82
            var added = tmp.filter(function(i) {
525
83
                return mContexts[i] === undefined;
526
84
            });
527
85
            var removed = Object.keys(mContexts).filter(function(i) {
528
86
                return tmp.indexOf(i) === -1;
529
87
            })
530
88
531
89
            removed.forEach(function(currentValue, index, array) {
532
90
                // just asserting to verify the logic
533
91
                // remove once proven functional
534
92
                if (mContexts[currentValue] === undefined) {
535
93
                    throw "updateContexts: removed is broken";
536
94
                }
537
95
538
96
                if (mContexts[currentValue].name === mCustomContextNameInternet)
539
97
                    mCustomContextInternet = undefined
540
98
                else if (mContexts[currentValue].name === mCustomContextNameMms)
541
99
                    mCustomContextMms = undefined
542
100
543
101
                mContexts[currentValue].destroy();
544
102
                delete mContexts[currentValue];
545
103
            });
546
104
547
105
            added.forEach(function(currentValue, index, array) {
548
106
                // just asserting to verify the logic
549
107
                // remove once proven functional
550
108
                if (mContexts[currentValue] !== undefined) {
551
109
                    throw "updateContexts: added is broken";
552
110
                }
553
111
554
112
                var ctx = connCtx.createObject(parent,
555
113
                                               {
556
114
                                                   "contextPath": currentValue
557
115
                                               });
558
116
                mContexts[currentValue] = ctx;
559
117
560
118
                if (isEmptyCustom("internet", ctx))
561
119
                {
562
120
                    ctx.name = mCustomContextNameInternet;
563
121
                    // name updates async, so return here and
564
122
                    // have the buildLists() called from Context::onNameChanged
565
123
                    return;
566
124
                } else if (isEmptyCustom("mms", ctx))
567
125
                {
568
126
                    ctx.name = mCustomContextNameMms;
569
127
                    ctx.accessPointName = pendingCustomMmsData["accessPointName"];
570
128
                    ctx.username = pendingCustomMmsData["username"];
571
129
                    ctx.password = pendingCustomMmsData["password"];
572
130
                    ctx.messageCenter = pendingCustomMmsData["messageCenter"];
573
131
                    ctx.messageProxy = pendingCustomMmsData["messageProxy"];
574
132
                    pendingCustomMmsData = ({});
575
133
                    // values update async, so return here and
576
134
                    // have the buildLists() called from Context::onNameChanged
577
135
                    return;
578
136
                }
579
137
            });
580
138
581
139
            // just asserting to verify the logic
582
140
            // remove once proven functional
583
141
            if (Object.keys(mContexts).length !== tmp.length) {
584
142
                throw "Object.keys(contexts).length !== tmp.length";
585
143
            }
586
144
            tmp.forEach(function(currentValue, index, array) {
587
145
                if (mContexts[currentValue] === undefined)
588
146
                    throw "contexts[currentValue] === undefined";
589
147
            });
590
148
591
149
            buildLists();
592
150
        }
593
151
594
152
        // expects updateContexts() to have ran before executing.
595
153
        function checkAndCreateCustomContexts()
596
154
        {
597
155
            var customInternet = Object.keys(mContexts).filter(function (i) {
598
156
                var ctx = mContexts[i];
599
157
                return ctx.name === mCustomContextNameInternet ||
600
158
                       isEmptyCustom("internet", ctx);
601
159
            });
602
160
            var customMms = Object.keys(mContexts).filter(function (i) {
603
161
                var ctx = mContexts[i];
604
162
                return ctx.name === mCustomContextNameMms ||
605
163
                       isEmptyCustom("mms", ctx);
606
164
            });
607
165
608
166
            // make sure there is only one context per type
609
167
            if (customInternet.length > 1) {
610
168
                customInternet.forEach(function(currentValue, index, array) {
611
169
                   if (index === 0)
612
170
                       return;
613
171
                   sim.connMan.removeContext(currentValue);
614
172
                });
615
173
            }
616
174
            if (customMms.length > 1) {
617
175
                customMms.forEach(function(currentValue, index, array) {
618
176
                   if (index === 0)
619
177
                       return;
620
178
                   sim.connMan.removeContext(currentValue);
621
179
                });
622
180
            }
623
181
624
182
            if (customInternet.length === 0) {
625
183
                sim.connMan.addContext("internet");
626
184
            }
627
185
628
186
            // @bug don't create the custom MMS context
629
187
            //      LP(:#1362795)
630
188
            // if (customMms.length === 0) {
631
189
            //     sim.connMan.addContext("mms");
632
190
            // }
633
191
634
192
            buildLists();
635
193
        }
636
194
637
195
        property var mInternetApns : [];
638
196
        property var mMmsApns : [];
639
197
        function buildLists()
640
198
        {
641
199
            d.__suppressActivation = true;
642
200
643
201
            var internet = [];
644
202
            var mms = [];
645
203
646
204
            internet = Object.keys(mContexts).filter(function(i) {
647
205
                var ctx = mContexts[i];
648
206
                if (ctx.type === "internet") {
649
207
                    if (ctx.name === mCustomContextNameInternet) {
650
208
                        mCustomContextInternet = ctx
651
209
                        // don't add yet
652
210
                        return false;
653
211
                    }
654
212
                    return true;
655
213
                }
656
214
                return false;
657
215
            });
658
216
            mms = Object.keys(mContexts).filter(function(i) {
659
217
                var ctx = mContexts[i];
660
218
                if ( ctx.type === "mms") {
661
219
                    if (ctx.name === mCustomContextNameMms) {
662
220
                        mCustomContextMms = ctx;
663
221
                        // don't add yet
664
222
                        return false;
665
223
                    }
666
224
                    return true;
667
225
                }
668
226
                return false;
669
227
            });
670
228
671
229
            // make sure customized are the last on the lists
672
230
            if (mCustomContextInternet !== undefined)
673
231
                internet = internet.concat([mCustomContextInternet.contextPath])
674
232
            if (mCustomContextMms !== undefined)
675
233
                mms = mms.concat([mCustomContextMms.contextPath])
676
234
            else {
677
235
                /// @bug LP(#1361864)
678
236
                // add anyway a "dummy" Custom so we can show at least the one provisioned
679
237
                // MMS context as long as the user does not hit "Custom" in the MMS list.
680
238
                mms = mms.concat(["dummycustom"])
681
239
            }
682
240
683
241
            // add "Same APN as for Internet" to be the first on the MMS list
684
242
            mms = ["/same/as/internet"].concat(mms);
685
243
686
244
            mInternetApns = internet;
687
245
            mMmsApns = mms;
688
246
689
247
            d.__suppressActivation = false;
690
248
        }
691
249
692
250
        function openApnEditor(type) {
693
251
            var ctx;
694
252
            if (type === "internet") {
695
253
                ctx = mCustomContextInternet;
696
254
            } else if (type == "mms") {
697
255
                ctx = mCustomContextMms;
698
256
            }
699
257
            /// can't modify active context
700
258
            if (ctx !== undefined && ctx.active)
701
259
                ctx.active = false;
702
260
703
261
            pageStack.push(Qt.resolvedUrl("CustomApnEditor.qml"),
704
262
                           {
705
263
                               type: type,
706
264
                               contexts: {"internet": mCustomContextInternet,
707
265
                                          "mms":      mCustomContextMms},
708
266
                               activateCb: activateHelper
709
267
                           });
710
268
        }
711
269
712
270
        function activateHelper(type, contextPath, customMmsData) {
713
271
            if (type === "internet")
714
272
                activator.activate(contextPath, sim.simMng.subscriberIdentity, sim.simMng.modemPath)
715
273
            if (type === "mms") {
716
274
                if (contextPath === undefined) {
717
275
                    // LP(:#1362795)
718
276
                    pendingCustomMmsData = customMmsData
719
277
                    /// remove any provisioned ones..
720
278
                    var remove = []
721
279
                    Object.keys(mContexts).forEach(function(currentValue, index, array) {
722
280
                        var ctx = mContexts[currentValue];
723
281
                        if (ctx.type === "mms")
724
282
                            remove = remove.concat([ctx.contextPath])
725
283
                    });
726
284
                    remove.forEach(function(currentValue, index, array) {
727
285
                        sim.connMan.removeContext(currentValue);
728
286
                    });
729
287
                    sim.connMan.addContext("mms")
730
288
                }
731
289
            }
732
290
        }
733
291
    }
734
292
735
293
    OfonoActivator {
736
294
        id:activator
737
295
    }
738
296
739
297
    Component {
740
298
        id: connCtx
741
299
        OfonoContextConnection {
742
300
743
301
            // add helper property to detect dual internet/MMS contexts
744
302
            property bool dual : false
745
303
            Component.onCompleted:{
746
304
                if (type == "internet")
747
305
                    if (messageCenter !== "")
748
306
                        dual = true
749
307
            }
750
308
751
309
            onActiveChanged: if (type === "internet") internetApnSelector.updateSelectedIndex()
752
310
            onNameChanged: d.buildLists()
753
311
            onAccessPointNameChanged: d.buildLists()
754
312
            onReportError: console.error("Context error on " + contextPath + ": " + errorString)
755
313
        }
756
314
    }
757
315
758
316
    Connections {
759
317
        target: sim.connMan
760
318
        onContextsChanged: d.updateContexts()
761
319
762
320
        Component.onCompleted: {
763
321
            d.updateContexts();
764
322
            // do this once.
765
323
            d.checkAndCreateCustomContexts();
766
324
        }
767
325
    }
768
326
769
327
    Flickable {
770
328
        id: scrollWidget
771
329
        anchors.fill: parent
772
330
        contentHeight: contentItem.childrenRect.height
773
331
        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
774
332
        flickableDirection: Flickable.VerticalFlick
775
333
776
334
        Column {
777
335
778
336
            anchors {
779
337
                left: parent.left
780
338
                right: parent.right
781
339
            }
782
340
783
341
            ListItem.Standard {
784
342
                id: heading1
785
343
                objectName: "internetapn"
786
344
                text: i18n.tr("Internet APN:")
787
345
                progression: false
788
346
            }
789
347
            ListItem.ThinDivider {}
790
348
            ListItem.SingleControl {
791
349
                control: ListItem.ItemSelector {
792
350
                    id: internetApnSelector
793
351
                    width: parent.width - units.gu(4)
794
352
                    model: d.mInternetApns
795
353
                    expanded: true
796
354
                    selectedIndex: -1
797
355
                    onModelChanged: updateSelectedIndex()
798
356
799
357
                    function updateSelectedIndex()
800
358
                    {
801
359
                        var tmp = d.__suppressActivation
802
360
                        d.__suppressActivation = true;
803
361
                        var idx = -1;
804
362
                        if (model) {
805
363
                            model.forEach(function(currentValue, index, array) {
806
364
                                if (d.mContexts[currentValue].active)
807
365
                                    idx = index;
808
366
                            });
809
367
                        }
810
368
                        selectedIndex = idx;
811
369
                        d.__suppressActivation = tmp;
812
370
                    }
813
371
814
372
                    delegate: OptionSelectorDelegate {
815
373
                        showDivider: false
816
374
                        text: {
817
375
                            var ctx = d.mContexts[modelData];
818
376
                            if (ctx.name !== "") {
819
377
                                if (ctx.name !== d.mCustomContextNameInternet) {
820
378
                                    return ctx.name
821
379
                                } else {
822
380
                                    //: user visible name of the custom Internet APN
823
381
                                    return i18n.tr("Custom");
824
382
                                }
825
383
                            } else {
826
384
                                return ctx.accessPointName
827
385
                            }
828
386
                        }
829
387
                    }
830
388
                    onSelectedIndexChanged: {
831
389
                        if (selectedIndex === -1) {
832
390
                            if (mmsApnSelector && mmsApnSelector.model[mmsApnSelector.selectedIndex] === "/same/as/internet")
833
391
                                mmsApnSelector.selectedIndex = -1;
834
392
                            return;
835
393
                        }
836
394
837
395
                        var ctx = d.mContexts[model[selectedIndex]];
838
396
                        if(ctx.dual) {
839
397
                            if (!d.mCustomContextMms)
840
398
                                mmsApnSelector.selectedIndex = mmsApnSelector.model.indexOf("/same/as/internet");
841
399
                        }
842
400
                        else if (mmsApnSelector.model[mmsApnSelector.selectedIndex] === "/same/as/internet")
843
401
                            mmsApnSelector.selectedIndex = -1;
844
402
845
403
                        if (d.__suppressActivation)
846
404
                            return;
847
405
848
406
                        if (d.mCustomContextInternet && model[selectedIndex] === d.mCustomContextInternet.contextPath) {
849
407
                            if (d.mCustomContextInternet.accessPointName === "") {
850
408
                                d.openApnEditor("internet");
851
409
                                updateSelectedIndex();
852
410
                                return;
853
411
                            }
854
412
                        }
855
413
856
414
                        d.activateHelper(ctx.contextPath);
857
415
                    }
858
416
                }
859
417
            }
860
418
            ListItem.SingleControl {
861
419
                control: Button {
862
420
                    objectName: "customApnEdit"
863
421
                    text: i18n.tr("Custom Internet APN…")
864
422
                    width: parent.width - units.gu(4)
865
423
                    onClicked: d.openApnEditor("internet")
866
424
                }
867
425
            }
868
426
869
427
            ListItem.Divider {}
870
428
871
429
            ListItem.Standard {
872
430
                id: heading2
873
431
                objectName: "mmsapn"
874
432
                text: i18n.tr("MMS APN:")
875
433
                progression: false
876
434
            }
877
435
            ListItem.ThinDivider {}
878
436
            ListItem.SingleControl {
879
437
                control: ListItem.ItemSelector {
880
438
                    id: mmsApnSelector
881
439
                    width: parent.width - units.gu(4)
882
440
                    model: d.mMmsApns
883
441
                    expanded: true
884
442
                    selectedIndex: -1
885
443
                    delegate: OptionSelectorDelegate {
886
444
                        showDivider: modelData === "/same/as/internet"
887
445
                        enabled: {
888
446
                            if (modelData !== "/same/as/internet")
889
447
                                return true;
890
448
                            else
891
449
                                d.mContexts[internetApnSelector.model[internetApnSelector.selectedIndex]].dual
892
450
                        }
893
451
                        // work around OptionSelectorDelegate not having a visual change depending on being disabled
894
452
                        opacity: enabled ? 1.0 : 0.5
895
453
                        text: {
896
454
                            if (modelData === "/same/as/internet") {
897
455
                                return i18n.tr("Same APN as for Internet");
898
456
                            }
899
457
                            if (modelData === "dummycustom") {
900
458
                                return i18n.tr("Custom");
901
459
                            }
902
460
                            var ctx = d.mContexts[modelData];
903
461
                            if (ctx.name !== "") {
904
462
                                if (ctx.name !== d.mCustomContextNameMms) {
905
463
                                    return ctx.name
906
464
                                } else {
907
465
                                    //: user visible name of the custom MMS APN
908
466
                                    return i18n.tr("Custom");
909
467
                                }
910
468
                            } else {
911
469
                                return ctx.accessPointName
912
470
                            }
913
471
                        }
914
472
                    }
915
473
                    onModelChanged: updateSelectedIndex();
916
474
                    function updateSelectedIndex()
917
475
                    {
918
476
                        // if we have custom MMS context, it must be active.
919
477
                        // @bug LP(#1361864)
920
478
                        var tmp = d.__suppressActivation;
921
479
                        d.__suppressActivation = true;
922
480
                        if (d.mCustomContextMms) {
923
481
                            selectedIndex = model.indexOf(d.mCustomContextMms.contextPath);
924
482
                        } else if (model.length === 3) {
925
483
                            /* meaning we have:
926
484
                             * 0 - /same/as/internet
927
485
                             * 1 - some provisioned one
928
486
                             * 2 - dummycustom
929
487
                             */
930
488
                            selectedIndex = 1;
931
489
                        } else if (internetApnSelector.model && internetApnSelector.selectedIndex !== -1) {
932
490
                            if (d.mContexts[internetApnSelector.model[internetApnSelector.selectedIndex]].dual) {
933
491
                                selectedIndex = model.indexOf("/same/as/internet");
934
492
                            } else
935
493
                                selectedIndex = -1;
936
494
                        } else {
937
495
                            selectedIndex = -1;
938
496
                        }
939
497
                        d.__suppressActivation = tmp;
940
498
                    }
941
499
942
500
                    onSelectedIndexChanged: {
943
501
                        if (selectedIndex === -1 || d.__suppressActivation)
944
502
                            return;
945
503
946
504
                        if (model[selectedIndex] === "/same/as/internet") {
947
505
                            // @bug delete _any_ actual MMS context
948
506
                            //      LP:(#1362795)
949
507
                            var remove = [];
950
508
                            Object.keys(d.mContexts).forEach(function(currentValue, index, array) {
951
509
                                var ctx = d.mContexts[currentValue];
952
510
                                if (ctx.type === "mms")
953
511
                                    remove = remove.concat([ctx.contextPath]);
954
512
                            });
955
513
                            remove.forEach(function(currentValue, index, array) {
956
514
                                sim.connMan.removeContext(currentValue);
957
515
                            });
958
516
                            return;
959
517
                        }
960
518
961
519
                        if (model[selectedIndex] === "dummycustom") {
962
520
                            d.openApnEditor("mms");
963
521
                            updateSelectedIndex()
964
522
                            return;
965
523
                        }
966
524
967
525
                        // no need to "activate" anything.
968
526
                        // just fall through return here.
969
527
                        // once we actually are able to suppport multiple MMS contexts
970
528
                        // on the system, add some code here to set one of them active
971
529
                    }
972
530
                }
973
531
            }
974
532
            ListItem.SingleControl {
975
533
                control: Button {
976
534
                    objectName: "customApnEdit"
977
535
                    text: i18n.tr("Custom MMS APN…")
978
536
                    width: parent.width - units.gu(4)
979
537
                    onClicked: d.openApnEditor("mms")
980
538
                }
981
539
            }
982
540
983
541
            // @todo: no means of doing any meaningful reset right now.
984
542
            // LP(#1338758)
985
543
            // ListItem.ThinDivider {}
986
544
            // ListItem.SingleControl {
987
545
            //     control: Button {
988
546
            //         objectName: "resetButton"
989
547
            //         text: i18n.tr("Reset APN Settings")
990
548
            //         width: parent.width - units.gu(4)
991
549
            //         onClicked: {
992
550
            //             PopupUtils.open(resetDialog)
993
551
            //         }
994
552
            //     }
995
553
            // }
996
554
        }
997
555
    }
998
556
999
557
    Component {
1000
558
         id: resetDialog
1001
559
         Dialog {
1002
560
             id: dialogue
1003
561
             title: i18n.tr("Reset APN Settings")
1004
562
             text: i18n.tr("Are you sure that you want to Reset APN Settings?")
1005
563
             Button {
1006
564
                 text: i18n.tr("Cancel")
1007
565
                 onClicked: PopupUtils.close(dialogue)
1008
566
             }
1009
567
             Button {
1010
568
                 text: i18n.tr("Reset")
1011
569
                 color: UbuntuColors.orange
1012
570
                 onClicked: {
1013
571
                     // delete all APNs
1014
572
                     // kick ofono per
1015
573
                     // https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1338758
1016
574
1017
575
                 }
1018
576
             }
1019
577
1020
578
         }
1021
579
    }
1022
580
}
1023
0
581
1024
=== modified file 'plugins/cellular/PageChooseCarrier.qml'
1025
--- plugins/cellular/PageChooseCarrier.qml	2014-07-24 19:00:45 +0000
1026
+++ plugins/cellular/PageChooseCarrier.qml	2014-10-03 20:40:51 +0000
1027
@@ -19,55 +19,104 @@
1028
19
 */
19
 */
1029
20
20
1030
21
import QtQuick 2.0
21
import QtQuick 2.0
1031
22
import QtQuick.Layouts 1.1
1032
22
import SystemSettings 1.0
23
import SystemSettings 1.0
1035
23
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.1
1036
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 1.0 as ListItem
1037
25
import MeeGo.QOfono 0.2
26
import MeeGo.QOfono 0.2
1038
26
27
1039
27
ItemPage {
28
ItemPage {
1041
28
    title: title
29
    id: root
1042
30
    title: i18n.tr("Carrier")
1043
31
1044
29
    objectName: "chooseCarrierPage"
32
    objectName: "chooseCarrierPage"
1045
30
33
1049
31
    property var netReg
34
    property var sim
1050
32
    property var operators: []
35
1048
33
    property bool scanning: false
1051
34
    property variant operatorNames
36
    property variant operatorNames
1055
35
    property variant operatorStatus
37
    property int mode
1056
36
    property int curOp
38
1057
37
    Component.onCompleted: buildLists();
39
    QtObject {
1058
40
        id: d
1059
41
        property bool __suppressActivation : true;
1060
42
    }
1061
43
1062
44
    Component.onCompleted: {
1063
45
        updateNetworkOperators();
1064
46
    }
1065
38
47
1066
39
    Connections {
48
    Connections {
1078
40
        target: netReg
49
        target: sim.netReg
1079
41
        onStatusChanged: {
50
        onNetworkOperatorsChanged: updateNetworkOperators();
1080
42
            if (netReg.status === "registered")
51
        onCurrentOperatorPathChanged: buildLists();
1081
43
                buildLists();
52
    }
1082
44
        }
53
1083
45
        onNetworkOperatorsChanged: buildLists();
54
    // map of operatorPath : netOp
1084
46
        onScanFinished: scanning = false;
55
    // FIXME: comment on operators' value
1085
47
        onScanError: {
56
    property var operators: ({})
1086
48
            scanning = false;
57
    function updateNetworkOperators()
1087
49
            console.warn ("onScanError: " + message);
58
    {
1088
50
        }
59
        var tmp = sim.netReg.networkOperators;
1089
60
        var added = tmp.filter(function(i) {
1090
61
            return operators[i] === undefined;
1091
62
        });
1092
63
        var removed = Object.keys(operators).filter(function(i) {
1093
64
            return tmp.indexOf(i) === -1;
1094
65
        })
1095
66
1096
67
        removed.forEach(function(currentValue, index, array) {
1097
68
            // just asserting to verify the logic
1098
69
            // remove once proven functional
1099
70
            if (operators[currentValue] === undefined) {
1100
71
                throw "updateNetworkOperators: removed is broken";
1101
72
            }
1102
73
1103
74
            operators[currentValue].destroy();
1104
75
            delete operators[currentValue];
1105
76
        });
1106
77
1107
78
        added.forEach(function(currentValue, index, array) {
1108
79
            // just asserting to verify the logic
1109
80
            // remove once proven functional
1110
81
            if (operators[currentValue] !== undefined) {
1111
82
                throw "updateNetworkOperators: added is broken";
1112
83
            }
1113
84
1114
85
            operators[currentValue] = netOp.createObject(parent,
1115
86
                                                         {
1116
87
                                                             "operatorPath": currentValue
1117
88
                                                         });
1118
89
        });
1119
90
1120
91
        // just asserting to verify the logic
1121
92
        // remove once proven functional
1122
93
        if (Object.keys(operators).length !== tmp.length) {
1123
94
            throw "Object.keys(operators).length !== tmp.length";
1124
95
        }
1125
96
        tmp.forEach(function(currentValue, index, array) {
1126
97
            if (operators[currentValue] === undefined)
1127
98
                throw "operators[currentValue] === undefined";
1128
99
        });
1129
100
1130
101
        buildLists();
1131
51
    }
102
    }
1132
52
103
1133
53
    function buildLists()
104
    function buildLists()
1134
54
    {
105
    {
1136
55
        var ops = [];
106
        d.__suppressActivation = true;
1137
56
        var oN = new Array();
107
        var oN = new Array();
1141
57
        var oS = new Array();
108
1142
58
        for (var i = 0; i < netReg.networkOperators.length; i++) {
109
        for (var i in operators) {
1143
59
            var tempOp = netOp.createObject(parent, {"operatorPath": netReg.networkOperators[i]});
110
            var tempOp = operators[i];
1144
60
            if (tempOp.status === "forbidden")
111
            if (tempOp.status === "forbidden")
1145
61
                continue
112
                continue
1146
62
            oN.push(tempOp.name);
113
            oN.push(tempOp.name);
1147
63
            oS.push(tempOp.status);
1148
64
            ops.push(tempOp)
1149
65
        }
114
        }
1150
66
        curOp = oS.indexOf("current");
1151
67
        operatorNames = oN;
115
        operatorNames = oN;
1155
68
        operatorStatus = oS;
116
1156
69
        operators = ops;
117
        var cur = operators[sim.netReg.currentOperatorPath];
1157
70
        carrierSelector.selectedIndex = curOp;
118
        carrierSelector.selectedIndex = cur === undefined ? -1 : operatorNames.indexOf(cur.name);
1158
119
        d.__suppressActivation = false;
1159
71
    }
120
    }
1160
72
121
1161
73
    Component {
122
    Component {
1162
@@ -78,78 +127,114 @@
1163
78
                    console.warn("registerComplete failed with error: " + errorString);
127
                    console.warn("registerComplete failed with error: " + errorString);
1164
79
                } else if (error !== OfonoNetworkOperator.NoError) {
128
                } else if (error !== OfonoNetworkOperator.NoError) {
1165
80
                    console.warn("registerComplete failed with error: " + errorString + " Falling back to default");
129
                    console.warn("registerComplete failed with error: " + errorString + " Falling back to default");
1167
81
                    netReg.registration();
130
                    sim.netReg.registration();
1168
82
                }
131
                }
1169
83
            }
132
            }
1170
133
            onNameChanged:  buildLists();
1171
134
            onStatusChanged: buildLists();
1172
84
        }
135
        }
1173
85
    }
136
    }
1174
86
137
1175
87
    Flickable {
138
    Flickable {
1176
139
        id: scrollWidget
1177
88
        anchors.fill: parent
140
        anchors.fill: parent
1178
89
        contentWidth: parent.width
141
        contentWidth: parent.width
1179
90
        contentHeight: parent.height
142
        contentHeight: parent.height
1180
91
        boundsBehavior: (contentHeight > parent.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
143
        boundsBehavior: (contentHeight > parent.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
1181
92
144
1185
93
        Column {
145
        ColumnLayout {
1186
94
            anchors.left: parent.left
146
1187
95
            anchors.right: parent.right
147
            anchors {
1188
148
                left: parent.left
1189
149
                right: parent.right
1190
150
            }
1191
96
151
1192
97
            ListItem.ItemSelector {
152
            ListItem.ItemSelector {
1193
98
                id: chooseCarrier
153
                id: chooseCarrier
1194
99
                objectName: "autoChooseCarrierSelector"
154
                objectName: "autoChooseCarrierSelector"
1195
100
                expanded: true
155
                expanded: true
1197
101
                enabled: netReg.mode !== "auto-only"
156
                enabled: sim.netReg.mode !== "auto-only"
1198
102
                text: i18n.tr("Choose carrier:")
157
                text: i18n.tr("Choose carrier:")
1199
103
                model: [i18n.tr("Automatically"), i18n.tr("Manually")]
158
                model: [i18n.tr("Automatically"), i18n.tr("Manually")]
1201
104
                selectedIndex: netReg.mode === "manual" ? 1 : 0
159
1202
160
                delegate: OptionSelectorDelegate { showDivider: false }
1203
161
                selectedIndex: sim.netReg.mode === "manual" ? 1 : 0
1204
162
1205
163
                // we only want to do this per user input
1206
105
                onSelectedIndexChanged: {
164
                onSelectedIndexChanged: {
1209
106
                    if (selectedIndex === 0)
165
                    if (selectedIndex === -1 || d.__suppressActivation)
1210
107
                        netReg.registration();
166
                        return;
1211
167
1212
168
                    if (selectedIndex === 0) {
1213
169
                        sim.netReg.registration();
1214
170
                    } else if (selectedIndex === 1) {
1215
171
                        if (sim.netReg.status !== "searching")
1216
172
                            sim.netReg.scan();
1217
173
                    }
1218
108
                }
174
                }
1219
109
            }
175
            }
1225
110
176
            ListItem.SingleControl {
1221
111
            ListItem.ItemSelector {
1222
112
                id: carrierSelector
1223
113
                objectName: "carrierSelector"
1224
114
                expanded: enabled
1226
115
                enabled: chooseCarrier.selectedIndex === 1
177
                enabled: chooseCarrier.selectedIndex === 1
1264
116
                model: operatorNames
178
                anchors {
1265
117
                onSelectedIndexChanged: {
179
                    left: parent.left
1266
118
                    if ((selectedIndex !== curOp) && operators[selectedIndex]) {
180
                    leftMargin: units.gu(0)
1267
119
                        operators[selectedIndex].registerOperator();
181
                }
1268
120
                    }
182
                control: ColumnLayout {
1269
121
                }
183
                    id: child
1270
122
            }
184
                    width: parent.width - units.gu(4)
1271
123
        }
185
                    anchors.left: parent.left
1272
124
186
                    RowLayout {
1273
125
        ListItem.SingleControl {
187
                        id: searchingRow
1274
126
            anchors.bottom: parent.bottom
188
                        spacing: units.gu(1)
1275
127
            control: Button {
189
1276
128
                objectName: "refreshButton"
190
                        visible: sim.netReg.status === "searching"
1277
129
                width: parent.width - units.gu(4)
191
                        ActivityIndicator {
1278
130
                text: i18n.tr("Refresh")
192
                            id: activityIndicator
1279
131
                enabled: (netReg.status !== "searching") && (netReg.status !== "denied")
193
                            anchors.verticalCenter: parent.verticalCenter
1280
132
                onTriggered: {
194
                            running: parent.visible
1281
133
                    scanning = true;
195
                        }
1282
134
                    netReg.scan();
196
                        Label {
1283
135
                }
197
                            anchors.verticalCenter: parent.verticalCenter
1284
136
            }
198
                            text: i18n.tr("Searching for carriers…")
1285
137
        }
199
                        }
1286
138
200
                    }
1287
139
        ActivityIndicator {
201
                    ListItem.ItemSelector {
1288
140
            id: activityIndicator
202
                        id: carrierSelector
1289
141
            anchors.centerIn: parent
203
                        objectName: "carrierSelector"
1290
142
            running: scanning
204
                        expanded: true
1291
143
        }
205
                        enabled: sim.netReg.status !== "searching" && chooseCarrier.selectedIndex === 1
1292
144
206
                        // work around ItemSelector not having a visual change depending on being disabled
1293
145
        Label {
207
                        opacity: enabled ? 1.0 : 0.5
1294
146
            anchors {
208
                        width: parent.width
1295
147
                top: activityIndicator.bottom
209
                        model: operatorNames
1296
148
                topMargin: units.gu(2)
210
                        delegate: OptionSelectorDelegate { enabled: carrierSelector.enabled; showDivider: false }
1297
149
                horizontalCenter: activityIndicator.horizontalCenter
211
                        onSelectedIndexChanged: {
1298
150
            }
212
                            if (selectedIndex === -1 || d.__suppressActivation)
1299
151
            text: i18n.tr("Searching")
213
                                return;
1300
152
            visible: activityIndicator.running
214
1301
215
                            // this assumes operator names are unique,
1302
216
                            // revise if not so
1303
217
                            for (var op in operators) {
1304
218
                                if (operators[op].name === operatorNames[selectedIndex]) {
1305
219
                                    operators[op].registerOperator();
1306
220
                                    return;
1307
221
                                }
1308
222
                            }
1309
223
                            // just asserting to verify the logic
1310
224
                            // remove once proven functional
1311
225
                            throw "should not be reached.";
1312
226
                        }
1313
227
                    }
1314
228
                }
1315
229
            }
1316
230
            ListItem.Standard {
1317
231
                text: i18n.tr("APN")
1318
232
                progression: true
1319
233
                enabled: sim.connMan.powered
1320
234
                onClicked: {
1321
235
                    pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {sim: sim})
1322
236
                }
1323
237
            }
1324
153
        }
238
        }
1325
154
    }
239
    }
1326
155
}
240
}
1327
156
241
1328
=== modified file 'plugins/cellular/PageChooseCarriers.qml'
1329
--- plugins/cellular/PageChooseCarriers.qml	2014-08-17 14:50:51 +0000
1330
+++ plugins/cellular/PageChooseCarriers.qml	2014-10-03 20:40:51 +0000
1331
@@ -21,7 +21,6 @@
1332
21
import SystemSettings 1.0
21
import SystemSettings 1.0
1333
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
1334
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 0.1 as ListItem
1335
24
import MeeGo.QOfono 0.2
1336
25
24
1337
26
ItemPage {
25
ItemPage {
1338
27
    id: root
26
    id: root
1339
@@ -50,7 +49,7 @@
1340
50
                progression: true
49
                progression: true
1341
51
                onClicked: {
50
                onClicked: {
1342
52
                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
51
                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
1344
53
                        netReg: sims[0].netReg,
52
                        sim: sims[0],
1345
54
                        title: sims[0].title
53
                        title: sims[0].title
1346
55
                    })
54
                    })
1347
56
                }
55
                }
1348
@@ -66,7 +65,7 @@
1349
66
                progression: true
65
                progression: true
1350
67
                onClicked: {
66
                onClicked: {
1351
68
                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
67
                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
1353
69
                        netReg: sims[1].netReg,
68
                        sim: sims[1],
1354
70
                        title: sims[1].title
69
                        title: sims[1].title
1355
71
                    })
70
                    })
1356
72
                }
71
                }
1357
73
72
1358
=== modified file 'plugins/cellular/PageComponent.qml'
1359
--- plugins/cellular/PageComponent.qml	2014-08-19 10:58:01 +0000
1360
+++ plugins/cellular/PageComponent.qml	2014-10-03 20:40:51 +0000
1361
@@ -47,7 +47,7 @@
1362
47
            name: "singleSim"
47
            name: "singleSim"
1363
48
            StateChangeScript {
48
            StateChangeScript {
1364
49
                script: loader.setSource("Components/SingleSim.qml", {
49
                script: loader.setSource("Components/SingleSim.qml", {
1366
50
                    sim: Sims.get(0)
50
                    sim: Sims.getFirstPresent()
1367
51
                })
51
                })
1368
52
            }
52
            }
1369
53
            when: simsLoaded && (Sims.getPresentCount() === 1)
53
            when: simsLoaded && (Sims.getPresentCount() === 1)
1370
54
54
1371
=== added file 'plugins/cellular/ofonoactivator.cpp'
1372
--- plugins/cellular/ofonoactivator.cpp	1970-01-01 00:00:00 +0000
1373
+++ plugins/cellular/ofonoactivator.cpp	2014-10-03 20:40:51 +0000
1374
@@ -0,0 +1,119 @@
1375
1
/*
1376
2
 * Copyright (C) 2014 Canonical, Ltd.
1377
3
 *
1378
4
 * Authors:
1379
5
 *    Jussi Pakkanen <jussi.pakkanen@canonical.com>
1380
6
 *
1381
7
 * This program is free software: you can redistribute it and/or modify it
1382
8
 * under the terms of the GNU General Public License version 3, as published
1383
9
 * by the Free Software Foundation.
1384
10
 *
1385
11
 * This library is distributed in the hope that it will be useful, but WITHOUT
1386
12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
1387
13
 * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
1388
14
 * details.
1389
15
 *
1390
16
 * You should have received a copy of the GNU General Public License
1391
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1392
18
 */
1393
19
1394
20
#include "ofonoactivator.h"
1395
21
1396
22
#include"nm_manager_proxy.h"
1397
23
#include"nm_settings_proxy.h"
1398
24
#include"nm_settings_connection_proxy.h"
1399
25
#include<QCoreApplication>
1400
26
1401
27
typedef QMap<QString,QVariantMap> Vardict;
1402
28
Q_DECLARE_METATYPE(Vardict)
1403
29
1404
30
namespace {
1405
31
1406
32
QString nmService("org.freedesktop.NetworkManager");
1407
33
QString nmSettingsPath("/org/freedesktop/NetworkManager/Settings");
1408
34
QString nmPath("/org/freedesktop/NetworkManager");
1409
35
1410
36
QDBusObjectPath detectConnection(const QString &ofonoContext, const QString imsi) {
1411
37
    auto ofonoContextBase = ofonoContext.split('/').back();
1412
38
    auto target = "/" + imsi + "/" + ofonoContextBase;
1413
39
1414
40
    OrgFreedesktopNetworkManagerSettingsInterface settings(nmService, nmSettingsPath,
1415
41
            QDBusConnection::systemBus());
1416
42
    auto reply = settings.ListConnections();
1417
43
    reply.waitForFinished();
1418
44
    if(!reply.isValid()) {
1419
45
        qWarning() << "Error getting connection list: " << reply.error().message() << "\n";
1420
46
    }
1421
47
    auto connections = reply.value(); // Empty list if failed.
1422
48
1423
49
    for(const auto &c : connections) {
1424
50
        OrgFreedesktopNetworkManagerSettingsConnectionInterface connProxy(nmService,
1425
51
                c.path(), QDBusConnection::systemBus());
1426
52
        auto reply2 = connProxy.GetSettings();
1427
53
        reply2.waitForFinished();
1428
54
        if(!reply2.isValid()) {
1429
55
            qWarning() << "Error getting property: " << reply2.error().message() << "\n";
1430
56
            continue;
1431
57
        }
1432
58
        auto settings = reply2.value();
1433
59
        auto id = settings["connection"]["id"].toString();
1434
60
        if(id == target) {
1435
61
            return c;
1436
62
        }
1437
63
    }
1438
64
    return QDBusObjectPath("");
1439
65
}
1440
66
1441
67
QDBusObjectPath detectDevice(const QString &modemPath) {
1442
68
    OrgFreedesktopNetworkManagerInterface nm(nmService, nmPath, QDBusConnection::systemBus());
1443
69
    auto reply = nm.GetDevices();
1444
70
    reply.waitForFinished();
1445
71
    auto devices = reply.value();
1446
72
1447
73
    for(const auto &device : devices) {
1448
74
        QDBusInterface iface(nmService, device.path(), "org.freedesktop.DBus.Properties",
1449
75
                QDBusConnection::systemBus());
1450
76
        QDBusReply<QDBusVariant> ifaceReply = iface.call("Get",
1451
77
                "org.freedesktop.NetworkManager.Device", "Interface");
1452
78
        if(!ifaceReply.isValid()) {
1453
79
            qWarning() << "Error getting property: " << ifaceReply.error().message() << "\n";
1454
80
            continue;
1455
81
        }
1456
82
        auto devIface = ifaceReply.value().variant().toString();
1457
83
        if(devIface == modemPath) {
1458
84
            return device;
1459
85
        }
1460
86
    }
1461
87
    return QDBusObjectPath("");
1462
88
}
1463
89
}
1464
90
1465
91
void activateOfono(QDBusObjectPath connection, QDBusObjectPath device)
1466
92
{
1467
93
    OrgFreedesktopNetworkManagerInterface nm(nmService, nmPath, QDBusConnection::systemBus());
1468
94
    nm.ActivateConnection(connection, device, QDBusObjectPath("/"));
1469
95
}
1470
96
1471
97
OfonoActivator::OfonoActivator(QObject *parent) : QObject(parent) {
1472
98
    static bool isRegistered = false;
1473
99
    if(!isRegistered) {
1474
100
        qDBusRegisterMetaType<Vardict>();
1475
101
        isRegistered = true;
1476
102
    }
1477
103
}
1478
104
1479
105
Q_INVOKABLE bool OfonoActivator::activate(const QString ofonoContext, const QString imsi, const QString modemPath)
1480
106
{
1481
107
    auto dev = detectDevice(modemPath);
1482
108
    if(dev.path() == "") {
1483
109
        qWarning() << "Could not detect device object to use for Ofono activation.\n";
1484
110
        return false;
1485
111
    }
1486
112
    auto conn = detectConnection(ofonoContext, imsi);
1487
113
    if(conn.path() == "") {
1488
114
        qWarning() << "Could not detect connection object to use for Ofono activation.\n";
1489
115
        return false;
1490
116
    }
1491
117
    activateOfono(conn, dev);
1492
118
    return true;
1493
119
}
1494
0
120
1495
=== added file 'plugins/cellular/ofonoactivator.h'
1496
--- plugins/cellular/ofonoactivator.h	1970-01-01 00:00:00 +0000
1497
+++ plugins/cellular/ofonoactivator.h	2014-10-03 20:40:51 +0000
1498
@@ -0,0 +1,42 @@
1499
1
/*
1500
2
 * Copyright (C) 2014 Canonical, Ltd.
1501
3
 *
1502
4
 * Authors:
1503
5
 *    Jussi Pakkanen <jussi.pakkanen@canonical.com>
1504
6
 *
1505
7
 * This program is free software: you can redistribute it and/or modify it
1506
8
 * under the terms of the GNU General Public License version 3, as published
1507
9
 * by the Free Software Foundation.
1508
10
 *
1509
11
 * This library is distributed in the hope that it will be useful, but WITHOUT
1510
12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
1511
13
 * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
1512
14
 * details.
1513
15
 *
1514
16
 * You should have received a copy of the GNU General Public License
1515
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1516
18
 */
1517
19
1518
20
#ifndef OFONO_ACTIVATOR
1519
21
#define OFONO_ACTIVATOR
1520
22
1521
23
#include <QObject>
1522
24
1523
25
/**
1524
26
 * For exposing ofono controls to qml.
1525
27
 */
1526
28
1527
29
class OfonoActivator : public QObject {
1528
30
    Q_OBJECT
1529
31
1530
32
public:
1531
33
    OfonoActivator(QObject *parent = nullptr);
1532
34
    ~OfonoActivator() {};
1533
35
1534
36
    Q_INVOKABLE bool activate(const QString ofonoContext,  const QString imsi, const QString modemPath);
1535
37
1536
38
private:
1537
39
};
1538
40
1539
41
1540
42
#endif
1541
0
43
1542
=== modified file 'plugins/cellular/plugin.cpp'
1543
--- plugins/cellular/plugin.cpp	2014-07-23 13:44:31 +0000
1544
+++ plugins/cellular/plugin.cpp	2014-10-03 20:40:51 +0000
1545
@@ -20,11 +20,13 @@
1546
20
#include <QtQml>
20
#include <QtQml>
1547
21
#include <QtQml/QQmlContext>
21
#include <QtQml/QQmlContext>
1548
22
#include "hotspotmanager.h"
22
#include "hotspotmanager.h"
1549
23
#include "ofonoactivator.h"
1550
23
24
1551
24
void BackendPlugin::registerTypes(const char *uri)
25
void BackendPlugin::registerTypes(const char *uri)
1552
25
{
26
{
1553
26
    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
27
    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
1554
27
    qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
28
    qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
1555
29
    qmlRegisterType<OfonoActivator>(uri, 1, 0, "OfonoActivator");
1556
28
}
30
}
1557
29
31
1558
30
void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
32
void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
1559
31
33
1560
=== modified file 'plugins/cellular/sims.js'
1561
--- plugins/cellular/sims.js	2014-08-19 10:58:01 +0000
1562
+++ plugins/cellular/sims.js	2014-10-03 20:40:51 +0000
1563
@@ -13,6 +13,10 @@
1564
13
    return getAll()[n];
13
    return getAll()[n];
1565
14
}
14
}
1566
15
15
1567
16
function getFirstPresent () {
1568
17
    return getPresent()[0];
1569
18
}
1570
19
1571
16
function getCount () {
20
function getCount () {
1572
17
    return getAll().length;
21
    return getAll().length;
1573
18
}
22
}
1574
19
23
1575
=== modified file 'plugins/phone/PageComponent.qml'
1576
--- plugins/phone/PageComponent.qml	2014-08-28 17:33:40 +0000
1577
+++ plugins/phone/PageComponent.qml	2014-10-03 20:40:51 +0000
1578
@@ -46,8 +46,9 @@
1579
46
        State {
46
        State {
1580
47
            name: "singleSim"
47
            name: "singleSim"
1581
48
            StateChangeScript {
48
            StateChangeScript {
1584
49
                script: loader.setSource("SingleSim.qml", { sim: Sims.get(0) })
49
                script: loader.setSource("SingleSim.qml", {
1585
50
50
                    sim: Sims.getFirstPresent()
1586
51
                })
1587
51
            }
52
            }
1588
52
            when: simsLoaded && (Sims.getPresentCount() === 1)
53
            when: simsLoaded && (Sims.getPresentCount() === 1)
1589
53
        },
54
        },
1590
54
55
1591
=== modified file 'plugins/phone/sims.js'
1592
--- plugins/phone/sims.js	2014-08-19 15:59:18 +0000
1593
+++ plugins/phone/sims.js	2014-10-03 20:40:51 +0000
1594
@@ -13,6 +13,10 @@
1595
13
    return getAll()[n];
13
    return getAll()[n];
1596
14
}
14
}
1597
15
15
1598
16
function getFirstPresent () {
1599
17
    return getPresent()[0];
1600
18
}
1601
19
1602
16
function getCount () {
20
function getCount () {
1603
17
    return getAll().length;
21
    return getAll().length;
1604
18
}
22
}
1605
19
23
1606
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
1607
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-09-26 12:52:31 +0000
1608
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-03 20:40:51 +0000
1609
@@ -110,7 +110,6 @@
1610
110
                                        dbusmock.DBusTestCase):
110
                                        dbusmock.DBusTestCase):
1611
111
    """Class for cellular tests which sets up an Ofono mock """
111
    """Class for cellular tests which sets up an Ofono mock """
1612
112
112
1613
113
    technology_preference = 'gsm'
1614
114
    use_sims = 1
113
    use_sims = 1
1615
115
114
1616
116
    @property
115
    @property
1617
@@ -183,11 +182,12 @@
1618
183
            ]
182
            ]
1619
184
        )
183
        )
1620
185
184
1626
186
    def mock_radio_settings(self, modem):
185
    def mock_radio_settings(self, modem, preference='gsm',
1627
187
        modem.AddProperty(
186
                            technologies=['gsm', 'umts', 'lte']):
1628
188
            RDO_IFACE, 'TechnologyPreference', self.technology_preference)
187
        modem.AddProperty(
1629
189
        modem.AddProperty(
188
            RDO_IFACE, 'TechnologyPreference', preference)
1630
190
            RDO_IFACE, 'ModemTechnologies', ['gsm', 'umts', 'lte'])
189
        modem.AddProperty(
1631
190
            RDO_IFACE, 'ModemTechnologies', technologies)
1632
191
        modem.AddMethods(
191
        modem.AddMethods(
1633
192
            RDO_IFACE,
192
            RDO_IFACE,
1634
193
            [('GetProperties', '', 'a{sv}',
193
            [('GetProperties', '', 'a{sv}',
1635
@@ -260,7 +260,7 @@
1636
260
                self.get_all_operators(second_modem)),
260
                self.get_all_operators(second_modem)),
1637
261
        ])
261
        ])
1638
262
        self.mock_carriers(second_modem)
262
        self.mock_carriers(second_modem)
1640
263
        self.mock_radio_settings(self.modem_1)
263
        self.mock_radio_settings(self.modem_1, technologies=['gsm'])
1641
264
        self.mock_connection_manager(self.modem_1)
264
        self.mock_connection_manager(self.modem_1)
1642
265
        self.mock_call_forwarding(self.modem_1)
265
        self.mock_call_forwarding(self.modem_1)
1643
266
        self.mock_call_settings(self.modem_1)
266
        self.mock_call_settings(self.modem_1)
1644
267
267
1645
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
1646
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-25 11:33:04 +0000
1647
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-10-03 20:40:51 +0000
1648
@@ -673,3 +673,16 @@
1649
673
        self.assertThat(
673
        self.assertThat(
1650
674
            lambda: self.system_settings.main_view.select_single(
674
            lambda: self.system_settings.main_view.select_single(
1651
675
                objectName='singleSim'), raises(StateNotFoundError))
675
                objectName='singleSim'), raises(StateNotFoundError))
1652
676
1653
677
    # regression test for 1375832
1654
678
    # tests that the second slot only exposes gsm, which
1655
679
    # the testdata indicates
1656
680
    def test_slot_two(self):
1657
681
        self.modem_0.EmitSignal(
1658
682
            SIM_IFACE,
1659
683
            'PropertyChanged',
1660
684
            'sv',
1661
685
            ['Present', 'False'])
1662
686
        self.select_preference(PREFERENCE_2G)
1663
687
        self.assertRaises(StateNotFoundError,
1664
688
                          self.select_preference, PREFERENCE_UMTS)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-03
Jonas G. Drange (community)			Needs Fixing on 2014-10-02
Ken VanDine			Needs Fixing on 2014-10-02
Iain Lane		2014-07-21	Needs Fixing on 2014-08-13
Review via email: mp+227534@code.launchpad.net