Merge lp:~tiagosh/telepathy-ofono/fix-1372646 into lp:telepathy-ofono

[Tiago Salem Herrmann]

Don't try to compare phone numbers, otherwise channels with wrong handles can be mistakenly reused when not intended.

Don't try to compare phone numbers, otherwise channels with wrong handles can be mistakenly reused when not intended.

--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)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-utopic-i386-ci/57

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

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/fix-1372646]

114. By Tiago Salem Herrmann on 2015-03-31

merge trunk

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/156/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

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2015-02-04 19:58:17 +0000
+++ connection.cpp	2015-03-31 16:43:03 +0000
@@ -361,7 +361,7 @@
 
         Q_FOREACH(const QString &phoneNumberNew, members) {
             Q_FOREACH(const QString &phoneNumberOld, phoneNumbersOld) {
-                if (PhoneUtils::comparePhoneNumbers(PhoneUtils::normalizePhoneNumber(phoneNumberOld), PhoneUtils::normalizePhoneNumber(phoneNumberNew))) {
+                if (PhoneUtils::normalizePhoneNumber(phoneNumberOld) == PhoneUtils::normalizePhoneNumber(phoneNumberNew)) {
                     count++;
                 }
             }
@@ -919,7 +919,7 @@
     const QString normalizedNumber = PhoneUtils::normalizePhoneNumber(phoneNumber);
 
     Q_FOREACH(const QString &phone, mHandles.values()) {
-        if (PhoneUtils::comparePhoneNumbers(normalizedNumber, phone)) {
+        if (normalizedNumber == phone) {
             // this user already exists
             return mHandles.key(phone);
         }