Merge lp:~jonas-drange/ubuntu-system-settings/lp1478049 into lp:ubuntu-system-settings

[Jonas G. Drange]

* Cache call forwarding summary for each IMSI/ICCID.
* Block UI until the CallForwarding binding is ready.
* Do not assume a failed callforwarding change means it's disabled (could be forced by carrier).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1551
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2470/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5062
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/654
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5065
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24985

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/lp1478049]

1552. By Jonas G. Drange on 2015-11-09

nuke the arbitrary time TTL, use IMSI or ICCID.

[Sebastien Bacher (seb128)]

thanks, that looks fine to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1552
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2471/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5089/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5094
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5094/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

I've restarted this MP to work around an issue triggering generic-deb-autopilot-vivid-touch on krillin hardware.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1552
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2472/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/656
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5098
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5098/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25023

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/phone/CallForwardItem.qml'
--- plugins/phone/CallForwardItem.qml	2015-08-10 13:31:45 +0000
+++ plugins/phone/CallForwardItem.qml	2015-11-09 12:37:53 +0000
@@ -72,7 +72,7 @@
         /**
          * Server is working.
          */
-        property bool _pending: false
+        property bool _pending: !callForwarding.ready
 
         /**
          * Server failed to change/fetch setting.
@@ -233,10 +233,12 @@
         Component.onCompleted: {
             item.callForwarding[item.rule + 'Changed'].connect(Utils.ruleChanged);
             item.callForwarding[item.rule + 'Complete'].connect(Utils.ruleComplete);
+            item.callForwarding.readyChanged.connect(Utils.ruleReadyChanged);
         }
         Component.onDestruction: {
             item.callForwarding[item.rule + 'Changed'].disconnect(Utils.ruleChanged);
             item.callForwarding[item.rule + 'Complete'].disconnect(Utils.ruleComplete);
+            item.callForwarding.readyChanged.disconnect(Utils.ruleReadyChanged);
         }
     }
 }

=== modified file 'plugins/phone/CallForwarding.qml'
--- plugins/phone/CallForwarding.qml	2015-08-10 13:31:45 +0000
+++ plugins/phone/CallForwarding.qml	2015-11-09 12:37:53 +0000
@@ -28,6 +28,7 @@
 
 import QtQuick 2.4
 import QtContacts 5.0
+import MeeGo.QOfono 0.2
 import SystemSettings 1.0
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
@@ -126,7 +127,7 @@
                 id: fwdAll
                 anchors { left: parent.left; right: parent.right }
                 rule: "voiceUnconditional"
-                callForwarding: sim.callForwarding
+                callForwarding: callForwarding
                 text: i18n.tr("Forward every incoming call")
                 onEnteredEditMode: {page.editing = fwdAll; Utils.show(field)}
                 onLeftEditMode: page.editing = null
@@ -170,7 +171,7 @@
                 id: fwdBusy
                 objectName: "fwdBusy"
                 anchors { left: parent.left; right: parent.right }
-                callForwarding: sim.callForwarding
+                callForwarding: callForwarding
                 rule: "voiceBusy"
                 text: i18n.tr("I’m on another call")
                 onEnteredEditMode: {page.editing = fwdBusy; Utils.show(field)}
@@ -181,7 +182,7 @@
                 id: fwdLost
                 objectName: "fwdLost"
                 anchors { left: parent.left; right: parent.right }
-                callForwarding: sim.callForwarding
+                callForwarding: callForwarding
                 rule: "voiceNoReply"
                 text: i18n.tr("I don’t answer")
                 onEnteredEditMode: {page.editing = fwdLost; Utils.show(field)}
@@ -192,7 +193,7 @@
                 id: fwdUnreachable
                 objectName: "fwdUnreachable"
                 anchors { left: parent.left; right: parent.right }
-                callForwarding: sim.callForwarding
+                callForwarding: callForwarding
                 rule: "voiceNotReachable"
                 text: i18n.tr("My phone is unreachable")
                 onEnteredEditMode: {
@@ -359,7 +360,39 @@
     }
 
     Connections {
-        target: sim.callForwarding
+        target: callForwarding
         onGetPropertiesFailed: page.state = "forwardFailed";
     }
+
+    OfonoCallForwarding {
+        id: callForwarding
+        modemPath: sim.path
+        function updateSummary () {
+            var val;
+
+            // Clear the summary and exit if any of the values are unknown.
+            if (typeof voiceUnconditional === 'undefined' ||
+                typeof voiceBusy === 'undefined' ||
+                typeof voiceNoReply === 'undefined' ||
+                typeof voiceNotReachable === 'undefined') {
+                sim.setCallForwardingSummary('');
+                return;
+            }
+
+            if (voiceUnconditional) {
+                 val = i18n.tr('All calls');
+            } else if (voiceBusy || voiceNoReply || voiceNotReachable) {
+                val = i18n.tr('Some calls')
+            } else {
+                val = i18n.tr('Off')
+            }
+            sim.setCallForwardingSummary(val);
+        }
+
+        Component.onCompleted: updateSummary()
+        onVoiceUnconditionalChanged: updateSummary()
+        onVoiceBusyChanged: updateSummary()
+        onVoiceNoReplyChanged: updateSummary()
+        onVoiceNotReachableChanged: updateSummary()
+    }
 }

=== modified file 'plugins/phone/MultiSim.qml'
--- plugins/phone/MultiSim.qml	2015-08-10 13:31:45 +0000
+++ plugins/phone/MultiSim.qml	2015-11-09 12:37:53 +0000
@@ -51,17 +51,7 @@
                 objectName: "callFwdSim" + index
                 text: i18n.tr("Call forwarding")
                 progression: true
-                value: {
-                    if (sims[index].callForwarding.voiceUnconditional) {
-                        return i18n.tr("All calls");
-                    } else if (sims[index].callForwarding.voiceBusy ||
-                               sims[index].callForwarding.voiceNoReply ||
-                               sims[index].callForwarding.voiceNotReachable) {
-                        return i18n.tr("Some calls")
-                    } else {
-                        return i18n.tr("Off")
-                    }
-                }
+                value: sims[index].getCallForwardingSummary()
                 onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {
                     sim: sims[index],
                     headerTitle: sims[index].title

=== modified file 'plugins/phone/Ofono.qml'
--- plugins/phone/Ofono.qml	2015-08-10 13:31:45 +0000
+++ plugins/phone/Ofono.qml	2015-11-09 12:37:53 +0000
@@ -18,10 +18,10 @@
  *
 */
 import QtQuick 2.4
+import GSettings 1.0
 import MeeGo.QOfono 0.2
 
 Item {
-    property alias callForwarding: callForwarding
     property alias netReg: netReg
     property alias simMng: simMng
     property alias present: simMng.present
@@ -33,11 +33,6 @@
         return name + (number ? " (" + number + ")" : "");
     }
 
-    OfonoCallForwarding {
-        id: callForwarding
-        modemPath: path
-    }
-
     OfonoNetworkRegistration {
         id: netReg
         modemPath: path
@@ -47,4 +42,28 @@
         id: simMng
         modemPath: path
     }
+
+    function setCallForwardingSummary (val) {
+        var tmp = {};
+        var fwdSum = settings.callforwardingSummaries;
+        for (var k in fwdSum){
+            if (fwdSum.hasOwnProperty(k)) {
+                tmp[k] = fwdSum[k];
+            }
+        }
+        // Prefer IMSI to identify the SIM, use ICCID if IMSI is not available.
+        tmp[simMng.subscriberIdentity || simMng.CardIdentifier] = val;
+        settings.callforwardingSummaries = tmp;
+    }
+
+    function getCallForwardingSummary () {
+        // Use either IMSI or ICCID to identify the SIM.
+        var sid = simMng.subscriberIdentity || simMng.CardIdentifier;
+        return settings.callforwardingSummaries[sid] || '';
+    }
+
+    GSettings {
+        id: settings
+        schema.id: "com.ubuntu.touch.system-settings"
+    }
 }

=== modified file 'plugins/phone/SingleSim.qml'
--- plugins/phone/SingleSim.qml	2015-08-10 13:31:45 +0000
+++ plugins/phone/SingleSim.qml	2015-11-09 12:37:53 +0000
@@ -41,17 +41,7 @@
         text: i18n.tr("Call forwarding")
         showDivider: false
         progression: true
-        value: {
-            if (sim.callForwarding.voiceUnconditional) {
-                return i18n.tr("All calls");
-            } else if (sim.callForwarding.voiceBusy ||
-                       sim.callForwarding.voiceNoReply ||
-                       sim.callForwarding.voiceNotReachable) {
-                return i18n.tr("Some calls")
-            } else {
-                return i18n.tr("Off")
-            }
-        }
+        value: sim.getCallForwardingSummary()
         onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim})
     }
 

=== modified file 'plugins/phone/callForwardingUtils.js'
--- plugins/phone/callForwardingUtils.js	2015-07-02 18:36:39 +0000
+++ plugins/phone/callForwardingUtils.js	2015-11-09 12:37:53 +0000
@@ -73,6 +73,13 @@
 }
 
 /**
+ * Handler for when the rule ready changes.
+ */
+function ruleReadyChanged () {
+    d._pending = !callForwarding.ready;
+}
+
+/**
  * Scroll something into view.
  *
  * @param {QtObject} item to scroll to.

=== modified file 'schema/com.ubuntu.touch.system-settings.gschema.xml'
--- schema/com.ubuntu.touch.system-settings.gschema.xml	2014-07-29 12:27:37 +0000
+++ schema/com.ubuntu.touch.system-settings.gschema.xml	2015-11-09 12:37:53 +0000
@@ -27,5 +27,10 @@
             <summary>Whether the applications should be sorted by name.</summary>
             <description>If true the applications are sorted by name, otherwise by disk size.</description>
         </key>
+        <key name="callforwarding-summaries" type="a{ss}">
+            <summary>Call forwarding summaries</summary>
+            <default>{}</default>
+            <description>Mapping of SIM to a call forwarding summary.</description>
+        </key>
     </schema>
 </schemalist>