Merge pull request #76 from matthewvogt/normalization

[libcontacts] Skip validation when normalizing numbers
sailfishos · Feb 10, 2014 · fefaf47 · fefaf47
2 parents 285aff6 + f73cd4c
commit fefaf47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
@@ -1241,22 +1241,23 @@ QUrl SeasideCache::filteredAvatarUrl(const QContact &contact, const QStringList
     return QUrl();
 }
 
-QString SeasideCache::normalizePhoneNumber(const QString &input)
+QString SeasideCache::normalizePhoneNumber(const QString &input, bool validate)
 {
-    const QtContactsSqliteExtensions::NormalizePhoneNumberFlags normalizeFlags(QtContactsSqliteExtensions::KeepPhoneNumberDialString |
-                                                                               QtContactsSqliteExtensions::ValidatePhoneNumber);
+    QtContactsSqliteExtensions::NormalizePhoneNumberFlags normalizeFlags(QtContactsSqliteExtensions::KeepPhoneNumberDialString);
+    if (validate) {
+        // If the number if not valid, return empty
+        normalizeFlags |= QtContactsSqliteExtensions::ValidatePhoneNumber;
+    }
 
-    // If the number if not valid, return null
     return QtContactsSqliteExtensions::normalizePhoneNumber(input, normalizeFlags);
 }
 
-QString SeasideCache::minimizePhoneNumber(const QString &input)
+QString SeasideCache::minimizePhoneNumber(const QString &input, bool validate)
 {
     // TODO: use a configuration variable to make this configurable
     const int maxCharacters = QtContactsSqliteExtensions::DefaultMaximumPhoneNumberCharacters;
 
-    // If the number if not valid, return null
-    QString validated(normalizePhoneNumber(input));
+    QString validated(normalizePhoneNumber(input, validate));
     if (validated.isNull())
         return validated;
 

diff --git a/src/seasidecache.h b/src/seasidecache.h
@@ -326,8 +326,8 @@ class CONTACTCACHE_EXPORT SeasideCache : public QObject
     static QString generateDisplayLabelFromNonNameDetails(const QContact &contact);
     static QUrl filteredAvatarUrl(const QContact &contact, const QStringList &metadataFragments = QStringList());
 
-    static QString normalizePhoneNumber(const QString &input);
-    static QString minimizePhoneNumber(const QString &input);
+    static QString normalizePhoneNumber(const QString &input, bool validate = false);
+    static QString minimizePhoneNumber(const QString &input, bool validate = false);
 
     bool event(QEvent *event);