← Back to branch summary

~ubuntu-branches/ubuntu/trusty/telephony-service/trusty

« back to all changes in this revision

Viewing changes to libtelephonyservice/phoneutils.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Gustavo Pichorim Boiko, Tiago Salem Herrmann, Ubuntu daily release
  • Date: 2013-12-05 08:42:04 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131205084204-3oaeeuwb2k5p887t
Tags: 0.1+14.04.20131205-0ubuntu1
[ Gustavo Pichorim Boiko ]
* Test ContactWatcher's "interactive" property.

[ Tiago Salem Herrmann ]
* Accept non numeric id's.
* Add support for private and unknown phone numbers.

[ Ubuntu daily release ]
* Automatic snapshot from revision 761

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtelephonyservice/phoneutils.cpp
29
29
 
30
30
bool PhoneUtils::comparePhoneNumbers(const QString &number1, const QString &number2)
31
31
{
32
 
    return PhoneNumberUtils::compareLoosely(number1, number2);
33
 
}
 
32
    if (isPhoneNumber(number1) && isPhoneNumber(number2)) {
 
33
        return PhoneNumberUtils::compareLoosely(number1, number2);
 
34
    }
 
35
 
 
36
    // if at least one of the id's is not a phone number, then perform a simple string comparison
 
37
    return number1 == number2;
 
38
}
 
39
 
 
40
bool PhoneUtils::isPhoneNumber(const QString &identifier) {
 
41
    // remove all non diable digits
 
42
    QString finalNumber = QString(identifier).replace(QRegExp("[p+*#(),;-]"),"");
 
43
    finalNumber = finalNumber.replace(QRegExp("(\\s+)"), "");
 
44
    // if empty, the number is invalid
 
45
    if (finalNumber.isEmpty())
 
46
        return false;
 
47
 
 
48
    finalNumber = finalNumber.replace(QRegExp("(\\d+)"), "");
 
49
    return finalNumber.isEmpty();
 
50
}
 
51