Merge lp:~boiko/history-service/store_normalized_phone_numbers into lp:history-service

[Gustavo Pichorim Boiko]

Optimize the thread matching by avoiding some phone number formatting and validating.

Optimize the thread matching by avoiding some phone number formatting and validating.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/history-service-ci/213/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/213/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/history-service-ci/214/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/52/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/history-service-ci/215/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/53/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/215/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/history-service-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/55/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/history-service-ci/218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/56/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/56/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/218/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/history-service-ci/220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/220/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/history-service/store_normalized_phone_numbers]

210. By Gustavo Pichorim Boiko on 2015-09-02

Verify that the thread returned is not null on tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/history-service-ci/222/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/222/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/history-service/store_normalized_phone_numbers]

211. By Gustavo Pichorim Boiko on 2015-09-03

Add missing copyright header.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/history-service-ci/223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/223/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/history-service/store_normalized_phone_numbers]

212. By Gustavo Pichorim Boiko on 2015-09-03

Try a phone number that matches brazilian format.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/history-service-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/224/rebuild

review: Approve (continuous-integration)

[lp:~boiko/history-service/store_normalized_phone_numbers]

213. By Gustavo Pichorim Boiko on 2015-09-24

Merge latest changes from parent branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/history-service-ci/239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/239/rebuild

review: Approve (continuous-integration)

[lp:~boiko/history-service/store_normalized_phone_numbers]

214. By Gustavo Pichorim Boiko on 2015-10-02

Change the way we store the normalized ID when creating new threads.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/history-service-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/124

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/286/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good. thanks.

review: Approve

=== modified file 'historyprivate/utils.cpp'
--- historyprivate/utils.cpp	2015-04-09 18:53:44 +0000
+++ historyprivate/utils.cpp	2015-10-02 18:06:56 +0000
@@ -21,6 +21,7 @@
 
 #include "utils_p.h"
 #include "phoneutils_p.h"
+#include <QDebug>
 #include <QStringList>
 #include <QMap>
 
@@ -70,4 +71,18 @@
     return id1 == id2;
 }
 
+QString Utils::normalizeId(const QString &accountId, const QString &id)
+{
+    QString normalizedId = id;
+    // for now we only normalize phone number IDs
+    if (matchFlagsForAccount(accountId) & History::MatchPhoneNumber) {
+        normalizedId = PhoneUtils::normalizePhoneNumber(id);
+    }
+    if (normalizedId.isEmpty()) {
+        qWarning() << "Normalized phone number is empty:" << accountId << id;
+        normalizedId = id;
+    }
+    return normalizedId;
+}
+
 }

=== modified file 'historyprivate/utils_p.h'
--- historyprivate/utils_p.h	2015-04-01 20:05:39 +0000
+++ historyprivate/utils_p.h	2015-10-02 18:06:56 +0000
@@ -32,6 +32,7 @@
     static MatchFlags matchFlagsForAccount(const QString &accountId);
     static QString protocolFromAccountId(const QString &accountId);
     static bool compareIds(const QString &accountId, const QString &id1, const QString & id2);
+    static QString normalizeId(const QString &accountId, const QString &id);
 
 private:
     Utils();

=== modified file 'plugins/sqlite/CMakeLists.txt'
--- plugins/sqlite/CMakeLists.txt	2015-04-07 14:40:58 +0000
+++ plugins/sqlite/CMakeLists.txt	2015-10-02 18:06:56 +0000
@@ -16,6 +16,7 @@
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/historyprivate
     ${SQLITE3_INCLUDE_DIRS}
     )
 
@@ -36,7 +37,7 @@
 add_custom_target(qrc_update DEPENDS ${QRC_FILE} schema_update)
 
 add_dependencies(sqlitehistoryplugin schema_update qrc_update)
-target_link_libraries(sqlitehistoryplugin historyservice ${SQLITE3_LIBRARIES})
+target_link_libraries(sqlitehistoryplugin historyservice historyprivate ${SQLITE3_LIBRARIES})
 install(TARGETS sqlitehistoryplugin DESTINATION ${HISTORY_PLUGIN_PATH})
 
 add_subdirectory(schema)

=== modified file 'plugins/sqlite/schema/CMakeLists.txt'
--- plugins/sqlite/schema/CMakeLists.txt	2015-10-02 18:06:56 +0000
+++ plugins/sqlite/schema/CMakeLists.txt	2015-10-02 18:06:56 +0000
@@ -14,6 +14,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 add_executable(generate_schema generate_schema.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../sqlitedatabase.cpp)
 qt5_use_modules(generate_schema Core DBus Sql)
-target_link_libraries(generate_schema historyservice ${SQLITE3_LIBRARIES})
+target_link_libraries(generate_schema historyservice historyprivate ${SQLITE3_LIBRARIES})
 
 add_custom_target(schema_update DEPENDS ${SCHEMA_FILE} ${VERSION_FILE})

=== added file 'plugins/sqlite/schema/v12.sql'
--- plugins/sqlite/schema/v12.sql	1970-01-01 00:00:00 +0000
+++ plugins/sqlite/schema/v12.sql	2015-10-02 18:06:56 +0000
@@ -0,0 +1,2 @@
+ALTER TABLE thread_participants ADD COLUMN normalizedId varchar(255);
+UPDATE thread_participants SET normalizedId = normalizeId(accountId, participantId);

=== modified file 'plugins/sqlite/sqlitedatabase.cpp'
--- plugins/sqlite/sqlitedatabase.cpp	2015-10-02 18:06:56 +0000
+++ plugins/sqlite/sqlitedatabase.cpp	2015-10-02 18:06:56 +0000
@@ -23,6 +23,7 @@
 #include "sqlite3.h"
 #include "sqlitedatabase.h"
 #include "types.h"
+#include "utils_p.h"
 #include <QStandardPaths>
 #include <QSqlDriver>
 #include <QSqlQuery>
@@ -43,6 +44,21 @@
     sqlite3_result_int(context, (int)PhoneUtils::comparePhoneNumbers(arg1, arg2));
 }
 
+void compareNormalizedPhoneNumbers(sqlite3_context *context, int argc, sqlite3_value **argv)
+{
+    QString arg1((const char*)sqlite3_value_text(argv[0]));
+    QString arg2((const char*)sqlite3_value_text(argv[1]));
+    sqlite3_result_int(context, (int)PhoneUtils::compareNormalizedPhoneNumbers(arg1, arg2));
+}
+
+void normalizeId(sqlite3_context *context, int argc, sqlite3_value **argv)
+{
+    QString accountId((const char*)sqlite3_value_text(argv[0]));
+    QString id((const char*)sqlite3_value_text(argv[1]));
+    QString normalizedId = History::Utils::normalizeId(accountId, id);
+    sqlite3_result_text(context, strdup(normalizedId.toUtf8().data()), -1, &free);
+}
+
 SQLiteDatabase::SQLiteDatabase(QObject *parent) :
     QObject(parent), mSchemaVersion(0)
 {
@@ -175,9 +191,13 @@
         return false;
     }
 
-    // create the comparePhoneNumbers custom sqlite function
+    // create the comparePhoneNumbers custom sqlite functions
     sqlite3 *handle = database().driver()->handle().value<sqlite3*>();
     sqlite3_create_function(handle, "comparePhoneNumbers", 2, SQLITE_ANY, NULL, &comparePhoneNumbers, NULL, NULL);
+    sqlite3_create_function(handle, "compareNormalizedPhoneNumbers", 2, SQLITE_ANY, NULL, &compareNormalizedPhoneNumbers, NULL, NULL);
+
+    // and also create the normalizeId function
+    sqlite3_create_function(handle, "normalizeId", 2, SQLITE_ANY, NULL, &normalizeId, NULL, NULL);
 
     parseVersionInfo();
 

=== modified file 'plugins/sqlite/sqlitehistoryplugin.cpp'
--- plugins/sqlite/sqlitehistoryplugin.cpp	2015-01-28 23:15:24 +0000
+++ plugins/sqlite/sqlitehistoryplugin.cpp	2015-10-02 18:06:56 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>
@@ -26,6 +26,7 @@
 #include "sqlitehistorythreadview.h"
 #include "intersectionfilter.h"
 #include "unionfilter.h"
+#include "utils_p.h"
 #include <QDateTime>
 #include <QDebug>
 #include <QStringList>
@@ -63,6 +64,7 @@
         return QVariantMap();
     }
 
+    bool phoneCompare = (matchFlags & History::MatchPhoneNumber);
     QSqlQuery query(SQLiteDatabase::instance()->database());
 
     // select all the threads the first participant is listed in, and from that list
@@ -71,13 +73,15 @@
     QString queryString("SELECT threadId FROM thread_participants WHERE %1 AND type=:type AND accountId=:accountId");
 
     // FIXME: for now we just compare differently when using MatchPhoneNumber
-    if (matchFlags & History::MatchPhoneNumber) {
-        queryString = queryString.arg("comparePhoneNumbers(participantId, :participantId)");
+    QString firstParticipant = participants.first();
+    if (phoneCompare) {
+        queryString = queryString.arg("compareNormalizedPhoneNumbers(normalizedId, :participantId)");
+        firstParticipant = PhoneUtils::normalizePhoneNumber(firstParticipant);
     } else {
         queryString = queryString.arg("participantId=:participantId");
     }
     query.prepare(queryString);
-    query.bindValue(":participantId", participants[0]);
+    query.bindValue(":participantId", firstParticipant);
     query.bindValue(":type", type);
     query.bindValue(":accountId", accountId);
     if (!query.exec()) {
@@ -91,54 +95,72 @@
     }
 
     QString existingThread;
-    // now for each threadId, check if all the other participants are listed
-    Q_FOREACH(const QString &threadId, threadIds) {
-        query.prepare("SELECT participantId FROM thread_participants WHERE "
-                      "threadId=:threadId AND type=:type AND accountId=:accountId");
-        query.bindValue(":threadId", threadId);
-        query.bindValue(":type", type);
-        query.bindValue(":accountId", accountId);
-        if (!query.exec()) {
-            qCritical() << "Error:" << query.lastError() << query.lastQuery();
-            return QVariantMap();
-        }
-
-        QStringList threadParticipants;
-        while (query.next()) {
-            threadParticipants << query.value(0).toString();
-        }
-
-        if (threadParticipants.count() != participants.count()) {
-            continue;
-        }
-
-        // and now compare the lists
-        bool found = true;
-        Q_FOREACH(const QString &participant, participants) {
-            if (matchFlags & History::MatchPhoneNumber) {
-                // we need to iterate the list and call the phone number comparing function for
-                // each participant from the given thread
-                bool inList = false;
-                Q_FOREACH(const QString &threadParticipant, threadParticipants) {
-                    if (PhoneUtils::comparePhoneNumbers(threadParticipant, participant)) {
-                        inList = true;
+    if (participants.count() == 1 && !threadIds.isEmpty()) {
+         existingThread = threadIds.first();
+    } else {
+        QStringList normalizedParticipants;
+        if (phoneCompare) {
+            Q_FOREACH(const QString &participant, participants) {
+                normalizedParticipants << PhoneUtils::normalizePhoneNumber(participant);
+            }
+        } else {
+            normalizedParticipants = participants;
+        }
+
+        // now for each threadId, check if all the other participants are listed
+        Q_FOREACH(const QString &threadId, threadIds) {
+            queryString = "SELECT %1 FROM thread_participants WHERE "
+                          "threadId=:threadId AND type=:type AND accountId=:accountId";
+            query.prepare(queryString.arg(phoneCompare ? "normalizedId" : "participantId"));
+            query.bindValue(":threadId", threadId);
+            query.bindValue(":type", type);
+            query.bindValue(":accountId", accountId);
+            if (!query.exec()) {
+                qCritical() << "Error:" << query.lastError() << query.lastQuery();
+                return QVariantMap();
+            }
+
+            QStringList threadParticipants;
+            while (query.next()) {
+                threadParticipants << query.value(0).toString();
+            }
+
+            // we can't use query.size() as it always return -1
+            if (threadParticipants.count() != participants.count()) {
+                continue;
+            }
+
+            // and now compare the lists
+            bool found = true;
+            Q_FOREACH(const QString &participant, normalizedParticipants) {
+                if (phoneCompare) {
+                    // we need to iterate the list and call the phone number comparing function for
+                    // each participant from the given thread
+                    bool inList = false;
+                    QStringList::iterator it = threadParticipants.begin();
+                    while (it != threadParticipants.end()) {
+                        if (PhoneUtils::compareNormalizedPhoneNumbers(*it, participant)) {
+                            inList = true;
+                            threadParticipants.erase(it);
+                            break;
+                        }
+                        ++it;
+                    }
+                    if (!inList) {
+                        found = false;
                         break;
                     }
-                }
-                if (!inList) {
+                } else if (!threadParticipants.contains(participant)) {
                     found = false;
                     break;
                 }
-            } else if (!threadParticipants.contains(participant)) {
-                found = false;
+            }
+
+            if (found) {
+                existingThread = threadId;
                 break;
             }
         }
-
-        if (found) {
-            existingThread = threadId;
-            break;
-        }
     }
 
     return getSingleThread(type, accountId, existingThread);
@@ -235,12 +257,13 @@
 
     // and insert the participants
     Q_FOREACH(const QString &participant, participants) {
-        query.prepare("INSERT INTO thread_participants (accountId, threadId, type, participantId)"
-                      "VALUES (:accountId, :threadId, :type, :participantId)");
+        query.prepare("INSERT INTO thread_participants (accountId, threadId, type, participantId, normalizedId)"
+                      "VALUES (:accountId, :threadId, :type, :participantId, :normalizedId)");
         query.bindValue(":accountId", accountId);
         query.bindValue(":threadId", threadId);
         query.bindValue(":type", type);
         query.bindValue(":participantId", participant);
+        query.bindValue(":normalizedId", History::Utils::normalizeId(accountId, participant));
         if (!query.exec()) {
             qCritical() << "Error:" << query.lastError() << query.lastQuery();
             return QVariantMap();

=== modified file 'plugins/sqlite/sqlitehistoryplugin.h'
--- plugins/sqlite/sqlitehistoryplugin.h	2015-01-28 23:08:01 +0000
+++ plugins/sqlite/sqlitehistoryplugin.h	2015-10-02 18:06:56 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * Authors:
  *  Gustavo Pichorim Boiko <[e-mail]>

=== modified file 'src/phoneutils.cpp'
--- src/phoneutils.cpp	2015-07-31 21:37:05 +0000
+++ src/phoneutils.cpp	2015-10-02 18:06:56 +0000
@@ -59,29 +59,38 @@
 
 bool PhoneUtils::comparePhoneNumbers(const QString &phoneNumberA, const QString &phoneNumberB)
 {
-    static i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
+    // just do a simple string comparison first
+    if (phoneNumberA == phoneNumberB) {
+        return true;
+    }
+
     QString normalizedPhoneNumberA = normalizePhoneNumber(phoneNumberA);
     QString normalizedPhoneNumberB = normalizePhoneNumber(phoneNumberB);
 
-    // just do a simple string comparison if we are dealing with non phone numbers
-    if (!isPhoneNumber(phoneNumberA) || !isPhoneNumber(phoneNumberB)) {
-        return phoneNumberA == phoneNumberB;
+    return compareNormalizedPhoneNumbers(normalizedPhoneNumberA, normalizedPhoneNumberB);
+}
+
+bool PhoneUtils::compareNormalizedPhoneNumbers(const QString &numberA, const QString &numberB)
+{
+    if (numberA == numberB) {
+        return true;
     }
 
-    if (normalizedPhoneNumberA.size() < 7 || normalizedPhoneNumberB.size() < 7) {
-        return normalizedPhoneNumberA == normalizedPhoneNumberB;
+    static i18n::phonenumbers::PhoneNumberUtil *phonenumberUtil = i18n::phonenumbers::PhoneNumberUtil::GetInstance();
+
+    if (numberA.size() < 7 || numberB.size() < 7) {
+        return false;
     }
 
     i18n::phonenumbers::PhoneNumberUtil::MatchType match = phonenumberUtil->
-            IsNumberMatchWithTwoStrings(phoneNumberA.toStdString(),
-                                        phoneNumberB.toStdString());
+            IsNumberMatchWithTwoStrings(numberA.toStdString(),
+                                        numberB.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(), region().toStdString(), &number);

=== modified file 'src/phoneutils_p.h'
--- src/phoneutils_p.h	2015-07-17 19:03:41 +0000
+++ src/phoneutils_p.h	2015-10-02 18:06:56 +0000
@@ -31,7 +31,8 @@
     Q_OBJECT
 public:
     explicit PhoneUtils(QObject *parent = 0);
-    Q_INVOKABLE static bool comparePhoneNumbers(const QString &number1, const QString &number2);
+    Q_INVOKABLE static bool comparePhoneNumbers(const QString &numberA, const QString &numberB);
+    Q_INVOKABLE static bool compareNormalizedPhoneNumbers(const QString &numberA, const QString &numberB);
     Q_INVOKABLE static bool isPhoneNumber(const QString &identifier);
     Q_INVOKABLE static QString normalizePhoneNumber(const QString &identifier);
 private:

=== modified file 'tests/libhistoryservice/ManagerTest.cpp'
--- tests/libhistoryservice/ManagerTest.cpp	2013-12-09 21:18:14 +0000
+++ tests/libhistoryservice/ManagerTest.cpp	2015-10-02 18:06:56 +0000
@@ -76,9 +76,9 @@
                                                       << (QStringList() << "oneParticipant");
     QTest::newRow("voice thread using phone match") << "anotherAccountId"
                                                     << History::EventTypeVoice
-                                                    << (QStringList() << "[phone]")
+                                                    << (QStringList() << "[phone]")
                                                     << History::MatchFlags(History::MatchPhoneNumber)
-                                                    << (QStringList() << "4567890");
+                                                    << (QStringList() << "98765432");
 }
 
 void ManagerTest::testThreadForParticipants()
@@ -100,7 +100,8 @@
 
     // now try to get the thread again to see if it is returned correctly
     History::Thread sameThread = mManager->threadForParticipants(accountId, type, participantsToMatch, matchFlags, false);
-    QVERIFY(sameThread == thread);
+    QVERIFY(!sameThread.isNull());
+    QCOMPARE(sameThread, thread);
 }
 
 void ManagerTest::testQueryEvents()

=== modified file 'tests/libhistoryservice/PhoneUtilsTest.cpp'
--- tests/libhistoryservice/PhoneUtilsTest.cpp	2015-07-15 13:35:23 +0000
+++ tests/libhistoryservice/PhoneUtilsTest.cpp	2015-10-02 18:06:56 +0000
@@ -64,7 +64,7 @@
     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" << true;
+    QTest::newRow("number with extension") << "12345678#123" << "12345678" << false;
     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("short/emergency numbers") << "190" << "190" << true;