Merge lp:~tiagosh/telepathy-ofono/use-libphonenumber into lp:telepathy-ofono

[Tiago Salem Herrmann]

Use libphonenumber for phone number validation, normalization and comparison.

Use libphonenumber for phone number validation, normalization and comparison.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

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/<package-name>) on device or emulator?
Yes

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

If you changed UI labels, did you update the pot file?
N/A

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/177/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/177/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

155. By Tiago Salem Herrmann on 2015-07-17

Provide a fallback to country code if none is provided.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/179/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

156. By Tiago Salem Herrmann on 2015-07-20

Add country code support in the emergency mode interface

157. By Tiago Salem Herrmann on 2015-07-20

Add country code database and an auto generation tool

158. By Tiago Salem Herrmann on 2015-07-20

Set MCC in PhoneUtils when needed

159. By Tiago Salem Herrmann on 2015-07-20

Also use SimManager interface to retrieve mobile country code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/41/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/41/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/183/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

160. By Tiago Salem Herrmann on 2015-07-20

Initialize mMcc

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/185/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

161. By Tiago Salem Herrmann on 2015-07-21

Use IsEmergencyNumber() instead of ConnectsToEmergencyNumber()

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/186/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

162. By Tiago Salem Herrmann on 2015-07-22

Don't notify the same country code twice

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/187/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

163. By Tiago Salem Herrmann on 2015-07-23

Don't check for emergency numbers. This check must be done by the upper layers. We simply bypass the request to ofono

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/188/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

164. By Tiago Salem Herrmann on 2015-08-05

remove unused include

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/192/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Just a couple remarks, other than that looks good.

review: Needs Fixing

[lp:~tiagosh/telepathy-ofono/use-libphonenumber]

165. By Tiago Salem Herrmann on 2015-08-07

fix header copyright

166. By Tiago Salem Herrmann on 2015-08-07

add test for phone numbers with slashes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/193/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 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-08 20:48:08 +0000
+++ CMakeLists.txt	2015-08-07 19:10:15 +0000
@@ -30,6 +30,7 @@
   ENABLE_COVERAGE_REPORT(TARGETS ${TELEPATHY_OFONO})
 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
 
+find_package(LibPhoneNumber REQUIRED)
 find_package(Qt5Core)
 find_package(Qt5DBus)
 add_definitions(-DQT_NO_KEYWORDS)
@@ -58,6 +59,7 @@
 include_directories(${Qt5Core_INCLUDE_DIRS})
 include_directories(${Qt5DBus_INCLUDE_DIRS})
 include_directories(${SQLITE3_INCLUDE_DIRS})
+include_directories(${LibPhoneNumber_INCLUDE_DIRS})
 include_directories(/usr/include/telepathy-qt5/)
 include_directories(/usr/include/ofono-qt/)
 
@@ -65,7 +67,7 @@
 find_library(TELEPATHY_QT5_SERVICE_LIBRARIES telepathy-qt5-service)
 find_library(OFONO_QT_LIBRARIES ofono-qt)
 
-qt5_add_resources(telepathyfono_RES sqlitetelepathyofono.qrc)
+qt5_add_resources(telepathyfono_RES sqlitetelepathyofono.qrc countrycodes.qrc)
 
 # update the .qrc file automatically when there are new schema files
 file(GLOB QRC_RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.sql ${CMAKE_CURRENT_SOURCE_DIR}/schema/*.info)
@@ -109,7 +111,7 @@
 
 enable_testing()
 
-target_link_libraries(${TELEPATHY_OFONO} ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${WAUDIO_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${SQLITE3_LIBRARIES})
+target_link_libraries(${TELEPATHY_OFONO} ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${WAUDIO_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${SQLITE3_LIBRARIES} ${LibPhoneNumber_LIBRARIES})
 install(TARGETS ${TELEPATHY_OFONO} DESTINATION ${DAEMON_DIR})
 
 configure_file(ofono.service.in org.freedesktop.Telepathy.ConnectionManager.ofono.service)

=== added file 'cmake/modules/FindLibPhoneNumber.cmake'
--- cmake/modules/FindLibPhoneNumber.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/FindLibPhoneNumber.cmake	2015-08-07 19:10:15 +0000
@@ -0,0 +1,23 @@
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+include(GNUInstallDirs)
+include(LibFindMacros)
+
+# Include dir
+find_path(LibPhoneNumber_INCLUDE_DIR
+  NAMES phonenumberutil.h
+  PATHS "/usr/local/${CMAKE_INSTALL_INCLUDEDIR}" ${CMAKE_INSTALL_FULL_INCLUDEDIR}
+  PATH_SUFFIXES "phonenumbers"
+)
+
+# library itself
+find_library(LibPhoneNumber_LIBRARY
+  NAMES phonenumber
+  PATHS "/usr/local/${CMAKE_INSTALL_LIBDIR}" ${CMAKE_INSTALL_FULL_LIBDIR}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(LibPhoneNumber_PROCESS_INCLUDES LibPhoneNumber_INCLUDE_DIR)
+set(LibPhoneNumber_PROCESS_LIBS LibPhoneNumber_LIBRARY)
+libfind_process(LibPhoneNumber)

=== added file 'cmake/modules/LibFindMacros.cmake'
--- cmake/modules/LibFindMacros.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/LibFindMacros.cmake	2015-08-07 19:10:15 +0000
@@ -0,0 +1,112 @@
+# Version 1.0 (2013-04-12)
+# Public Domain, originally written by Lasse Kärkkäinen <[e-mail]>
+# Published at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+# If you improve the script, please modify the forementioned wiki page because
+# I no longer maintain my scripts (hosted as static files at zi.fi). Feel free
+# to remove this entire header if you use real version control instead.
+
+# Changelog:
+# 2013-04-12  Added version number (1.0) and this header, no other changes
+# 2009-10-08  Originally published
+
+
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro (libfind_package PREFIX)
+  set (LIBFIND_PACKAGE_ARGS ${ARGN})
+  if (${PREFIX}_FIND_QUIETLY)
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
+  endif (${PREFIX}_FIND_QUIETLY)
+  if (${PREFIX}_FIND_REQUIRED)
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
+  endif (${PREFIX}_FIND_REQUIRED)
+  find_package(${LIBFIND_PACKAGE_ARGS})
+endmacro (libfind_package)
+
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(${PREFIX} ${PKGNAME})
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+endmacro (libfind_pkg_check_modules)
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+macro (libfind_process PREFIX)
+  # Skip processing if already processed during this run
+  if (NOT ${PREFIX}_FOUND)
+    # Start with the assumption that the library was found
+    set (${PREFIX}_FOUND TRUE)
+
+    # Process all includes and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+      if (${i})
+        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
+
+    # Process all libraries and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_LIBS})
+      if (${i})
+        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
+
+    # Print message and/or exit on fatal error
+    if (${PREFIX}_FOUND)
+      if (NOT ${PREFIX}_FIND_QUIETLY)
+        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      endif (NOT ${PREFIX}_FIND_QUIETLY)
+    else (${PREFIX}_FOUND)
+      if (${PREFIX}_FIND_REQUIRED)
+        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+          message("${i}=${${i}}")
+        endforeach (i)
+        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+      endif (${PREFIX}_FIND_REQUIRED)
+    endif (${PREFIX}_FOUND)
+  endif (NOT ${PREFIX}_FOUND)
+endmacro (libfind_process)
+
+macro(libfind_library PREFIX basename)
+  set(TMP "")
+  if(MSVC80)
+    set(TMP -vc80)
+  endif(MSVC80)
+  if(MSVC90)
+    set(TMP -vc90)
+  endif(MSVC90)
+  set(${PREFIX}_LIBNAMES ${basename}${TMP})
+  if(${ARGC} GREATER 2)
+    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+  endif(${ARGC} GREATER 2)
+  find_library(${PREFIX}_LIBRARY
+    NAMES ${${PREFIX}_LIBNAMES}
+    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+  )
+endmacro(libfind_library)
+

=== modified file 'connection.cpp'
--- connection.cpp	2015-07-28 14:40:12 +0000
+++ connection.cpp	2015-08-07 19:10:15 +0000
@@ -229,6 +229,7 @@
     QObject::connect(mOfonoSimManager, SIGNAL(subscriberNumbersChanged(QStringList)), SLOT(updateOnlineStatus()));
     QObject::connect(mOfonoNetworkRegistration, SIGNAL(statusChanged(QString)), SLOT(updateOnlineStatus()));
     QObject::connect(mOfonoNetworkRegistration, SIGNAL(nameChanged(QString)), SLOT(updateOnlineStatus()));
+    QObject::connect(mOfonoNetworkRegistration, SIGNAL(mccChanged(QString)), SLOT(updateOnlineStatus(QString)));
     QObject::connect(mOfonoNetworkRegistration, SIGNAL(validityChanged(bool)), SLOT(onValidityChanged(bool)));
     QObject::connect(mOfonoMessageWaiting, SIGNAL(voicemailMessageCountChanged(int)), voicemailIface.data(), SLOT(setVoicemailCount(int)));
     QObject::connect(mOfonoMessageWaiting, SIGNAL(voicemailWaitingChanged(bool)), voicemailIface.data(), SLOT(setVoicemailIndicator(bool)));
@@ -308,6 +309,19 @@
     }
 }
 
+void oFonoConnection::updateMcc()
+{
+    QString mcc;
+    // check if the network mcc is available first, then try the sim card mcc
+    if (!mOfonoNetworkRegistration->mcc().isEmpty()) {
+        mcc = mOfonoNetworkRegistration->mcc();
+    } else if (!mOfonoSimManager->mobileCountryCode().isEmpty()) {
+        mcc = mOfonoSimManager->mobileCountryCode();
+    }
+    PhoneUtils::setMcc(mcc);
+    emergencyModeIface->setCountryCode(PhoneUtils::countryCodeForMCC(mcc));
+}
+
 void oFonoConnection::onMMSDServiceAdded(const QString &path)
 {
     MMSDService *service = new MMSDService(path, this);
@@ -508,17 +522,6 @@
               status.isEmpty());
 }
 
-bool oFonoConnection::isEmergencyNumber(const QString &number)
-{
-    Q_FOREACH (const QString &emergencyNumber, mOfonoVoiceCallManager->emergencyNumbers()) {
-        if (PhoneUtils::comparePhoneNumbers(emergencyNumber, number)) {
-            return true;
-            break;
-        }
-    }
-    return false;
-}
-
 uint oFonoConnection::setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error)
 {
     qDebug() << "setPresence" << status;
@@ -601,6 +604,8 @@
 
     presences[selfHandle()] = mSelfPresence;
     simplePresenceIface->setPresences(presences);
+
+    updateMcc();
 }
 
 uint oFonoConnection::newHandle(const QString &identifier)
@@ -720,7 +725,7 @@
                          (!request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")) || request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")] == Tp::HandleTypeNone) &&
                          (!request.contains(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")) || request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")] == 0));
 
-    if (!available && (isConference || !isEmergencyNumber(newPhoneNumber))) {
+    if (!available && isConference) {
         error->set(TP_QT_ERROR_NETWORK_ERROR, "No network available");
         return Tp::BaseChannelPtr();
     }

=== modified file 'connection.h'
--- connection.h	2015-07-28 14:31:21 +0000
+++ connection.h	2015-08-07 19:10:15 +0000
@@ -154,8 +154,8 @@
 #endif
 
 private:
+    void updateMcc();
     bool isNetworkRegistered();
-    bool isEmergencyNumber(const QString &number);
     void addMMSToService(const QString &path, const QVariantMap &properties, const QString &servicePath);
     void ensureTextChannel(const QString &message, const QVariantMap &info, bool flash);
     QMap<uint, QString> mHandles;

=== added file 'countrycodes.qrc'
--- countrycodes.qrc	1970-01-01 00:00:00 +0000
+++ countrycodes.qrc	2015-08-07 19:10:15 +0000
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>countrycodes.txt</file>
+    </qresource>
+</RCC>

=== added file 'countrycodes.txt'
--- countrycodes.txt	1970-01-01 00:00:00 +0000
+++ countrycodes.txt	2015-08-07 19:10:15 +0000
@@ -0,0 +1,224 @@
+514:TP
+515:PH
+520:TH
+525:SG
+528:BN
+530:NZ
+537:PG
+539:TO
+540:SB
+541:VU
+542:FJ
+544:AS
+545:KI
+546:NC
+547:PF
+548:CK
+549:WS
+550:FM
+552:PW
+553:TV
+555:NU
+602:EG
+603:DZ
+604:MA
+605:TN
+606:LY
+607:GM
+608:SN
+609:MR
+610:ML
+611:GN
+612:CI
+613:BF
+614:NE
+615:TG
+616:BJ
+617:MU
+618:LR
+619:SL
+620:GH
+621:NG
+622:TD
+623:CF
+624:CM
+625:CV
+626:ST
+627:GQ
+628:GA
+629:CG
+630:CD
+631:AO
+632:GW
+633:SC
+634:SD
+635:RW
+636:ET
+637:SO
+638:DJ
+639:KE
+640:TZ
+641:UG
+642:BI
+643:MZ
+645:ZM
+646:MG
+647:RE
+648:ZW
+649:NA
+650:MW
+651:LS
+652:BW
+653:SZ
+654:KM
+655:ZA
+657:ER
+659:SS
+714:PA
+702:BZ
+704:GT
+706:SV
+708:HN
+710:NI
+712:CR
+716:PE
+202:GR
+204:NL
+206:BE
+208:FR
+722:AR
+724:BR
+213:AD
+214:ES
+216:HU
+730:CL
+219:HR
+732:CO
+222:IT
+736:BO
+738:GY
+740:EC
+230:CZ
+231:SK
+232:AT
+746:SR
+235:GB
+748:UY
+750:FK
+240:SE
+242:NO
+244:FI
+246:LT
+247:LV
+248:EE
+212:MC
+250:RU
+255:UA
+257:BY
+259:MD
+260:PL
+262:DE
+266:GI
+268:PT
+270:LU
+272:IE
+274:IS
+276:AL
+278:MT
+280:CY
+282:GE
+283:AM
+284:BG
+218:BA
+286:TR
+288:FO
+289:GE
+290:GL
+292:SM
+293:SI
+294:MK
+295:LI
+297:ME
+302:CA
+308:PM
+734:VE
+310:US
+311:US
+312:US
+316:US
+330:PR
+226:RO
+334:MX
+338:JM
+340:MQ
+342:BB
+344:AG
+228:CH
+346:KY
+348:VG
+350:BM
+352:GD
+354:MS
+356:KN
+358:LC
+360:VC
+362:AN
+363:AW
+364:BS
+365:AI
+366:DM
+368:CU
+744:PY
+370:DO
+372:HT
+374:TT
+376:VI
+234:GB
+405:IN
+400:AZ
+401:KZ
+402:BT
+404:IN
+238:DK
+410:PK
+412:AF
+413:LK
+414:MM
+415:LB
+416:JO
+417:SY
+418:IQ
+419:KW
+420:SA
+421:YE
+422:OM
+424:AE
+425:PS
+426:BH
+427:QA
+428:MN
+429:NP
+430:AE
+431:AE
+432:IR
+434:UZ
+436:TK
+437:KG
+438:TM
+440:JP
+441:JP
+450:KR
+452:VN
+454:HK
+455:MO
+456:KH
+457:LA
+460:CN
+466:TW
+467:KP
+220:RS
+470:BD
+472:MV
+502:MY
+505:AU
+510:ID

=== modified file 'debian/control'
--- debian/control	2015-06-03 18:54:43 +0000
+++ debian/control	2015-08-07 19:10:15 +0000
@@ -9,6 +9,7 @@
                gnome-keyring,
                libmission-control-plugins-dev (>= 1:5.14.0),
                libofono-qt-dev (>= 1.5),
+               libphonenumber-dev,
                libqt5sql5-sqlite,
                libtelepathy-qt5-dev (>= 0.9.3),
                libpulse-dev [armhf],

=== modified file 'debian/copyright'
--- debian/copyright	2015-05-08 20:48:08 +0000
+++ debian/copyright	2015-08-07 19:10:15 +0000
@@ -7,10 +7,6 @@
 Copyright: 2013 Canonical, Ltd.
 License: LGPL-3
 
-Files: phoneutils.h
-Copyright: 2006 The Android Open Source Project
-License: Apache-2.0
-
 Files: debian/*
 Copyright: 2013 Canonical, Ltd.
 License: LGPL-3
@@ -29,19 +25,6 @@
            2012 Collabora Ltd
 License: LGPL-2.1+
 
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-      http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
 License: LGPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public

=== modified file 'emergencymodeiface.cpp'
--- emergencymodeiface.cpp	2015-01-20 16:00:58 +0000
+++ emergencymodeiface.cpp	2015-08-07 19:10:15 +0000
@@ -38,6 +38,7 @@
     EmergencyNumbersCallback emergencyNumbersCB;
     BaseConnectionEmergencyModeInterface::Adaptee *adaptee;
     QString fakeEmergencyNumber;
+    QString countryCode;
 };
 
 BaseConnectionEmergencyModeInterface::Adaptee::~Adaptee()
@@ -63,6 +64,11 @@
     }
 }
 
+void BaseConnectionEmergencyModeInterface::Adaptee::countryCode(const ConnectionInterfaceEmergencyModeAdaptor::CountryCodeContextPtr &context)
+{
+    context->setFinished(mInterface->mPriv->countryCode);
+}
+
 BaseConnectionEmergencyModeInterface::BaseConnectionEmergencyModeInterface()
     : AbstractConnectionInterface(TP_QT_IFACE_CONNECTION_EMERGENCYMODE),
       mPriv(new Private(this))
@@ -90,6 +96,15 @@
     Q_EMIT mPriv->adaptee->emergencyNumbersChanged(finalEmergencyList);
 }
 
+void BaseConnectionEmergencyModeInterface::setCountryCode(const QString &countryCode)
+{
+    if (mPriv->countryCode == countryCode) {
+        return;
+    }
+    mPriv->countryCode = countryCode;
+    Q_EMIT mPriv->adaptee->countryCodeChanged(mPriv->countryCode);
+}
+
 void BaseConnectionEmergencyModeInterface::setFakeEmergencyNumber(const QString &fakeEmergencyNumber)
 {
     mPriv->fakeEmergencyNumber = fakeEmergencyNumber;
@@ -112,6 +127,7 @@
     : Tp::AbstractAdaptor(bus, adaptee, parent)
 {
     connect(adaptee, SIGNAL(emergencyNumbersChanged(QStringList)), SIGNAL(EmergencyNumbersChanged(QStringList)));
+    connect(adaptee, SIGNAL(countryCodeChanged(QString)), SIGNAL(CountryCodeChanged(QString)));
 }
 
 ConnectionInterfaceEmergencyModeAdaptor::~ConnectionInterfaceEmergencyModeAdaptor()
@@ -131,3 +147,17 @@
         Q_ARG(ConnectionInterfaceEmergencyModeAdaptor::EmergencyNumbersContextPtr, ctx));
     return QStringList();
 }
+
+QString ConnectionInterfaceEmergencyModeAdaptor::CountryCode(const QDBusMessage& dbusMessage)
+{
+    if (!adaptee()->metaObject()->indexOfMethod("countryCode(ConnectionInterfaceEmergencyModeAdaptor::CountryCodeContextPtr)") == -1) {
+        dbusConnection().send(dbusMessage.createErrorReply(TP_QT_ERROR_NOT_IMPLEMENTED, QLatin1String("Not implemented")));
+        return QString();
+    }
+
+    CountryCodeContextPtr ctx = CountryCodeContextPtr(
+            new Tp::MethodInvocationContext< QString >(dbusConnection(), dbusMessage));
+    QMetaObject::invokeMethod(adaptee(), "countryCode",
+        Q_ARG(ConnectionInterfaceEmergencyModeAdaptor::CountryCodeContextPtr, ctx));
+    return QString();
+}

=== modified file 'emergencymodeiface.h'
--- emergencymodeiface.h	2015-01-20 16:00:58 +0000
+++ emergencymodeiface.h	2015-08-07 19:10:15 +0000
@@ -56,6 +56,7 @@
 
 public Q_SLOTS:
     void setEmergencyNumbers(const QStringList &numbers);
+    void setCountryCode(const QString &countryCode);
 
 protected:
     BaseConnectionEmergencyModeInterface();
@@ -83,6 +84,12 @@
 "    <signal name=\"EmergencyNumbersChanged\">\n"
 "      <arg type=\"as\" name=\"numbers\"/>\n"
 "    </signal>\n"
+"    <method name=\"CountryCode\">\n"
+"      <arg direction=\"out\" type=\"s\" name=\"countryCode\"/>\n"
+"    </method>\n"
+"    <signal name=\"CountryCodeChanged\">\n"
+"      <arg type=\"s\" name=\"countryCode\"/>\n"
+"    </signal>\n"
 "  </interface>\n"
 "")
 
@@ -91,12 +98,15 @@
     virtual ~ConnectionInterfaceEmergencyModeAdaptor();
 
     typedef Tp::MethodInvocationContextPtr< QStringList > EmergencyNumbersContextPtr;
+    typedef Tp::MethodInvocationContextPtr< QString > CountryCodeContextPtr;
 
 public Q_SLOTS: // METHODS
     QStringList EmergencyNumbers(const QDBusMessage& dbusMessage);
+    QString CountryCode(const QDBusMessage& dbusMessage);
 
 Q_SIGNALS: // SIGNALS
     void EmergencyNumbersChanged(const QStringList &numbers);
+    void CountryCodeChanged(const QString &countryCode);
 };
 
 
@@ -110,9 +120,11 @@
 
 private Q_SLOTS:
     void emergencyNumbers(const ConnectionInterfaceEmergencyModeAdaptor::EmergencyNumbersContextPtr &context);
+    void countryCode(const ConnectionInterfaceEmergencyModeAdaptor::CountryCodeContextPtr &context);
 
 Q_SIGNALS:
     void emergencyNumbersChanged(const QStringList &numbers);
+    void countryCodeChanged(const QString &countryCode);
 
 public:
     BaseConnectionEmergencyModeInterface *mInterface;

=== removed file 'phonenumberutils_p.h'
--- phonenumberutils_p.h	2013-11-08 14:53:53 +0000
+++ phonenumberutils_p.h	1970-01-01 00:00:00 +0000
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Original source code available at: http://androidxref.com/4.0.4/xref/frameworks/base/telephony/java/android/telephony/PhoneNumberUtils.java
- */
-
-#ifndef PHONENUMBERUTILS_H
-#define PHONENUMBERUTILS_H
-
-namespace PhoneNumberUtils 
-{
-
-/** True if c is ISO-LATIN characters 0-9, *, # , +, WILD, WAIT, PAUSE   */
-bool isNonSeparator(char c) 
-{
-    return (c >= '0' && c <= '9') || c == '*' || c == '#' || c == '+'
-            || c == 'N' || c == ';' || c == ',';
-}
-
-/** True if c is ISO-LATIN characters 0-9, *, # , +, WILD  */
-bool isDialable(char c) 
-{
-    return (c >= '0' && c <= '9') || c == '*' || c == '#' || c == '+' || c == 'N';
-}
-
-/** True if c is ISO-LATIN characters 0-9 */
-bool isISODigit (char c) {
-    return c >= '0' && c <= '9';
-}
-
-/** or -1 if both are negative */
-int minPositive (int a, int b) 
-{
-    if (a >= 0 && b >= 0) {
-        return (a < b) ? a : b;
-    } else if (a >= 0) { /* && b < 0 */
-        return a;
-    } else if (b >= 0) { /* && a < 0 */
-        return b;
-    } else { /* a < 0 && b < 0 */
-        return -1;
-    }
-}
-
-/** index of the last character of the network portion
- *  (eg anything after is a post-dial string)
- */
-int indexOfLastNetworkChar(const QString &a) 
-{
-    int pIndex, wIndex;
-    int origLength;
-    int trimIndex;
-
-    origLength = a.length();
-
-    pIndex = a.indexOf(',');
-    wIndex = a.indexOf(';');
-
-    trimIndex = minPositive(pIndex, wIndex);
-
-    if (trimIndex < 0) {
-        return origLength - 1;
-    } else {
-        return trimIndex - 1;
-    }
-}
-
-/** all of a up to len must be an international prefix or
- *  separators/non-dialing digits
- */
-bool matchIntlPrefix(const QString &a, int len) 
-{
-    /* '([^0-9*#+pwn]\+[^0-9*#+pwn] | [^0-9*#+pwn]0(0|11)[^0-9*#+pwn] )$' */
-    /*        0       1                           2 3 45               */
-
-    int state = 0;
-    for (int i = 0 ; i < len ; i++) {
-        char c = a.at(i).toLatin1();
-
-        switch (state) {
-            case 0:
-                if      (c == '+') state = 1;
-                else if (c == '0') state = 2;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 2:
-                if      (c == '0') state = 3;
-                else if (c == '1') state = 4;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 4:
-                if      (c == '1') state = 5;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            default:
-                if (isNonSeparator(c)) return false;
-            break;
-
-        }
-    }
-
-    return state == 1 || state == 3 || state == 5;
-}
-
-/** all of 'a' up to len must match non-US trunk prefix ('0') */
-bool matchTrunkPrefix(const QString &a, int len) {
-    bool found;
-
-    found = false;
-
-    for (int i = 0 ; i < len ; i++) {
-        char c = a.at(i).toLatin1();
-
-        if (c == '0' && !found) {
-            found = true;
-        } else if (isNonSeparator(c)) {
-            return false;
-        }
-    }
-
-    return found;
-}
-
-/** all of 'a' up to len must be a (+|00|011)country code)
- *  We're fast and loose with the country code. Any \d{1,3} matches */
-bool matchIntlPrefixAndCC(const QString &a, int len) {
-    /*  [^0-9*#+pwn]*(\+|0(0|11)\d\d?\d? [^0-9*#+pwn] $ */
-    /*      0          1 2 3 45  6 7  8                 */
-
-    int state = 0;
-    for (int i = 0 ; i < len ; i++ ) {
-        char c = a.at(i).toLatin1();
-
-        switch (state) {
-            case 0:
-                if      (c == '+') state = 1;
-                else if (c == '0') state = 2;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 2:
-                if      (c == '0') state = 3;
-                else if (c == '1') state = 4;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 4:
-                if      (c == '1') state = 5;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 1:
-            case 3:
-            case 5:
-                if      (isISODigit(c)) state = 6;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            case 6:
-            case 7:
-                if      (isISODigit(c)) state++;
-                else if (isNonSeparator(c)) return false;
-            break;
-
-            default:
-                if (isNonSeparator(c)) return false;
-        }
-    }
-
-    return state == 6 || state == 7 || state == 8;
-}
-
-
-/**
- * Compare phone numbers a and b, return true if they're identical
- * enough for caller ID purposes.
- *
- * - Compares from right to left
- * - requires MIN_MATCH (7) characters to match
- * - handles common trunk prefixes and international prefixes
- *   (basically, everything except the Russian trunk prefix)
- *
- * Note that this method does not return false even when the two phone numbers
- * are not exactly same; rather; we can call this method "similar()", not "equals()".
- *
- * @hide
- */
-bool compareLoosely(const QString &a, const QString &b)
-{
-     int ia, ib;
-     int matched;
-     int numNonDialableCharsInA = 0;
-     int numNonDialableCharsInB = 0;
-
-     if (a.length() == 0 || b.length() == 0) {
-         return false;
-     }
-
-     if (a == b) {
-         return true;
-     }
-
-     ia = indexOfLastNetworkChar (a);
-     ib = indexOfLastNetworkChar (b);
-     matched = 0;
-
-     while (ia >= 0 && ib >=0) {
-         char ca, cb;
-         bool skipCmp = false;
-
-         ca = a.at(ia).toLatin1();
-
-         if (!isDialable(ca)) {
-             ia--;
-             skipCmp = true;
-             numNonDialableCharsInA++;
-         }
-
-         cb = b.at(ib).toLatin1();
-
-         if (!isDialable(cb)) {
-             ib--;
-             skipCmp = true;
-             numNonDialableCharsInB++;
-         }
-
-         if (!skipCmp) {
-             if (cb != ca && ca != 'N' && cb != 'N') {
-                 break;
-             }
-             ia--; ib--; matched++;
-         }
-     }
-
-     if (matched < 7) {
-         int effectiveALen = a.length() - numNonDialableCharsInA;
-         int effectiveBLen = b.length() - numNonDialableCharsInB;
-
-
-         // if the number of dialable chars in a and b match, but the matched chars < MIN_MATCH,
-         // treat them as equal (i.e. 404-04 and 40404)
-         if (effectiveALen == effectiveBLen && effectiveALen == matched) {
-             return true;
-         }
-
-         return false;
-     }
-
-     // At least one string has matched completely;
-     if (matched >= 7 && (ia < 0 || ib < 0)) {
-         return true;
-     }
-
-     /*
-      * Now, what remains must be one of the following for a
-      * match:
-      *
-      *  - a '+' on one and a '00' or a '011' on the other
-      *  - a '0' on one and a (+,00)<country code> on the other
-      *     (for this, a '0' and a '00' prefix would have succeeded above)
-      */
-
-     if (matchIntlPrefix(a, ia + 1)
-         && matchIntlPrefix (b, ib +1)
-     ) {
-         return true;
-     }
-
-     if (matchTrunkPrefix(a, ia + 1)
-         && matchIntlPrefixAndCC(b, ib +1)
-     ) {
-         return true;
-     }
-
-     if (matchTrunkPrefix(b, ib + 1)
-         && matchIntlPrefixAndCC(a, ia +1)
-     ) {
-         return true;
-     }
-
-     return false;
-}
-
-}
-
-#endif

=== modified file 'phoneutils.cpp'
--- phoneutils.cpp	2015-06-17 20:19:50 +0000
+++ phoneutils.cpp	2015-08-07 19:10:15 +0000
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2012-2013 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
+ *  Renato Araujo Oliveira Filho <[e-mail]>
  *  Tiago Salem Herrmann <[e-mail]>
  *
  * This file is part of telepathy-ofono.
@@ -20,46 +21,114 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QRegExp>
 #include "phoneutils_p.h"
-#include "phonenumberutils_p.h"
-
-PhoneUtils::PhoneUtils(QObject *parent) :
-    QObject(parent)
-{
-}
-
-bool PhoneUtils::comparePhoneNumbers(const QString &number1, const QString &number2)
-{
-    if (isPhoneNumber(number1) && isPhoneNumber(number2)) {
-        return PhoneNumberUtils::compareLoosely(number1, number2);
-    }
-    return number1 == number2;
-}
-
-bool PhoneUtils::isPhoneNumber(const QString &identifier) {
-    // remove all non diable digits
-    QString finalNumber = QString(identifier).replace(QRegExp("[p+*#/(),;-]"),"");
-    finalNumber = finalNumber.replace(QRegExp("(\\s+)"), "");
-    // if empty, the number is invalid
-    if (finalNumber.isEmpty())
-        return false;
-
-    finalNumber = finalNumber.replace(QRegExp("(\\d+)"), "");
-    return finalNumber.isEmpty();
-}
-
-// TODO improve this normalization algorithm. More complex numbers 
-// like "[phone] w 12345678#" should be normalizd to "[phone]"
-QString PhoneUtils::normalizePhoneNumber(const QString &identifier) {
-    if (!isPhoneNumber(identifier)) {
-        // do not normalize non phone numbers
-        return identifier;
-    }
-    QRegExp regexp = QRegExp("(\\s+)");
-    QString finalNumber = QString(identifier).replace(regexp,"");
-    finalNumber = finalNumber.replace(QRegExp("[()/-]"),"");
-    return finalNumber;
-}
-
-
+
+
+#include <phonenumbers/phonenumbermatch.h>
+#include <phonenumbers/phonenumbermatcher.h>
+#include <phonenumbers/phonenumberutil.h>
+
+#include <QLocale>
+#include <QDebug>
+#include <QTextStream>
+#include <QFile>
+
+QString PhoneUtils::mMcc = QString();
+
+void PhoneUtils::setMcc(const QString &mcc)
+{
+    mMcc = mcc;
+}
+
+QString PhoneUtils::countryCodeForMCC(const QString &mcc, bool useFallback)
+{
+    static QMap<QString, QString> countryCodes;
+    if (countryCodes.isEmpty()) {
+        QFile countryCodesFile(":/countrycodes.txt");
+        if (!countryCodesFile.open(QFile::ReadOnly)) {
+            qCritical() << "Failed to open " << countryCodesFile.fileName();
+            if (useFallback) {
+                return region();
+            }
+            return QString();
+        }
+        QTextStream stream(&countryCodesFile);
+        while (!stream.atEnd()) {
+            QString line = stream.readLine();
+            QStringList tuple = line.split(":");
+            if (tuple.size() != 2) {
+                qCritical() << "Failed to parse line" << line;
+                if (useFallback) {
+                    return region();
+                }
+                return QString();
+            }
+            countryCodes[tuple[0]] = tuple[1];
+        }
+    }
+    if (!countryCodes.contains(mcc) && useFallback) {
+        return region();
+    }
+    return countryCodes[mcc];
+}
+
+QString PhoneUtils::region()
+{
+     QString countryCode = QLocale::system().name().split("_").last();
+     if (countryCode.size() < 2) {
+         // fallback to US if no valid country code was provided, otherwise libphonenumber
+         // will fail to parse any numbers
+         return QString("US");
+     }
+     return countryCode;
+}
+
+QString PhoneUtils::normalizePhoneNumber(const QString &phoneNumber)
+{
+    static i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
+    if (!isPhoneNumber(phoneNumber)) {
+        return phoneNumber;
+    }
+    std::string number = phoneNumber.toStdString();
+    phonenumberUtil->NormalizeDiallableCharsOnly(&number);
+    return QString::fromStdString(number);
+}
+
+bool PhoneUtils::comparePhoneNumbers(const QString &phoneNumberA, const QString &phoneNumberB)
+{
+    static i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
+    // if any of the number isn't a phone number, just do a simple string comparison
+    if (!isPhoneNumber(phoneNumberA) || !isPhoneNumber(phoneNumberB)) {
+        return phoneNumberA == phoneNumberB;
+    }
+    i18n::phonenumbers::PhoneNumberUtil::MatchType match = phonenumberUtil->
+            IsNumberMatchWithTwoStrings(phoneNumberA.toStdString(),
+                                        phoneNumberB.toStdString());
+    return (match > i18n::phonenumbers::PhoneNumberUtil::NO_MATCH);
+}
+
+bool PhoneUtils::isPhoneNumber(const QString &phoneNumber)
+{
+    static i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
+    std::string formattedNumber;
+    i18n::phonenumbers::PhoneNumber number;
+    i18n::phonenumbers::PhoneNumberUtil::ErrorType error;
+    error = phonenumberUtil->Parse(phoneNumber.toStdString(), countryCodeForMCC(mMcc, true).toStdString(), &number);
+
+    switch(error) {
+    case i18n::phonenumbers::PhoneNumberUtil::INVALID_COUNTRY_CODE_ERROR:
+        qWarning() << "Invalid country code for:" << phoneNumber;
+        return false;
+    case i18n::phonenumbers::PhoneNumberUtil::NOT_A_NUMBER:
+        qWarning() << "The phone number is not a valid number:" << phoneNumber;
+        return false;
+    case i18n::phonenumbers::PhoneNumberUtil::TOO_SHORT_AFTER_IDD:
+    case i18n::phonenumbers::PhoneNumberUtil::TOO_SHORT_NSN:
+    case i18n::phonenumbers::PhoneNumberUtil::TOO_LONG_NSN:
+        qWarning() << "Invalid phone number" << phoneNumber;
+        return false;
+    default:
+        break;
+    }
+    return true;
+}

=== added file 'phoneutils_p.h'
--- phoneutils_p.h	1970-01-01 00:00:00 +0000
+++ phoneutils_p.h	2015-08-07 19:10:15 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Gustavo Pichorim Boiko <[e-mail]>
+ *  Renato Araujo Oliveira Filho <[e-mail]>
+ *  Tiago Salem Herrmann <[e-mail]>
+ *
+ * This file is part of telepathy-ofono.
+ *
+ * telepathy-ofono is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telepathy-ofono is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TELEPHONY_PHONEUTILS_H
+#define TELEPHONY_PHONEUTILS_H
+
+#include <QtCore/QObject>
+
+class PhoneUtils : public QObject
+{
+    Q_OBJECT
+public:
+    enum PhoneNumberFormat {
+        E164 = 0,
+        International,
+        National,
+        RFC3966,
+        Auto
+    };
+
+    static QString normalizePhoneNumber(const QString &phoneNumber);
+    static bool comparePhoneNumbers(const QString &phoneNumberA,const QString &phoneNumberB);
+    static bool isPhoneNumber(const QString &identifier);
+    static QString countryCodeForMCC(const QString &mcc, bool useFallback = true);
+    static void setMcc(const QString &mcc);
+private:
+    static QString region();
+    static QString mMcc;
+};
+
+#endif

=== removed file 'phoneutils_p.h'
--- phoneutils_p.h	2013-11-11 15:10:00 +0000
+++ phoneutils_p.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * Authors:
- *  Gustavo Pichorim Boiko <[e-mail]>
- *  Tiago Salem Herrmann <[e-mail]>
- *
- * This file is part of telepathy-ofono.
- *
- * telepathy-ofono is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * telepathy-ofono is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PHONEUTILS_H
-#define PHONEUTILS_H
-
-#include <QObject>
-
-class PhoneUtils : public QObject
-{
-    Q_OBJECT
-public:
-    explicit PhoneUtils(QObject *parent = 0);
-    Q_INVOKABLE static bool comparePhoneNumbers(const QString &number1, const QString &number2);
-    Q_INVOKABLE static bool isPhoneNumber(const QString &identifier);
-    Q_INVOKABLE static QString normalizePhoneNumber(const QString &identifier);
-};
-
-#endif // PHONEUTILS_H

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-02-24 16:31:18 +0000
+++ tests/CMakeLists.txt	2015-08-07 19:10:15 +0000
@@ -26,12 +26,14 @@
                           XDG_DATA_DIRS=${TMPDIR};
                           MC_ACCOUNT_DIR=${TMPDIR};
                           MC_MANAGER_DIR=${TMPDIR};
+                          MC_CLIENTS_DIR=${TMPDIR};
                           PA_DISABLED=1")
     set_tests_properties(${TESTNAME} PROPERTIES
                           ENVIRONMENT "${TEST_ENVIRONMENT}"
                           TIMEOUT 30)
     target_link_libraries(${TESTNAME}
                           ${TP_QT5_LIBRARIES}
+                          ${LibPhoneNumber_LIBRARIES}
                          )
 endmacro(generate_test)
 

=== modified file 'tests/PhoneUtilsTest.cpp'
--- tests/PhoneUtilsTest.cpp	2013-12-04 14:31:39 +0000
+++ tests/PhoneUtilsTest.cpp	2015-08-07 19:10:15 +0000
@@ -43,10 +43,12 @@
     QTest::newRow("number with dash") << "1234-5678" << true;
     QTest::newRow("number with area code") << "(123)12345678" << true;
     QTest::newRow("number with extension") << "12345678#123" << true;
-    QTest::newRow("number with comma") << "33333333,1,1" << true;
-    QTest::newRow("number with semicolon") << "33333333;1" << true;
+    QTest::newRow("number with comma") << "33333333,1,1" << false;
+    QTest::newRow("number with semicolon") << "33333333;1" << false;
     QTest::newRow("short/emergency number") << "190" << true;
     QTest::newRow("non phone numbers") << "abcdefg" << false;
+    QTest::newRow("phone number with dots") << "+31 (475) 12.34.56" << true;
+    QTest::newRow("number with slash") << "+421 2/123 456 78" << true;
 }
 
 void PhoneUtilsTest::testIsPhoneNumber()
@@ -67,18 +69,16 @@
     QTest::newRow("string equal") << "12345678" << "12345678" << true;
     QTest::newRow("number with dash") << "1234-5678" << "12345678" << true;
     QTest::newRow("number with area code") << "12312345678" << "12345678" << true;
-    QTest::newRow("number with extension") << "12345678#123" << "12345678" << false;
+    QTest::newRow("number with extension") << "12345678#123" << "12345678" << true;
     QTest::newRow("both numbers with extension") << "(123)12345678#1" << "12345678#1" << true;
     QTest::newRow("numbers with different extension") << "1234567#1" << "1234567#2" << false;
-    QTest::newRow("number with comma") << "33333333,1,1" << "33333333" << true;
-    QTest::newRow("both numbers with comma") << "22222222,1" << "22222222,2,1" << true;
-    QTest::newRow("number with semicolon") << "33333333;1" << "33333333" << true;
-    QTest::newRow("both numbers with semicolon") << "22222222;1" << "22222222;2" << true;
     QTest::newRow("short/emergency numbers") << "190" << "190" << true;
     QTest::newRow("different numbers") << "12345678" << "1234567" << false;
     QTest::newRow("both non phone numbers") << "abcdefg" << "abcdefg" << true;
     QTest::newRow("different non phone numbers") << "abcdefg" << "bcdefg" << false;
-    QTest::newRow("phone number and custom string") << "abc12345678" << "12345678" << false;
+    QTest::newRow("phone number and custom string") << "abc12345678" << "12345678" << true;
+    QTest::newRow("phone number with dots") << "+31 (475) 12.34.56" << "[phone]" << true;
+    QTest::newRow("phone number with slash") << "+421 2/123 456 78" << "212345678" << true;
     // FIXME: check what other cases we need to test here"
 }
 

=== added directory 'tools'
=== added file 'tools/generate_country_codes.py'
--- tools/generate_country_codes.py	1970-01-01 00:00:00 +0000
+++ tools/generate_country_codes.py	2015-08-07 19:10:15 +0000
@@ -0,0 +1,23 @@
+# originally available at https://github.com/musalbas/mcc-mnc-table/blob/master/get-mcc-mnc-table-csv.py
+import re
+import urllib2
+
+html = urllib2.urlopen('http://mcc-mnc.com/').read()
+td_re = re.compile('<td>([^<]*)</td>'*6)
+codes = {}
+tbody_start = False
+for line in html.split('\n'):
+    if '<tbody>' in line:
+        tbody_start = True
+    elif '</tbody>' in line:
+        break
+    elif tbody_start:
+        td_search = td_re.search(line)
+        mcc = int(td_search.group(1))
+        isoCountryCode = td_search.group(3).upper()
+        if (len(isoCountryCode) != 2):
+            continue
+        codes[mcc] = isoCountryCode
+
+for mcc in codes:
+    print str(mcc) + ":" + codes[mcc]