Merge lp:~tiagosh/dialer-app/fix-1496845 into lp:dialer-app

[Tiago Salem Herrmann]

- Avoid removing # and other characters from tel: uri's

- Avoid removing # and other characters from tel: uri's

[lp:~tiagosh/dialer-app/fix-1496845]

472. By Tiago Salem Herrmann on 2015-10-19

use remove() instead of mid()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/601/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4708
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4705
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24359

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/601/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/116
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4714
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4711
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4711/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24370

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/603/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/dialerapplication.cpp'
--- src/dialerapplication.cpp	2015-07-24 21:58:48 +0000
+++ src/dialerapplication.cpp	2015-10-19 17:39:28 +0000
@@ -69,10 +69,9 @@
 bool DialerApplication::setup()
 {
     installIconPath();
-    static QList<QString> validSchemes;
 
-    if (validSchemes.isEmpty()) {
-        validSchemes << "tel" << "dialer";
+    if (mValidSchemes.isEmpty()) {
+        mValidSchemes << "tel" << "dialer";
     }
 
     QStringList arguments = this->arguments();
@@ -122,7 +121,7 @@
 
     if (arguments.size() == 2) {
         QUrl uri(arguments.at(1));
-        if (validSchemes.contains(uri.scheme())) {
+        if (mValidSchemes.contains(uri.scheme())) {
             m_arg = arguments.at(1);
         }
     }
@@ -205,9 +204,17 @@
 
     QUrl url(arg);
     QString scheme = url.scheme();
-    QString value = url.path();
-    if (value.startsWith("/")) {
-        value.remove(0, 1);
+    // we can't fill value with url.path() as it might contain the # character and QUrl will drop it.
+    QString value;
+    if (!mValidSchemes.contains(url.scheme())) {
+        qWarning() << "Url scheme not valid for dialer-app";
+        return;
+    } else if (url.scheme() == "tel") {
+        // remove the initial tel:, it doesn't matter if it contains /// or //, as we
+        // now use libphonenumber and it will remove these invalid characters when in the beginning
+        // of the number
+        value = arg;
+        value = QUrl::fromPercentEncoding(value.remove("tel:").toLatin1());
     }
 
     QQuickItem *mainView = m_view->rootObject();

=== modified file 'src/dialerapplication.h'
--- src/dialerapplication.h	2014-10-31 20:49:19 +0000
+++ src/dialerapplication.h	2015-10-19 17:39:28 +0000
@@ -53,6 +53,7 @@
     QString m_arg;
     bool m_applicationIsReady;
     bool m_fullScreen;
+    QList<QString> mValidSchemes;
 };
 
 #endif // DIALERAPPLICATION_H