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

[Gustavo Pichorim Boiko]

Try to postpone the handler initialization as much as we can. It is still launched when the approver is started, but that is probably because of the telepathy introspection.

Try to postpone the handler initialization as much as we can. It is still launched when the approver is started, but that is probably because of the telepathy introspection.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes: https://code.launchpad.net/~tiagosh/telephony-service/clear_snap_decision_on_reject/+merge/222041

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telephony-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/208/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/24

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

review: Approve (continuous-integration)

[lp:~boiko/telephony-service/greeter_dont_use_handler]

826. By Gustavo Pichorim Boiko on 2014-06-09

Init the handler interface.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:826
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/27

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

review: Approve (continuous-integration)

[lp:~boiko/telephony-service/greeter_dont_use_handler]

827. By Gustavo Pichorim Boiko on 2014-06-09

Merge latest changes from trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:827
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/28

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good. Thanks.

-- CheckList --

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2014-04-15 17:21:13 +0000
+++ libtelephonyservice/callmanager.cpp	2014-06-09 17:25:19 +0000
@@ -23,6 +23,7 @@
 #include "callmanager.h"
 #include "callentry.h"
 #include "telepathyhelper.h"
+#include "greetercontacts.h"
 
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingContacts>
@@ -216,13 +217,16 @@
         return true;
     }
 
-    // if that's not the case, query the teleophony-service-handler for the availability of calls
+    // if that's not the case, and if not in greeter mode, query the telephony-service-handler
+    // for the availability of calls.
     // this is done only to get the live call view on clients as soon as possible, even before the
     // telepathy observer is configured
-    QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
-    QDBusReply<bool> reply = phoneAppHandler->call("HasCalls");
-    if (reply.isValid()) {
-        return reply.value();
+    if (!GreeterContacts::instance()->isGreeterMode()) {
+        QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
+        QDBusReply<bool> reply = phoneAppHandler->call("HasCalls");
+        if (reply.isValid()) {
+            return reply.value();
+        }
     }
 
     return false;

=== modified file 'libtelephonyservice/telepathyhelper.cpp'
--- libtelephonyservice/telepathyhelper.cpp	2014-05-01 14:40:50 +0000
+++ libtelephonyservice/telepathyhelper.cpp	2014-06-09 17:25:19 +0000
@@ -24,6 +24,7 @@
 #include "chatmanager.h"
 #include "callmanager.h"
 #include "config.h"
+#include "greetercontacts.h"
 
 #include <TelepathyQt/AccountSet>
 #include <TelepathyQt/ChannelClassSpec>
@@ -35,7 +36,8 @@
     : QObject(parent),
       mChannelObserver(0),
       mFirstTime(true),
-      mConnected(false)
+      mConnected(false),
+      mHandlerInterface(0)
 {
     mAccountFeatures << Tp::Account::FeatureCore;
     mContactFeatures << Tp::Contact::FeatureAlias
@@ -64,11 +66,6 @@
             SLOT(onAccountManagerReady(Tp::PendingOperation*)));
 
     mClientRegistrar = Tp::ClientRegistrar::create(mAccountManager);
-    mHandlerInterface = new QDBusInterface("com.canonical.TelephonyServiceHandler",
-                                           "/com/canonical/TelephonyServiceHandler",
-                                           "com.canonical.TelephonyServiceHandler",
-                                           QDBusConnection::sessionBus(),
-                                           this);
 }
 
 TelepathyHelper::~TelepathyHelper()
@@ -89,7 +86,8 @@
         Q_FOREACH(const Tp::AccountPtr &account, mAccounts) {
             ids << account->uniqueIdentifier();
         }
-    } else {
+    } else if (!GreeterContacts::instance()->isGreeterMode()) {
+        // if we are in greeter mode, we should not initialize the handler to get the account IDs
         QDBusReply<QStringList> reply = handlerInterface()->call("AccountIds");
         if (reply.isValid()) {
             ids = reply.value();
@@ -111,14 +109,25 @@
 
 QDBusInterface *TelepathyHelper::handlerInterface() const
 {
+    // delay the loading of the handler interface, as it seems this is triggering
+    // the dbus activation of the handler process
+    if (!mHandlerInterface) {
+        mHandlerInterface = new QDBusInterface("com.canonical.TelephonyServiceHandler",
+                                               "/com/canonical/TelephonyServiceHandler",
+                                               "com.canonical.TelephonyServiceHandler",
+                                               QDBusConnection::sessionBus(),
+                                               const_cast<TelepathyHelper*>(this));
+    }
     return mHandlerInterface;
 }
 
 bool TelepathyHelper::connected() const
 {
-    if (QCoreApplication::applicationName() != "telephony-service-handler" && mAccounts.isEmpty()) {
+    if (QCoreApplication::applicationName() != "telephony-service-handler" &&
+        mAccounts.isEmpty() &&
+        !GreeterContacts::instance()->isGreeterMode()) {
         // get the status from the handler
-        QDBusReply<bool> reply = mHandlerInterface->call("IsConnected");
+        QDBusReply<bool> reply = handlerInterface()->call("IsConnected");
         if (reply.isValid()) {
             return reply.value();
         }

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2014-05-01 14:40:50 +0000
+++ libtelephonyservice/telepathyhelper.h	2014-06-09 17:25:19 +0000
@@ -95,7 +95,7 @@
     ChannelObserver *mChannelObserver;
     bool mFirstTime;
     bool mConnected;
-    QDBusInterface *mHandlerInterface;
+    mutable QDBusInterface *mHandlerInterface;
 };
 
 #endif // TELEPATHYHELPER_H