1
=== modified file 'debian/control'
2
--- debian/control	2015-05-14 17:01:14 +0000
3
+++ debian/control	2015-08-07 21:34:02 +0000
4
@@ -3,7 +3,6 @@
5
3
Priority: optional
3
Priority: optional
6
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
7
5
Build-Depends: cmake,
5
Build-Depends: cmake,
8
6
               dbus-test-runner,
9
7
               debhelper (>= 9),
6
               debhelper (>= 9),
10
8
               dh-translations,
7
               dh-translations,
11
9
               pkg-config,
8
               pkg-config,
12
10
9
13
=== modified file 'src/dialerapplication.cpp'
14
--- src/dialerapplication.cpp	2015-05-12 14:33:45 +0000
15
+++ src/dialerapplication.cpp	2015-08-07 21:34:02 +0000
16
@@ -227,7 +227,7 @@
17
227
        QUrlQuery query(url);
227
        QUrlQuery query(url);
18
228
        QString viewName = query.queryItemValue("view");
228
        QString viewName = query.queryItemValue("view");
19
229
        if (viewName == "liveCall") {
229
        if (viewName == "liveCall") {
21
230
            QMetaObject::invokeMethod(mainView, "switchToLiveCall");
230
            QMetaObject::invokeMethod(mainView, "switchToLiveCall", Q_ARG(QVariant, QVariant()), Q_ARG(QVariant, QVariant()));
22
231
        }
231
        }
23
232
232
24
233
    }
233
    }
25
234
234
26
=== modified file 'src/qml/DialerPage/DialerPage.qml'
27
--- src/qml/DialerPage/DialerPage.qml	2015-07-17 09:01:20 +0000
28
+++ src/qml/DialerPage/DialerPage.qml	2015-08-07 21:34:02 +0000
29
@@ -263,6 +263,7 @@
30
263
263
31
264
            KeypadEntry {
264
            KeypadEntry {
32
265
                id: keypadEntry
265
                id: keypadEntry
33
266
                objectName: "keypadEntry"
34
266
267
35
267
                anchors {
268
                anchors {
36
268
                    top: parent.top
269
                    top: parent.top
37
@@ -401,20 +402,49 @@
38
401
                horizontalCenter: parent.horizontalCenter
402
                horizontalCenter: parent.horizontalCenter
39
402
            }
403
            }
40
403
            onClicked: {
404
            onClicked: {
41
405
                if (dialNumber == "") {
42
406
                    if (mainView.greeterMode) {
43
407
                        return;
44
408
                    }
45
409
                    keypadEntry.value = generalSettings.lastCalledPhoneNumber
46
410
                    return;
47
411
                }
48
412
49
413
                if (mainView.greeterMode && !mainView.isEmergencyNumber(dialNumber)) {
50
414
                    // we only allow users to call any number in greeter mode if there are 
51
415
                    // no sim cards present. The operator will block the number if it thinks
52
416
                    // it's necessary.
53
417
                    // for phone accounts, active means the the status is not offline:
54
418
                    // "nomodem", "nosim" or "flightmode"
55
419
56
420
                    var denyEmergencyCall = false
57
421
                    // while in flight mode we can't detect if sims are present in some devices
58
422
                    if (telepathyHelper.flightMode) {
59
423
                        denyEmergencyCall = true
60
424
                    } else {
61
425
                        for (var i in telepathyHelper.activeAccounts) {
62
426
                            var account = telepathyHelper.activeAccounts[i]
63
427
                            if (account.type == AccountEntry.PhoneAccount) {
64
428
                                denyEmergencyCall = true;
65
429
                            }
66
430
                        }
67
431
                    }
68
432
                    if (denyEmergencyCall) {
69
433
                        // if there is at least one sim card present, just ignore the call
70
434
                        showNotification(i18n.tr("Emergency call"), i18n.tr("This is not an emergency number."))
71
435
                        keypadEntry.value = "";
72
436
                        return;
73
437
                    }
74
438
75
439
                    // this is a special case, we need to call using callEmergency() directly to avoid
76
440
                    // all network and dual sim checks we have in mainView.call()
77
441
                    mainView.callEmergency(keypadEntry.value)
78
442
                    return;
79
443
                }
80
444
81
404
                console.log("Starting a call to " + keypadEntry.value);
445
                console.log("Starting a call to " + keypadEntry.value);
82
405
                mainView.call(keypadEntry.value);
446
                mainView.call(keypadEntry.value);
83
406
            }
447
            }
84
407
            enabled: {
85
408
                if (dialNumber == "") {
86
409
                    return false;
87
410
                }
88
411
89
412
                if (mainView.greeterMode) {
90
413
                    return mainView.isEmergencyNumber(dialNumber);
91
414
                }
92
415
93
416
                return true;
94
417
            }
95
418
        }
448
        }
96
419
    }
449
    }
97
420
450
98
@@ -443,7 +473,7 @@
99
443
        }
473
        }
100
444
        ScriptAction {
474
        ScriptAction {
101
445
            script: {
475
            script: {
103
446
                mainView.switchToLiveCall()
476
                mainView.switchToLiveCall(i18n.tr("Calling"), keypadEntry.value)
104
447
                keypadEntry.value = ""
477
                keypadEntry.value = ""
105
448
                callButton.iconRotation = 0.0
478
                callButton.iconRotation = 0.0
106
449
                keypadContainer.opacity = 1.0
479
                keypadContainer.opacity = 1.0
107
450
480
108
=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
109
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-15 21:18:20 +0000
110
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2015-08-07 21:34:02 +0000
111
@@ -70,7 +70,7 @@
112
70
                    text: i18n.tr("No")
70
                    text: i18n.tr("No")
113
71
                    color: UbuntuColors.orange
71
                    color: UbuntuColors.orange
114
72
                    onClicked: {
72
                    onClicked: {
116
73
                        settings.mainViewDontAskCount = 3
73
                        dualSimSettings.mainViewDontAskCount = 3
117
74
                        PopupUtils.close(dialogue)
74
                        PopupUtils.close(dialogue)
118
75
                        Qt.inputMethod.hide()
75
                        Qt.inputMethod.hide()
119
76
                    }
76
                    }
120
@@ -81,7 +81,7 @@
121
81
                    color: UbuntuColors.orange
81
                    color: UbuntuColors.orange
122
82
                    onClicked: {
82
                    onClicked: {
123
83
                        PopupUtils.close(dialogue)
83
                        PopupUtils.close(dialogue)
125
84
                        settings.mainViewDontAskCount++
84
                        dualSimSettings.mainViewDontAskCount++
126
85
                        Qt.inputMethod.hide()
85
                        Qt.inputMethod.hide()
127
86
                    }
86
                    }
128
87
                }
87
                }
129
88
88
130
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
131
--- src/qml/LiveCallPage/LiveCall.qml	2015-07-16 21:45:42 +0000
132
+++ src/qml/LiveCallPage/LiveCall.qml	2015-08-07 21:34:02 +0000
133
@@ -43,6 +43,8 @@
134
43
    property variant audioOutputs: call ? call.audioOutputs : null
43
    property variant audioOutputs: call ? call.audioOutputs : null
135
44
    property string phoneNumberSubTypeLabel: ""
44
    property string phoneNumberSubTypeLabel: ""
136
45
    property int defaultTimeout: 10000
45
    property int defaultTimeout: 10000
137
46
    property string initialStatus: ""
138
47
    property string initialNumber: ""
139
46
    property string caller: {
48
    property string caller: {
140
47
        if (call && call.isConference) {
49
        if (call && call.isConference) {
141
48
            return i18n.tr("Conference");
50
            return i18n.tr("Conference");
142
@@ -50,6 +52,8 @@
143
50
            return contactWatcher.alias;
52
            return contactWatcher.alias;
144
51
        } else if (contactWatcher.identifier !== "") {
53
        } else if (contactWatcher.identifier !== "") {
145
52
            return contactWatcher.identifier;
54
            return contactWatcher.identifier;
146
55
        } else if (!call && initialNumber != "") {
147
56
            return initialNumber
148
53
        } else {
57
        } else {
149
54
            return " "
58
            return " "
150
55
        }
59
        }
151
@@ -444,6 +448,8 @@
152
444
                    return call.held ? i18n.tr("%1 - on hold").arg(stopWatch.elapsed) : stopWatch.elapsed;
448
                    return call.held ? i18n.tr("%1 - on hold").arg(stopWatch.elapsed) : stopWatch.elapsed;
153
445
                } else if (call && !call.incoming) {
449
                } else if (call && !call.incoming) {
154
446
                    return i18n.tr("Calling")
450
                    return i18n.tr("Calling")
155
451
                } else if (!call && initialStatus !== "") {
156
452
                    return initialStatus
157
447
                } else {
453
                } else {
158
448
                    return " "
454
                    return " "
159
449
                }
455
                }
160
450
456
161
=== modified file 'src/qml/dialer-app.qml'
162
--- src/qml/dialer-app.qml	2015-06-09 22:02:19 +0000
163
+++ src/qml/dialer-app.qml	2015-08-07 21:34:02 +0000
164
@@ -90,7 +90,7 @@
165
90
        onSetupReady: {
90
        onSetupReady: {
166
91
            telepathyReady = true
91
            telepathyReady = true
167
92
            if (multipleAccounts && !telepathyHelper.defaultCallAccount &&
92
            if (multipleAccounts && !telepathyHelper.defaultCallAccount &&
169
93
                settings.mainViewDontAskCount < 3 && pageStackNormalMode.depth === 1 && !mainView.greeterMode) {
93
                dualSimSettings.mainViewDontAskCount < 3 && pageStackNormalMode.depth === 1 && !mainView.greeterMode) {
170
94
                PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
94
                PopupUtils.open(Qt.createComponent("Dialogs/NoDefaultSIMCardDialog.qml").createObject(mainView))
171
95
            }
95
            }
172
96
        }
96
        }
173
@@ -111,12 +111,17 @@
174
111
    }
111
    }
175
112
112
176
113
    Settings {
113
    Settings {
178
114
        id: settings
114
        id: dualSimSettings
179
115
        category: "DualSim"
115
        category: "DualSim"
180
116
        property bool dialPadDontAsk: false
116
        property bool dialPadDontAsk: false
181
117
        property int mainViewDontAskCount: 0
117
        property int mainViewDontAskCount: 0
182
118
    }
118
    }
183
119
119
184
120
    Settings {
185
121
        id: generalSettings
186
122
        property string lastCalledPhoneNumber: ""
187
123
    }
188
124
189
120
    PhoneUtils {
125
    PhoneUtils {
190
121
        id: phoneUtils
126
        id: phoneUtils
191
122
    }
127
    }
192
@@ -166,13 +171,21 @@
193
166
    ]
171
    ]
194
167
172
195
168
    function isEmergencyNumber(number) {
173
    function isEmergencyNumber(number) {
196
174
        // TODO should we only check for emergency numbers
197
175
        // in the selected account?
198
176
199
177
        // check for specific account emergency numbers
200
169
        for (var i in telepathyHelper.accounts) {
178
        for (var i in telepathyHelper.accounts) {
201
170
            var account = telepathyHelper.accounts[i];
179
            var account = telepathyHelper.accounts[i];
202
171
            for (var j in account.emergencyNumbers) {
180
            for (var j in account.emergencyNumbers) {
204
172
                if (phoneUtils.comparePhoneNumbers(number, account.emergencyNumbers[j])) {
181
                if (number == account.emergencyNumbers[j]) {
205
173
                    return true;
182
                    return true;
206
174
                }
183
                }
207
175
            }
184
            }
208
185
            // then check using libphonenumber
209
186
            if (phoneUtils.isEmergencyNumber(number, account.countryCode)) {
210
187
                return true;
211
188
            }
212
176
        }
189
        }
213
177
        return false;
190
        return false;
214
178
    }
191
    }
215
@@ -264,9 +277,12 @@
216
264
277
217
265
        animateLiveCall();
278
        animateLiveCall();
218
266
279
219
267
        // now try to use one of the connected accounts
220
268
        var account = null;
280
        var account = null;
222
269
        if (telepathyHelper.activeAccounts.length > 0) {
281
        // check if the selected account is active and can make emergency calls
223
282
        if (mainView.account && mainView.account.active && mainView.account.emergencyCallsAvailable) {
224
283
            account = mainView.account
225
284
        } else if (telepathyHelper.activeAccounts.length > 0) {
226
285
            // now try to use one of the connected accounts
227
270
            account = telepathyHelper.activeAccounts[0];
286
            account = telepathyHelper.activeAccounts[0];
228
271
        } else {
287
        } else {
229
272
            // if no account is active, use any account that can make emergency calls
288
            // if no account is active, use any account that can make emergency calls
230
@@ -317,7 +333,7 @@
231
317
            return
333
            return
232
318
        }
334
        }
233
319
335
235
320
        if (multipleAccounts && !telepathyHelper.defaultCallAccount && !settings.dialPadDontAsk && !skipDefaultSimDialog) {
336
        if (multipleAccounts && !telepathyHelper.defaultCallAccount && !dualSimSettings.dialPadDontAsk && !skipDefaultSimDialog) {
236
321
            var properties = {}
337
            var properties = {}
237
322
            properties["phoneNumber"] = number
338
            properties["phoneNumber"] = number
238
323
            properties["accountId"] = mainView.account.accountId
339
            properties["accountId"] = mainView.account.accountId
239
@@ -359,6 +375,7 @@
240
359
        }
375
        }
241
360
376
242
361
        if (account && account.connected) {
377
        if (account && account.connected) {
243
378
            generalSettings.lastCalledPhoneNumber = number
244
362
            callManager.startCall(number, account.accountId);
379
            callManager.startCall(number, account.accountId);
245
363
        }
380
        }
246
364
    }
381
    }
247
@@ -409,13 +426,15 @@
248
409
        }
426
        }
249
410
    }
427
    }
250
411
428
252
412
    function switchToLiveCall() {
429
    function switchToLiveCall(initialStatus, initialNumber) {
253
413
        if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
430
        if (pageStackNormalMode.depth > 2 && pageStackNormalMode.currentPage.objectName == "contactsPage") {
254
414
            // pop contacts Page
431
            // pop contacts Page
255
415
            pageStackNormalMode.pop();
432
            pageStackNormalMode.pop();
256
416
        }
433
        }
257
417
434
258
418
        var properties = {}
435
        var properties = {}
259
436
        properties["initialStatus"] = initialStatus
260
437
        properties["initialNumber"] = initialNumber
261
419
        if (isEmergencyNumber(pendingNumberToDial)) {
438
        if (isEmergencyNumber(pendingNumberToDial)) {
262
420
            properties["defaultTimeout"] = 30000
439
            properties["defaultTimeout"] = 30000
263
421
        }
440
        }
264
422
441
265
=== modified file 'tests/qml/CMakeLists.txt'
266
--- tests/qml/CMakeLists.txt	2015-05-21 18:52:21 +0000
267
+++ tests/qml/CMakeLists.txt	2015-08-07 21:34:02 +0000
268
@@ -15,21 +15,12 @@
269
15
    )
15
    )
270
16
endmacro()
16
endmacro()
271
17
17
272
18
macro(DECLARE_QML_DBUS_TEST TST_NAME TST_QML_FILE)
273
19
    add_test(NAME ${TST_NAME}
274
20
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
275
21
        COMMAND ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24" dbus-test-runner --task /usr/bin/history-daemon --ignore-return --task /usr/bin/telephony-service-handler --ignore-return --task=${QMLTESTRUNNER_BIN} --parameter=-v1 --parameter=-o --parameter=-,txt --parameter=-o --parameter=${CMAKE_BINARY_DIR}/test_${TST_NAME}.xml,xunitxml --parameter=-import --parameter=${qml_BINARY_DIR} --parameter=-input --parameter=${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
276
22
    )
277
23
    set_tests_properties(${TST_NAME} PROPERTIES ENVIRONMENT "QT_QPA_FONTDIR=${CMAKE_BINARY_DIR}")
278
24
endmacro()
279
25
280
26
if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
18
if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
281
27
    declare_qml_test("keypad_button" tst_KeypadButton.qml)
19
    declare_qml_test("keypad_button" tst_KeypadButton.qml)
282
28
    declare_qml_test("main_view" tst_MainView.qml)
20
    declare_qml_test("main_view" tst_MainView.qml)
283
29
    declare_qml_test("stopwatch" tst_StopWatch.qml)
21
    declare_qml_test("stopwatch" tst_StopWatch.qml)
284
30
    declare_qml_test("historydelegate" tst_HistoryDelegate.qml)
22
    declare_qml_test("historydelegate" tst_HistoryDelegate.qml)
287
31
# FIXME currently disabled. There is a bug when registering the telepathy observer
23
    declare_qml_test("dialer_page" tst_DialerPage.qml)
286
32
#    declare_qml_dbus_test("dialer_page" tst_DialerPage.qml)
288
33
else()
24
else()
289
34
    if (NOT QMLTESTRUNNER_BIN)
25
    if (NOT QMLTESTRUNNER_BIN)
290
35
        message(WARNING "Qml tests disabled: qmltestrunner not found")
26
        message(WARNING "Qml tests disabled: qmltestrunner not found")
291
36
27
292
=== modified file 'tests/qml/tst_DialerPage.qml'
293
--- tests/qml/tst_DialerPage.qml	2015-03-30 20:09:13 +0000
294
+++ tests/qml/tst_DialerPage.qml	2015-08-07 21:34:02 +0000
295
@@ -19,6 +19,7 @@
296
19
import QtQuick 2.2
19
import QtQuick 2.2
297
20
import QtTest 1.0
20
import QtTest 1.0
298
21
import Ubuntu.Test 0.1
21
import Ubuntu.Test 0.1
299
22
import Ubuntu.Telephony 0.1
300
22
23
301
23
Item {
24
Item {
302
24
    id: root
25
    id: root
303
@@ -38,6 +39,43 @@
304
38
        property bool greeterActive: false
39
        property bool greeterActive: false
305
39
    }
40
    }
306
40
41
307
42
    QtObject {
308
43
        id: testAccount
309
44
        property string accountId: "ofono/ofono/account0"
310
45
        property var emergencyNumbers: [ "444", "555"]
311
46
        property int type: AccountEntry.PhoneAccount
312
47
        property string displayName: "SIM 1"
313
48
        property bool connected: true
314
49
        property bool emergencyCallsAvailable: true
315
50
        property bool active: true
316
51
        property string networkName: "Network name"
317
52
        property bool simLocked: false
318
53
    }
319
54
320
55
    Item {
321
56
        id: telepathyHelper
322
57
        function registerChannelObserver() {}
323
58
        function unregisterChannelObserver() {}
324
59
        property bool emergencyCallsAvailable: true
325
60
        property bool flightMode: false
326
61
        property var activeAccounts: [testAccount]
327
62
        property alias accounts: telepathyHelper.activeAccounts
328
63
    }
329
64
330
65
    Item {
331
66
        id: callManager
332
67
        signal callStarted
333
68
        function startCall(phoneNumber, accountId) {
334
69
            callManager.callStarted(phoneNumber, accountId)
335
70
        }
336
71
    }
337
72
338
73
    SignalSpy {
339
74
       id: callSpy
340
75
       target: callManager
341
76
       signalName: "callStarted"
342
77
    }
343
78
344
41
    Loader {
79
    Loader {
345
42
        id: mainViewLoader
80
        id: mainViewLoader
346
43
        property string i18nDirectory: ""
81
        property string i18nDirectory: ""
347
@@ -57,15 +95,17 @@
348
57
        }
95
        }
349
58
96
350
59
        function test_dialerPageHeaderTitleWhenAppIsInBackground() {
97
        function test_dialerPageHeaderTitleWhenAppIsInBackground() {
351
98
            mainViewLoader.item.switchToKeypadView()
352
60
            tryCompare(mainViewLoader.item, 'applicationActive', true)
99
            tryCompare(mainViewLoader.item, 'applicationActive', true)
353
61
            tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
100
            tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
354
62
101
355
63
            mainViewLoader.item.telepathyReady = true
102
            mainViewLoader.item.telepathyReady = true
357
64
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('No network'))
103
            greeter.greeterActive = false
358
104
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('Network name'))
359
65
105
360
66
            // we should still display the title on regular states
106
            // we should still display the title on regular states
361
67
            mainViewLoader.item.applicationActive = false
107
            mainViewLoader.item.applicationActive = false
363
68
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('No network'))
108
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', i18n.tr('Network name'))
364
69
109
365
70
            // app must always display "emergency calls" when the greeter is active and app is in foreground
110
            // app must always display "emergency calls" when the greeter is active and app is in foreground
366
71
            mainViewLoader.item.applicationActive = true
111
            mainViewLoader.item.applicationActive = true
367
@@ -75,5 +115,88 @@
368
75
            mainViewLoader.item.applicationActive = false
115
            mainViewLoader.item.applicationActive = false
369
76
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', ' ')
116
            tryCompare(mainViewLoader.item.currentStack.currentPage, 'title', ' ')
370
77
        }
117
        }
371
118
372
119
        function test_dialerPageEmergencyNumbers() {
373
120
            tryCompare(mainViewLoader.item, 'applicationActive', true)
374
121
            tryCompare(mainViewLoader.item.currentStack, 'depth', 1)
375
122
376
123
            mainViewLoader.item.telepathyReady = true
377
124
            mainViewLoader.item.accountReady = true
378
125
            greeter.greeterActive = false
379
126
            mainViewLoader.item.switchToKeypadView()
380
127
381
128
            var dialerPage = mainViewLoader.item.currentStack.currentPage
382
129
            var keypadEntry = findChild(mainViewLoader, "keypadEntry")
383
130
            var callButton = findChild(mainViewLoader, "callButton")
384
131
385
132
            // regular number when connected
386
133
            testAccount.connected = true
387
134
            keypadEntry.value = "123"
388
135
            callButton.clicked()
389
136
            compare(callSpy.count, 1)
390
137
            callSpy.clear()
391
138
            mainViewLoader.item.switchToKeypadView()
392
139
393
140
            // regular number when disconnected
394
141
            testAccount.connected = false
395
142
            keypadEntry.value = "123"
396
143
            callButton.clicked()
397
144
            compare(callSpy.count, 0)
398
145
            callSpy.clear()
399
146
            mainViewLoader.item.switchToKeypadView()
400
147
401
148
            // regular number in greeter mode
402
149
            testAccount.connected = true
403
150
            greeter.greeterActive = true
404
151
            keypadEntry.value = "123"
405
152
            callButton.clicked()
406
153
            compare(callSpy.count, 0)
407
154
            callSpy.clear()
408
155
            mainViewLoader.item.switchToKeypadView()
409
156
410
157
            // emergency number in greeter mode when connected
411
158
            testAccount.connected = true
412
159
            greeter.greeterActive = true
413
160
            keypadEntry.value = "444"
414
161
            callButton.clicked()
415
162
            compare(callSpy.count, 1)
416
163
            callSpy.clear()
417
164
            mainViewLoader.item.switchToKeypadView()
418
165
419
166
            // emergency number in greeter mode when disconnected
420
167
            testAccount.connected = false
421
168
            greeter.greeterActive = true
422
169
            keypadEntry.value = "444"
423
170
            callButton.clicked()
424
171
            compare(callSpy.count, 1)
425
172
            callSpy.clear()
426
173
            mainViewLoader.item.switchToKeypadView()
427
174
428
175
            // emergency number in flight mode
429
176
            testAccount.connected = false
430
177
            telepathyHelper.emergencyCallsAvailable = false
431
178
            telepathyHelper.flightMode = true
432
179
            greeter.greeterActive = false
433
180
            keypadEntry.value = "444"
434
181
            callButton.clicked()
435
182
            telepathyHelper.emergencyCallsAvailable = true
436
183
            wait(15000)
437
184
            compare(callSpy.count, 1)
438
185
            callSpy.clear()
439
186
            mainViewLoader.item.switchToKeypadView()
440
187
 
441
188
            // emergency number in flight mode and greeter mode
442
189
            testAccount.connected = false
443
190
            telepathyHelper.emergencyCallsAvailable = false
444
191
            telepathyHelper.flightMode = true
445
192
            greeter.greeterActive = true
446
193
            keypadEntry.value = "444"
447
194
            callButton.clicked()
448
195
            telepathyHelper.emergencyCallsAvailable = true
449
196
            wait(15000)
450
197
            compare(callSpy.count, 1)
451
198
            callSpy.clear()
452
199
            mainViewLoader.item.switchToKeypadView()
453
200
        }
454
78
    }
201
    }
455
79
}
202
}
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-07-15	Approve on 2015-08-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-08-07
Review via email: mp+264908@code.launchpad.net