Merge lp:~tiagosh/dialer-app/ussd into lp:dialer-app

[Tiago Salem Herrmann]

Add initial USSD support

Add initial USSD support

----

Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telephony-service/ussd/+merge/213935
https://code.launchpad.net/~tiagosh/telepathy-ofono/ussd/+merge/213936

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-trusty-i386-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4597
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4124
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6334
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5593

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/214/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-02-20 21:31:09 +0000
+++ src/qml/DialerPage/DialerPage.qml	2014-04-02 21:59:44 +0000
@@ -19,6 +19,7 @@
 import QtContacts 5.0
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
 import Ubuntu.Telephony 0.1
 import Ubuntu.Contacts 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItems
@@ -33,6 +34,18 @@
         opened: false
         locked: true
     }
+    onDialNumberChanged: {
+        if(checkUSSD(dialNumber)) {
+            // check for custom strings
+            if (dialNumber == "*#06#") {
+                dialNumber = ""
+                mainView.ussdResponseTitle = "IMEI"
+                // TODO: handle dual sim
+                mainView.ussdResponseText = ussdManager.serial(telepathyHelper.accountIds[0])
+                PopupUtils.open(ussdResponseDialog)
+            }
+        }
+    }
 
     FocusScope {
         id: keypadContainer

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-03-12 20:42:21 +0000
+++ src/qml/dialer-app.qml	2014-04-02 21:59:44 +0000
@@ -18,17 +18,21 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
 import Ubuntu.Telephony 0.1
 
 MainView {
     id: mainView
 
     property bool applicationActive: Qt.application.active
+    property string ussdResponseTitle: ""
+    property string ussdResponseText: ""
     automaticOrientation: false
     width: units.gu(40)
     height: units.gu(71)
 
     signal applicationReady
+    signal closeUSSDProgressIndicator
 
     onApplicationActiveChanged: {
         if (applicationActive) {
@@ -58,10 +62,30 @@
         call(callManager.voicemailNumber);
     }
 
+    function checkUSSD(number) {
+        var endString = "#"
+        // check if it ends with #
+        if (number.slice(-endString.length) == endString) {
+            // check if it starts with any of these strings
+            var startStrings = ["*", "#", "**", "##", "*#"]
+            for(var i in startStrings) {
+                if (number.slice(0, startStrings[i].length) == startStrings[i]) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     function call(number, accountId) {
         if (!telepathyHelper.connected  || number === "") {
             return
         }
+        if (checkUSSD(number)) {
+            PopupUtils.open(ussdProgressDialog)
+            ussdManager.initiate(number, accountId)
+            return
+        }
         if (pageStack.depth === 1 && !callManager.hasCalls)  {
             pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"))
         }
@@ -86,6 +110,53 @@
         }
     }
 
+    Component {
+        id: ussdProgressDialog
+        Dialog {
+            id: ussdProgressIndicator
+            visible: false
+            title: i18n.tr("Please wait")
+            ActivityIndicator {
+                running: parent.visible
+            }
+            Connections {
+                target: mainView
+                onCloseUSSDProgressIndicator: {
+                    PopupUtils.close(ussdProgressIndicator)
+                }
+
+            }
+        }
+    }
+
+    Component {
+        id: ussdErrorDialog
+        Dialog {
+            id: ussdError
+            visible: false
+            title: i18n.tr("Error")
+            text: i18n.tr("Invalid USSD code")
+            Button {
+                text: i18n.tr("Dismiss")
+                onClicked: PopupUtils.close(ussdError)
+            }
+        }
+    }
+
+    Component {
+        id: ussdResponseDialog
+        Dialog {
+            id: ussdResponse
+            visible: false
+            title: mainView.ussdResponseTitle
+            text: mainView.ussdResponseText
+            Button {
+                text: i18n.tr("Dismiss")
+                onClicked: PopupUtils.close(ussdResponse)
+            }
+        }
+    }
+
     Connections {
         target: telepathyHelper
         onAccountReady: {
@@ -119,6 +190,74 @@
        }
     }
 
+    Connections {
+        target: ussdManager
+        onInitiateFailed: {
+            mainView.closeUSSDProgressIndicator()
+            PopupUtils.open(ussdErrorDialog)
+        }
+        onInitiateUSSDComplete: {
+            mainView.closeUSSDProgressIndicator()
+        }
+        onBarringComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Call Barring") + " - " + cbService + "\n" + ssOp)
+            mainView.ussdResponseText = ""
+            for (var prop in cbMap) {
+                if (cbMap[prop] !== "") {
+                    mainView.ussdResponseText += String(prop + ": " + cbMap[prop] + "\n")
+                }
+            }
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onForwardingComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Call Forwarding") + " - " + cfService + "\n" + ssOp)
+            mainView.ussdResponseText = ""
+            for (var prop in cfMap) {
+                if (cfMap[prop] !== "") {
+                    mainView.ussdResponseText += String(prop + ": " + cfMap[prop] + "\n")
+                }
+            }
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onWaitingComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Call Waiting") + " - " + ssOp)
+            mainView.ussdResponseText = ""
+            for (var prop in cwMap) {
+                if (cwMap[prop] !== "") {
+                    mainView.ussdResponseText += String(prop + ": " + cwMap[prop] + "\n")
+                }
+            }
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onCallingLinePresentationComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Calling Line Presentation") + " - " + ssOp)
+            mainView.ussdResponseText = status
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onConnectedLinePresentationComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Connected Line Presentation") + " - " + ssOp)
+            mainView.ussdResponseText = status
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onCallingLineRestrictionComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Calling Line Restriction") + " - " + ssOp)
+            mainView.ussdResponseText = status
+            PopupUtils.open(ussdResponseDialog)
+        }
+        onConnectedLineRestrictionComplete: {
+            mainView.closeUSSDProgressIndicator()
+            mainView.ussdResponseTitle = String(i18n.tr("Connected Line Restriction") + " - " + ssOp)
+            mainView.ussdResponseText = status
+            PopupUtils.open(ussdResponseDialog)
+        }
+    }
+
     PageStack {
         id: pageStack
         anchors.fill: parent