Merge lp:~boiko/telephony-service/rtm-fix_1376803 into lp:telephony-service/rtm-14.09

[Gustavo Pichorim Boiko]

Add phone number match to phone utils from libphonenumber. This is mostly useful in phone number replacement cases like:

https://bugs.launchpad.net/messaging-app/+bug/1376803

Add phone number match to phone utils from libphonenumber. This is mostly useful in phone number replacement cases like:

https://bugs.launchpad.net/messaging-app/+bug/1376803

=== modified file 'Ubuntu/Telephony/PhoneNumber/phoneutils.cpp'
--- Ubuntu/Telephony/PhoneNumber/phoneutils.cpp	2014-12-16 01:06:08 +0000
+++ Ubuntu/Telephony/PhoneNumber/phoneutils.cpp	2015-01-21 17:04:50 +0000
@@ -22,6 +22,8 @@
 #include "phoneutils.h"
 
 #include <QtCore/QDebug>
+#include <phonenumbers/phonenumbermatch.h>
+#include <phonenumbers/phonenumbermatcher.h>
 #include <phonenumbers/phonenumberutil.h>
 
 
@@ -96,4 +98,22 @@
     return QObject::event(event);
 }
 
+QStringList PhoneUtils::matchInText(const QString& text, const QString &defaultRegion)
+{
+    if (text.isEmpty()) {
+        return QStringList();
+    }
+
+    QString region = defaultRegion.isEmpty() ? this->defaultRegion() : defaultRegion;
+
+    QStringList matches;
+    i18n::phonenumbers::PhoneNumberMatcher matcher(text.toStdString(), region.toStdString());
+    if (matcher.HasNext()) {
+        i18n::phonenumbers::PhoneNumberMatch match;
+        matcher.Next(&match);
+        matches.append(QString::fromStdString(match.raw_string()));
+    }
+
+    return matches;
+}
 

=== modified file 'Ubuntu/Telephony/PhoneNumber/phoneutils.h'
--- Ubuntu/Telephony/PhoneNumber/phoneutils.h	2014-07-14 23:06:34 +0000
+++ Ubuntu/Telephony/PhoneNumber/phoneutils.h	2015-01-21 17:04:50 +0000
@@ -43,6 +43,8 @@
 
     QString defaultRegion() const;
 
+    Q_INVOKABLE QStringList matchInText(const QString& text, const QString &defaultRegion = QString());
+
     Q_INVOKABLE QString format(const QString &phoneNumber, const QString &defaultRegion = QString(), PhoneNumberFormat format = Auto);
 
     virtual bool event(QEvent *event);

=== modified file 'Ubuntu/Telephony/tests/tst_PhoneNumberPhoneUtils.qml'
--- Ubuntu/Telephony/tests/tst_PhoneNumberPhoneUtils.qml	2014-12-16 01:06:08 +0000
+++ Ubuntu/Telephony/tests/tst_PhoneNumberPhoneUtils.qml	2015-01-21 17:04:50 +0000
@@ -47,4 +47,41 @@
         var localeName = Qt.locale().name
         compare(PhoneNumber.PhoneUtils.defaultRegion, localeName.substr(localeName.length - 2, 2))
     }
+
+    function test_matchPhone_data()
+    {
+        var data = [];
+        data.push({text: "my 1rst phone number 617-688-0034, ..",
+                      expectedMatches: ["617-688-0034"]})    // Local number
+        data.push({text: "my 1rst phone number 650 253 0000, ..",
+                      expectedMatches: ["650 253 0000"]})    // Local number
+        data.push({text: "my phnle number 7327572923, please call me",
+                      expectedMatches: ["7327572923"]})      // Country number
+        data.push({text: "my international number [phone], please call me",
+                      expectedMatches: ["[phone]"]})   // International number
+        data.push({text: "this is an invalid number 55555555555, yes yes it is",
+                      expectedMatches: []})                  // Invalid number
+        data.push({text: "could you call me between 15h30-16h yes?",
+                      expectedMatches: []})                  // Invalid number
+        data.push({text: "could you call me between at extension *144 yes?",
+                      expectedMatches: []})                  // Special number
+        data.push({text: "my operator number: #123#, yes",
+                      expectedMatches: []})                  // Operators command
+        return data
+    }
+
+    function compareMatches(matches1, matches2)
+    {
+        compare(matches1.length, matches2.length)
+        for (var i = 0; i < matches1.length; ++i) {
+            compare(matches1[i], matches2[i])
+        }
+    }
+
+    function test_matchPhone(data)
+    {
+        var actualMatches = PhoneNumber.PhoneUtils.matchInText(data.text, "US")
+        compareMatches(actualMatches, data.expectedMatches)
+    }
 }
+