Merge lp:~tiagosh/dialer-app/fallback-to-original-number into lp:dialer-app

[Tiago Salem Herrmann]

Fallback to original phone number when format() returns a blank string

Fallback to original phone number when format() returns a blank string

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/613/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/126
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5124
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5136
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25099

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2015-10-23 20:43:44 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2015-11-11 14:25:58 +0000
@@ -170,7 +170,11 @@
             } else if (participant.alias && participant.alias !== "") {
                 return participant.alias
             }
-            return PhoneUtils.PhoneUtils.format(phoneNumber)
+            var formattedPhoneNumber = PhoneUtils.PhoneUtils.format(phoneNumber)
+            if (formattedPhoneNumber !== "") {
+                return formattedPhoneNumber
+            }
+            return phoneNumber
         }
         elide: Text.ElideRight
         color: UbuntuColors.lightAubergine
 
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2015-09-07 15:40:45 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-11-11 14:25:58 +0000
@@ -37,7 +37,8 @@
 
     objectName: "historyDetailsPage"
     anchors.fill: parent
-    title: {
+
+    function getFormattedPhoneLabel(phoneNumber) {
         if (phoneNumber == "x-ofono-private") {
             return i18n.tr("Private number")
         } else if (phoneNumber == "x-ofono-unknown") {
@@ -45,9 +46,15 @@
         } else if (contactWatcher.alias != "") {
             return contactWatcher.alias
         }
-        return PhoneUtils.PhoneUtils.format(phoneNumber)
+        var formattedPhoneNumber = PhoneUtils.PhoneUtils.format(phoneNumber)
+        if (formattedPhoneNumber !== "") {
+            return formattedPhoneNumber
+        }
+        return phoneNumber
     }
 
+    title: getFormattedPhoneLabel(phoneNumber)
+
     head.actions: [
         Action {
             iconName: unknownContact ? "contact-new" : "stock_contact"
@@ -138,7 +145,7 @@
                 }
                 verticalAlignment: Text.AlignTop
                 fontSize: "medium"
-                text: PhoneUtils.PhoneUtils.format(phoneNumber)
+                text: getFormattedPhoneLabel(phoneNumber)
                 elide: Text.ElideRight
                 color: UbuntuColors.lightAubergine
                 height: units.gu(2)
@@ -263,7 +270,7 @@
             Label {
                 id: remoteParticipantId
                 // FIXME: we need to check if the id is actually a phone number
-                text: PhoneUtils.PhoneUtils.format(modelData.remoteParticipant)
+                text: getFormattedPhoneLabel(modelData.remoteParticipant)
                 anchors {
                     left: timeLabel.right
                     leftMargin: units.gu(1)