telephony-service

Merge lp:~tiagosh/telephony-service/fix-1462090 into lp:telephony-service

  1. fix-1462090
  2. Merge into trunk
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 1085
Merged at revision: 1087
Proposed branch: lp:~tiagosh/telephony-service/fix-1462090
Merge into: lp:telephony-service
Diff against target: 24 lines (+2/-1)
2 files modified
libtelephonyservice/phoneutils.cpp (+1/-1)
tests/libtelephonyservice/PhoneUtilsTest.cpp (+1/-0)
To merge this branch: bzr merge lp:~tiagosh/telephony-service/fix-1462090
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+262264@code.launchpad.net

Commit message

Remove slashes when normalizing phone numbers.

Description of the change

Remove slashes when normalizing phone numbers.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/473/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/141/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/141/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1085
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/474/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/142

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

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libtelephonyservice/phoneutils.cpp'
2--- libtelephonyservice/phoneutils.cpp 2013-11-11 14:54:50 +0000
3+++ libtelephonyservice/phoneutils.cpp 2015-06-17 19:43:10 +0000
4@@ -39,7 +39,7 @@
5
6 bool PhoneUtils::isPhoneNumber(const QString &identifier) {
7 // remove all non diable digits
8- QString finalNumber = QString(identifier).replace(QRegExp("[p+*#(),;-]"),"");
9+ QString finalNumber = QString(identifier).replace(QRegExp("[p+*#/(),;-]"),"");
10 finalNumber = finalNumber.replace(QRegExp("(\\s+)"), "");
11 // if empty, the number is invalid
12 if (finalNumber.isEmpty())
13
14=== modified file 'tests/libtelephonyservice/PhoneUtilsTest.cpp'
15--- tests/libtelephonyservice/PhoneUtilsTest.cpp 2013-11-11 14:54:50 +0000
16+++ tests/libtelephonyservice/PhoneUtilsTest.cpp 2015-06-17 19:43:10 +0000
17@@ -44,6 +44,7 @@
18 QTest::newRow("number with extension") << "12345678#123" << true;
19 QTest::newRow("number with comma") << "33333333,1,1" << true;
20 QTest::newRow("number with semicolon") << "33333333;1" << true;
21+ QTest::newRow("number with slash") << "+421 2/123 456 78" << true;
22 QTest::newRow("short/emergency number") << "190" << true;
23 QTest::newRow("non phone numbers") << "abcdefg" << false;
24 }

Subscribers

People subscribed via source and target branches