Merge lp:~ken-vandine/ubuntu-system-settings/call_waiting_fixes into lp:ubuntu-system-settings

[Ken VanDine]

Fixed property binding for voiceCallWaiting and don't enable the switch if the SIM isn't registered on the network

Fixed property binding for voiceCallWaiting and don't enable the switch if the SIM isn't registered on the network

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1453
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2177/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/38
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21652

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2177/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Is the log supposed to be there? Maybe make it less ambiguous if so.

review: Needs Information

[lp:~ken-vandine/ubuntu-system-settings/call_waiting_fixes]

1454. By Ken VanDine on 2015-07-06

Added comment about log output

1455. By Ken VanDine on 2015-07-06

Don't use the ConnectionManager API, that's for data, use the NetworkRegistration API to determine if we're registered on the network

1456. By Ken VanDine on 2015-07-06

Use existing netReg binding

1457. By Ken VanDine on 2015-07-06

Updated autopilot tests for call waiting

[Jonas G. Drange (jonas-drange)]

LGTM. Tested on krillin for two SIMs. Works well.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1454
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2179/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/40
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/269
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/269/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21674

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2179/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/call_waiting_fixes]

1458. By Ken VanDine on 2015-07-06

Merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1457
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2181/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/274
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/274/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21679

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2181/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2183/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/44
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/276
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21683

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2183/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2186/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/47
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21732

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2186/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/phone/CallWaiting.qml'
--- plugins/phone/CallWaiting.qml	2014-08-23 19:52:39 +0000
+++ plugins/phone/CallWaiting.qml	2015-07-06 17:30:57 +0000
@@ -29,6 +29,7 @@
     title: headerTitle
     property var sim
     property string headerTitle: i18n.tr("Call waiting")
+    property bool attached: sim.netReg.status === "registered" || sim.netReg.status === "roaming"
 
     OfonoCallSettings {
         id: callSettings
@@ -41,6 +42,10 @@
             callWaitingIndicator.running = false;
         }
         onVoiceCallWaitingComplete: {
+            //When the property change is complete, the value of checked should always be in sync with serverChecked 
+            callWaitingSwitch.checked = callWaitingSwitch.serverChecked
+            /* Log some additional output to help debug when things don't work */
+            console.warn('callSettings, onVoiceCallWaitingComplete modem: ' + modemPath + ' success: ' + success + ' ' + voiceCallWaiting);
             callWaitingIndicator.running = false;
         }
     }
@@ -48,16 +53,18 @@
     ActivityIndicator {
         id: callWaitingIndicator
         running: true
-        visible: running
+        visible: running && attached
     }
 
     Switch {
         id: callWaitingSwitch
         objectName: "callWaitingSwitch"
         visible: !callWaitingIndicator.running
-        enabled: callSettings.ready
-        checked: callSettings.voiceCallWaiting !== "disabled"
-        onClicked: {
+        enabled: callSettings.ready && attached
+        property bool serverChecked: callSettings.voiceCallWaiting !== "disabled"
+        onServerCheckedChanged: checked = serverChecked
+        Component.onCompleted: checked = serverChecked
+        onTriggered: {
             callWaitingIndicator.running = true;
             if (checked)
                 callSettings.voiceCallWaiting = "enabled";

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_phone.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_phone.py	2015-06-23 12:26:15 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_phone.py	2015-07-06 17:30:57 +0000
@@ -13,7 +13,8 @@
 from ubuntu_system_settings.tests import (
     PhoneOfonoBaseTestCase,
     CALL_FWD_IFACE,
-    CALL_SETTINGS_IFACE
+    CALL_SETTINGS_IFACE,
+    NETREG_IFACE
 )
 
 
@@ -155,6 +156,18 @@
                                          'VoiceCallWaiting')),
             Eventually(Contains('enabled')))
 
+    def test_call_waiting_switch_not_attached(self):
+        self.phone_page._enter_call_waiting()
+        self.modem_0.EmitSignal(
+            NETREG_IFACE, 'PropertyChanged', 'sv',
+            ['Status', 'unregistered'])
+        call_wait_switch = self.main_view.wait_select_single(
+            objectName='callWaitingSwitch')
+        self.assertThat(
+            call_wait_switch.enabled,
+            Eventually(Equals(False))
+        )
+
 
 class PhoneDualSimTestCase(PhoneOfonoBaseTestCase):
 
@@ -435,3 +448,27 @@
             lambda: str(self.modem_1.Get(CALL_SETTINGS_IFACE,
                                          'VoiceCallWaiting')),
             Eventually(Contains('enabled')))
+
+    def test_call_waiting_switch_not_attached_sim_1(self):
+        self.phone_page._enter_call_waiting(sim=0)
+        self.modem_0.EmitSignal(
+            NETREG_IFACE, 'PropertyChanged', 'sv',
+            ['Status', 'unregistered'])
+        call_wait_switch = self.main_view.wait_select_single(
+            objectName='callWaitingSwitch')
+        self.assertThat(
+            call_wait_switch.enabled,
+            Eventually(Equals(False))
+        )
+
+    def test_call_waiting_switch_not_attached_sim_2(self):
+        self.phone_page._enter_call_waiting(sim=1)
+        self.modem_1.EmitSignal(
+            NETREG_IFACE, 'PropertyChanged', 'sv',
+            ['Status', 'unregistered'])
+        call_wait_switch = self.main_view.wait_select_single(
+            objectName='callWaitingSwitch')
+        self.assertThat(
+            call_wait_switch.enabled,
+            Eventually(Equals(False))
+        )