Merge lp:~boiko/telephony-service/uri_handler into lp:telephony-service

[Gustavo Pichorim Boiko]

Use the URL dispatcher to invoke the dialer and messaging apps.

Use the URL dispatcher to invoke the dialer and messaging apps.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:757
http://10.97.0.26:8080/job/telephony-service-ci/75/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/telephony-service-saucy-amd64-ci/75
    SUCCESS: http://10.97.0.26:8080/job/telephony-service-saucy-armhf-ci/75
        deb: http://10.97.0.26:8080/job/telephony-service-saucy-armhf-ci/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/telephony-service-saucy-i386-ci/75

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/telephony-service-ci/75/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

This worked fine for me, BTW.

review: Approve

[Tiago Salem Herrmann (tiagosh)]

looks good to me.

review: Approve

=== modified file 'Ubuntu/Telephony/components.cpp'
--- Ubuntu/Telephony/components.cpp	2013-08-23 20:39:04 +0000
+++ Ubuntu/Telephony/components.cpp	2013-10-07 19:21:05 +0000
@@ -21,7 +21,6 @@
  */
 
 #include "components.h"
-#include "applicationutils.h"
 #include "telepathyhelper.h"
 #include "callmanager.h"
 #include "channelobserver.h"
@@ -50,7 +49,6 @@
             SIGNAL(accountReady()),
             SLOT(onAccountReady()));
 
-    mRootContext->setContextProperty("applicationUtils", ApplicationUtils::instance());
     mRootContext->setContextProperty("telepathyHelper", TelepathyHelper::instance());
     mRootContext->setContextProperty("chatManager", ChatManager::instance());
     mRootContext->setContextProperty("callManager", CallManager::instance());

=== modified file 'Ubuntu/Telephony/tests/tst_contextProperties.qml'
--- Ubuntu/Telephony/tests/tst_contextProperties.qml	2013-08-14 03:01:42 +0000
+++ Ubuntu/Telephony/tests/tst_contextProperties.qml	2013-10-07 19:21:05 +0000
@@ -24,10 +24,6 @@
     id: contextPropertiesTest
     name: "ContextPropertiesTest"
 
-    function test_applicationUtils() {
-        verify(applicationUtils != undefined, "applicationUtils is not defined");
-    }
-
     function test_telepathyHelper() {
         verify(telepathyHelper != undefined, "telepathyHelper is not defined");
     }

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2013-09-30 23:49:04 +0000
+++ approver/approver.cpp	2013-10-07 19:21:05 +0000
@@ -307,7 +307,7 @@
     dispatchOp->handleWith(TELEPHONY_SERVICE_HANDLER);
 
     // and then launch the dialer-app
-    ApplicationUtils::instance()->switchToDialerApp();
+    ApplicationUtils::openUrl(QUrl("application:///dialer-app.desktop"));
 
     mDispatchOps.removeAll(dispatchOp);
 }

=== modified file 'approver/approver.h'
--- approver/approver.h	2013-08-22 17:51:46 +0000
+++ approver/approver.h	2013-10-07 19:21:05 +0000
@@ -31,8 +31,6 @@
 #include <TelepathyQt/PendingReady>
 #include <TelepathyQt/ChannelDispatchOperation>
 
-class ApplicationUtils;
-
 class Approver : public QObject, public Tp::AbstractClientApprover
 {
     Q_OBJECT

=== modified file 'indicator/messagingmenu.cpp'
--- indicator/messagingmenu.cpp	2013-08-22 21:51:42 +0000
+++ indicator/messagingmenu.cpp	2013-10-07 19:21:05 +0000
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "applicationutils.h"
 #include "config.h"
-#include "applicationutils.h"
 #include "contactutils.h"
 #include "phoneutils.h"
 #include "messagingmenu.h"
@@ -319,14 +319,14 @@
 void MessagingMenu::showMessage(const QString &messageId)
 {
     QString phoneNumber = mMessages[messageId];
-    ApplicationUtils::instance()->switchToMessagingApp(QString("messages://%1").arg(phoneNumber));
+    ApplicationUtils::openUrl(QString("message:///%1").arg(QString(QUrl::toPercentEncoding(phoneNumber))));
 }
 
 void MessagingMenu::callBack(const QString &messageId)
 {
     QString phoneNumber = callFromMessageId(messageId).number;
     qDebug() << "TelephonyService/MessagingMenu: Calling back" << phoneNumber;
-    ApplicationUtils::instance()->switchToDialerApp(QString("call://%1").arg(phoneNumber));
+    ApplicationUtils::openUrl(QString("tel:///%1").arg(QString(QUrl::toPercentEncoding(phoneNumber))));
 }
 
 void MessagingMenu::replyWithMessage(const QString &messageId, const QString &reply)
@@ -339,7 +339,7 @@
 void MessagingMenu::callVoicemail(const QString &messageId)
 {
     qDebug() << "TelephonyService/MessagingMenu: Calling voicemail for messageId" << messageId;
-    ApplicationUtils::instance()->switchToDialerApp("voicemail://");
+    ApplicationUtils::openUrl(QUrl("tel:///voicemail"));
 }
 
 Call MessagingMenu::callFromMessageId(const QString &messageId)

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2013-10-02 21:03:25 +0000
+++ indicator/textchannelobserver.cpp	2013-10-07 19:21:05 +0000
@@ -20,8 +20,8 @@
  */
 
 #include <libnotify/notify.h>
+#include "applicationutils.h"
 #include "textchannelobserver.h"
-#include "applicationutils.h"
 #include "messagingmenu.h"
 #include "metrics.h"
 #include "chatmanager.h"
@@ -57,7 +57,7 @@
     NotificationData *notificationData = (NotificationData*) data;
     if (notificationData != NULL) {
         // launch the messaging-app to show the message
-        ApplicationUtils::instance()->switchToMessagingApp(QString("messages://%1").arg(notificationData->phoneNumber));
+        ApplicationUtils::openUrl(QString("message:///%1").arg(QString(QUrl::toPercentEncoding(notificationData->phoneNumber))));
     }
     g_object_unref(notification);
 }

=== modified file 'libtelephonyservice/applicationutils.cpp'
--- libtelephonyservice/applicationutils.cpp	2013-08-02 18:46:48 +0000
+++ libtelephonyservice/applicationutils.cpp	2013-10-07 19:21:05 +0000
@@ -30,34 +30,13 @@
 #include <TelepathyQt/Constants>
 
 #ifdef USE_UBUNTU_PLATFORM_API
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
+#include <ubuntu/application/url_dispatcher/service.h>
+#include <ubuntu/application/url_dispatcher/session.h>
 #endif
 
-#define ADDRESSBOOK_APP_SERVICE "com.canonical.AddressBookApp"
-#define DIALER_APP_SERVICE "com.canonical.DialerApp"
-#define MESSAGING_APP_SERVICE "com.canonical.MessagingApp"
-
 ApplicationUtils::ApplicationUtils(QObject *parent) :
     QObject(parent)
 {
-    // Setup a DBus watcher to check if the telephony-service is running
-    mApplicationWatcher.setConnection(QDBusConnection::sessionBus());
-    mApplicationWatcher.setWatchMode(QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration);
-    mApplicationWatcher.addWatchedService(ADDRESSBOOK_APP_SERVICE);
-    mApplicationWatcher.addWatchedService(DIALER_APP_SERVICE);
-    mApplicationWatcher.addWatchedService(MESSAGING_APP_SERVICE);
-
-    connect(&mApplicationWatcher,
-            SIGNAL(serviceRegistered(const QString&)),
-            SLOT(onServiceRegistered(const QString&)));
-    connect(&mApplicationWatcher,
-            SIGNAL(serviceUnregistered(const QString&)),
-            SLOT(onServiceUnregistered(const QString&)));
-
-
-    mAddressbookAppRunning = checkApplicationRunning(ADDRESSBOOK_APP_SERVICE);
-    mDialerAppRunning = checkApplicationRunning(DIALER_APP_SERVICE);
-    mMessagingAppRunning = checkApplicationRunning(MESSAGING_APP_SERVICE);
 }
 
 ApplicationUtils *ApplicationUtils::instance()
@@ -66,128 +45,6 @@
     return self;
 }
 
-void ApplicationUtils::onServiceRegistered(const QString &serviceName)
-{
-    if (serviceName == ADDRESSBOOK_APP_SERVICE) {
-        mAddressbookAppRunning = true;
-        Q_EMIT addressbookAppRunningChanged(true);
-    } else if (serviceName == DIALER_APP_SERVICE) {
-        mDialerAppRunning = true;
-        Q_EMIT dialerAppRunningChanged(true);
-    } else if (serviceName == MESSAGING_APP_SERVICE) {
-        mMessagingAppRunning = true;
-        Q_EMIT messagingAppRunningChanged(true);
-    }
-}
-
-void ApplicationUtils::onServiceUnregistered(const QString &serviceName)
-{
-    if (serviceName == ADDRESSBOOK_APP_SERVICE) {
-        mAddressbookAppRunning = false;
-        Q_EMIT addressbookAppRunningChanged(false);
-    } else if (serviceName == DIALER_APP_SERVICE) {
-        mDialerAppRunning = false;
-        Q_EMIT dialerAppRunningChanged(false);
-    } else if (serviceName == MESSAGING_APP_SERVICE) {
-        mMessagingAppRunning = false;
-        Q_EMIT messagingAppRunningChanged(false);
-    }
-}
-
-void ApplicationUtils::switchToAddressbookApp(const QString &argument)
-{
-    qDebug() << "Starting address-book-app...";
-#ifdef USE_UBUNTU_PLATFORM_API
-    ubuntu_ui_session_trigger_switch_to_well_known_application(ADDRESSBOOK_APP);
-#else
-    if (!mAddressbookAppRunning) {
-        QProcess::startDetached("address-book-app");
-    }
-#endif
-
-    // block until the app is registered
-    while (!mAddressbookAppRunning) {
-        QCoreApplication::processEvents();
-    }
-
-    if (!argument.isEmpty()) {
-        QDBusInterface addressbookApp("com.canonical.AddressBookApp",
-                                    "/com/canonical/AddressBookApp",
-                                    "com.canonical.AddressBookApp");
-        addressbookApp.call("SendAppMessage", argument);
-    }
-
-    qDebug() << "... succeeded!";
-}
-
-void ApplicationUtils::switchToDialerApp(const QString &argument)
-{
-    qDebug() << "Starting dialer-app...";
-#ifdef USE_UBUNTU_PLATFORM_API
-    ubuntu_ui_session_trigger_switch_to_well_known_application(DIALER_APP);
-#else
-    if (!mDialerAppRunning) {
-        QProcess::startDetached("dialer-app");
-    }
-#endif
-
-    // block until the app is registered
-    while (!mDialerAppRunning) {
-        QCoreApplication::processEvents();
-    }
-
-    if (!argument.isEmpty()) {
-        QDBusInterface dialerApp("com.canonical.DialerApp",
-                                 "/com/canonical/DialerApp",
-                                 "com.canonical.DialerApp");
-        dialerApp.call("SendAppMessage", argument);
-    }
-
-    qDebug() << "... succeeded!";
-}
-
-void ApplicationUtils::switchToMessagingApp(const QString &argument)
-{
-    qDebug() << "Starting messaging-app...";
-#ifdef USE_UBUNTU_PLATFORM_API
-    ubuntu_ui_session_trigger_switch_to_well_known_application(MESSAGING_APP);
-#else
-    if (!mMessagingAppRunning) {
-        QProcess::startDetached("messaging-app");
-    }
-#endif
-
-    // block until the app is registered
-    while (!mMessagingAppRunning) {
-        QCoreApplication::processEvents();
-    }
-
-    if (!argument.isEmpty()) {
-        QDBusInterface messagingApp("com.canonical.MessagingApp",
-                                    "/com/canonical/MessagingApp",
-                                    "com.canonical.MessagingApp");
-        messagingApp.call("SendAppMessage", argument);
-    }
-
-    qDebug() << "... succeeded!";
-}
-
-bool ApplicationUtils::addressbookAppRunning()
-{
-    return mAddressbookAppRunning;
-}
-
-bool ApplicationUtils::dialerAppRunning()
-{
-    return mDialerAppRunning;
-}
-
-bool ApplicationUtils::messagingAppRunning()
-{
-    return mMessagingAppRunning;
-}
-
-
 bool ApplicationUtils::checkApplicationRunning(const QString &serviceName)
 {
     bool result = false;
@@ -198,3 +55,17 @@
 
     return result;
 }
+
+bool ApplicationUtils::openUrl(const QUrl &url)
+{
+#ifdef USE_UBUNTU_PLATFORM_API
+    UAUrlDispatcherSession* session = ua_url_dispatcher_session();
+    if (!session)
+        return false;
+
+    ua_url_dispatcher_session_open(session, url.toEncoded().constData(), NULL, NULL);
+
+    free(session);
+#endif
+    return true;
+}

=== modified file 'libtelephonyservice/applicationutils.h'
--- libtelephonyservice/applicationutils.h	2013-08-21 20:50:50 +0000
+++ libtelephonyservice/applicationutils.h	2013-10-07 19:21:05 +0000
@@ -24,45 +24,19 @@
 
 #include <QObject>
 #include <QDBusServiceWatcher>
+#include <QUrl>
 
 class ApplicationUtils : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Application)
-    Q_PROPERTY(bool addressbookAppRunning READ addressbookAppRunning NOTIFY addressbookAppRunningChanged)
-    Q_PROPERTY(bool dialerAppRunning READ dialerAppRunning NOTIFY dialerAppRunningChanged)
-    Q_PROPERTY(bool messagingAppRunning READ messagingAppRunning NOTIFY messagingAppRunningChanged)
 
 public:
     static ApplicationUtils *instance();
-
-    Q_INVOKABLE void switchToAddressbookApp(const QString &argument = QString::null);
-    Q_INVOKABLE void switchToDialerApp(const QString &argument = QString::null);
-    Q_INVOKABLE void switchToMessagingApp(const QString &argument = QString::null);
-
-    bool addressbookAppRunning();
-    bool dialerAppRunning();
-    bool messagingAppRunning();
     static bool checkApplicationRunning(const QString &serviceName);
-
-Q_SIGNALS:
-    void addressbookAppRunningChanged(bool running);
-    void dialerAppRunningChanged(bool running);
-    void messagingAppRunningChanged(bool running);
-
-
-protected Q_SLOTS:
-    void onServiceRegistered(const QString &serviceName);
-    void onServiceUnregistered(const QString &serviceName);
+    static bool openUrl(const QUrl &url);
 
 private:
     explicit ApplicationUtils(QObject *parent = 0);
-
-    QDBusServiceWatcher mApplicationWatcher;
-    bool mAddressbookAppRunning;
-    bool mDialerAppRunning;
-    bool mMessagingAppRunning;
-
 };
 
 #endif // APPLICATIONUTILS_H