Merge lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles into lp:messaging-app

[Alexandre Abreu]

Localize and strengthen the phone number detection scheme used from within a given message bubble as it is replaced by tel:// URIs.

It needs some new APIs from the libphonenumber QML plugin

https://code.launchpad.net/~abreu-alexandre/telephony-service/expose-phone-number-matcher/+merge/241196

Localize and strengthen the phone number detection scheme used from within a given message bubble as it is replaced by tel:// URIs.

It needs some new APIs from the libphonenumber QML plugin

https://code.launchpad.net/~abreu-alexandre/telephony-service/expose-phone-number-matcher/+merge/241196

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/488/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/44/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

270. By Alexandre Abreu on 2014-11-09

fix build

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:270
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/489/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/45/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

271. By Alexandre Abreu on 2014-11-10

rever uneeded additional dep

272. By Alexandre Abreu on 2014-11-10

rever uneeded additional dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/490/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/47/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

273. By Alexandre Abreu on 2014-11-10

update

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/491/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/59/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

274. By Alexandre Abreu on 2014-11-10

remove confusion about phone number plugin dep

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/492/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/97/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/62/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

275. By Alexandre Abreu on 2014-11-11

cleanup formatting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/493/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/77/console

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

review: Needs Fixing (continuous-integration)

[lp:~abreu-alexandre/messaging-app/phone-number-detection-msg-bubbles]

276. By Alexandre Abreu on 2014-11-18

Add build dep for qtdeclarative5-ubuntu-telephony-phonenumber0.1 since it is needed for unit tests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/494/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/263
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/7
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/263
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15962
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/181
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/181/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

It looks good.
Tested on the device and it seems to work well.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-09-10 20:02:04 +0000
+++ debian/control	2014-11-18 17:32:47 +0000
@@ -16,6 +16,7 @@
                qtdeclarative5-gsettings1.0,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-ubuntu-history0.1,
+               qtdeclarative5-ubuntu-telephony-phonenumber0.1,
                qtpim5-dev,
                xvfb,
 Standards-Version: 3.9.4
@@ -31,6 +32,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
          qtdeclarative5-ubuntu-history0.1 | qtdeclarative5-ubuntu-history-plugin,
          qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
          qtdeclarative5-ubuntu-contacts0.1 (>= 0.2+14.10.20140805),

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2014-10-21 16:17:17 +0000
+++ src/qml/MessageBubble.qml	2014-11-18 17:32:47 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.2
 import Ubuntu.Components 1.1
 import Ubuntu.History 0.1
+import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneNumber
 
 import "dateUtils.js" as DateUtils
 import "3rd_party/ba-linkify.js" as BaLinkify
@@ -38,8 +39,17 @@
     readonly property bool sending: (messageStatus === HistoryThreadModel.MessageStatusUnknown ||
                                      messageStatus === HistoryThreadModel.MessageStatusTemporarilyFailed) && !messageIncoming
 
+    // XXXX: should be hoisted
+    function getCountryCode() {
+        var localeName = Qt.locale().name
+        return localeName.substr(localeName.length - 2, 2)
+    }
+
+    function formatTelSchemeWith(phoneNumber) {
+        return '<a href="tel:///' + phoneNumber + '">' + phoneNumber + '</a>'
+    }
+
     function parseText(text) {
-        var phoneExp = /(\+?([0-9]+[ ]?)?\(?([0-9]+)\)?[- ]?([0-9]+)[- ]?([0-9]+)[- ]?([0-9]+))/img;
         // remove html tags
         text = text.replace(/</g,'&lt;').replace(/>/g,'<tt>&gt;</tt>');
         // replace line breaks
@@ -49,8 +59,14 @@
         if (htmlText !== text) {
             return htmlText
         }
+
         // linkify phone numbers if no web links were found
-        return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
+        var phoneNumbers = PhoneNumber.PhoneUtils.matchInText(text, getCountryCode())
+        for (var i = 0; i < phoneNumbers.length; ++i) {
+            var currentNumber = phoneNumbers[i]
+            text = text.replace(currentNumber, formatTelSchemeWith(currentNumber))
+        }
+        return text
     }
 
     color: {