Merge lp:~tiagosh/telephony-service/fix-1398427 into lp:telephony-service

[Tiago Salem Herrmann]

Expose HandleMediaKey(bool doubleClick) to DBus.

Expose HandleMediaKey(bool doubleClick) to DBus.
This is going to be called by unity8.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

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 UI labels, did you update the pot file?
N/A

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

[Michał Sawicz (saviq)]

Hey, do you think it'd make sense for you to return true/false depending on whether you accepted (consumed/reacted to) the event? We could fall back to other consumers then.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:991
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telephony-service/fix-1398427]

992. By Tiago Salem Herrmann on 2015-01-13

Return a bool value in HandleMediaKey to indicate if the event will be handled by the approver.

[Tiago Salem Herrmann (tiagosh)]

> Hey, do you think it'd make sense for you to return true/false depending on
> whether you accepted (consumed/reacted to) the event? We could fall back to
> other consumers then.

Yes, good idea. Just changed the code to match your suggestion.

[lp:~tiagosh/telephony-service/fix-1398427]

993. By Tiago Salem Herrmann on 2015-01-13

export handleMediaKey(bool) to qml plugin

994. By Tiago Salem Herrmann on 2015-01-13

cache hasCalls value

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:992
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/351/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/19

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:994
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/20/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telephony-service/fix-1398427]

995. By Tiago Salem Herrmann on 2015-01-13

change return name

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:995
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/353/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telephony-service/fix-1398427]

996. By Tiago Salem Herrmann on 2015-01-13

- change approver bus name to fix dbus activation
- use a global timer and always return right away on HandleMediaKey()

[Michał Sawicz (saviq)]

Great, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:996
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/354/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/22/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/22

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

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.
No, but that's because the tests are being run twice, and in the second run it failed.

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

Code looks good and works as expected!

review: Approve

[Michael Zanetti (mzanetti)]

Hmm... this seems to crash unity8 when I call:

callManager.handleMediaKey(false)

[lp:~tiagosh/telephony-service/fix-1398427]

997. By Tiago Salem Herrmann on 2015-01-14

use mApproverInterface instead of mHandlerInterface

[Michael Zanetti (mzanetti)]

Tried the current build from silo 19 (should be rev 997) but it still crashes with this backtrace:

http://paste.ubuntu.com/9755185/

review: Needs Fixing

[lp:~tiagosh/telephony-service/fix-1398427]

998. By Tiago Salem Herrmann on 2015-01-15

initialize variable

[Michael Zanetti (mzanetti)]

this works for me now

review: Approve

=== modified file 'approver/Approver.xml'
--- approver/Approver.xml	2014-01-20 12:57:43 +0000
+++ approver/Approver.xml	2015-01-15 14:17:50 +0000
@@ -27,5 +27,12 @@
                 this method has no effect.
             ]]></dox:d>
         </method>
+        <method name="HandleMediaKey">
+            <dox:d><![CDATA[
+                Handle events generated by media key buttons usually present on headsets.
+            ]]></dox:d>
+            <arg name="doubleClick" type="b" direction="in"/>
+            <arg name="accepted" type="b" direction="out"/>
+        </method>
     </interface>
 </node>

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2015-01-08 01:05:51 +0000
+++ approver/approver.cpp	2015-01-15 14:17:50 +0000
@@ -32,6 +32,7 @@
 #include "callmanager.h"
 #include "callentry.h"
 #include "tonegenerator.h"
+#include "telepathyhelper.h"
 
 #include <QContactAvatar>
 #include <QContactDisplayLabel>
@@ -54,18 +55,20 @@
 
 Approver::Approver()
 : Tp::AbstractClientApprover(channelFilters()),
-  mPendingSnapDecision(NULL)
+  mPendingSnapDecision(NULL),
+  mSettleTimer(new QTimer(this))
 {
     mDefaultTitle = C::gettext("Unknown caller");
     mDefaultIcon = QUrl(telephonyServiceDir() + "assets/[e-mail]").toEncoded();
 
-    ApproverDBus *dbus = new ApproverDBus();
+    ApproverDBus *dbus = new ApproverDBus(this);
     connect(dbus,
             SIGNAL(acceptCallRequested()),
             SLOT(onAcceptCallRequested()));
     connect(dbus,
             SIGNAL(rejectCallRequested()),
             SLOT(onRejectCallRequested()));
+
     dbus->connectToBus();
 
     if (GreeterContacts::isGreeterMode()) {
@@ -79,6 +82,17 @@
     mRejectActions["rejectMessage1"] = C::gettext("I'm busy at the moment. I'll call later.");
     mRejectActions["rejectMessage2"] = C::gettext("I'm running late, on my way now.");
     mRejectActions["rejectMessage3"] = C::gettext("Please call me back later.");
+
+    mSettleTimer->setInterval(500);
+    mSettleTimer->setSingleShot(true);
+    connect(mSettleTimer, SIGNAL(timeout()), this, SLOT(onSettleTimerTimeout()));
+    mSettleTimer->start();
+}
+
+void Approver::onSettleTimerTimeout()
+{
+    mSettleTimer->deleteLater();
+    mSettleTimer = NULL;
 }
 
 Approver::~Approver()
@@ -663,3 +677,40 @@
     }
 }
 
+bool Approver::handleMediaKey(bool doubleClick)
+{
+    Q_UNUSED(doubleClick)
+
+    // hasCalls gets the value from handler, so even if CallManager isn't ready right now, we know
+    // if the event will be handled later
+    bool accepted = mPendingSnapDecision || CallManager::instance()->hasCalls();
+
+    // FIXME: Telepathy-qt does not let us know if existing channels are being recovered, 
+    // so if this is the first run, call this method again when mSettleTimer is done
+    if (mSettleTimer) {
+        QObject::connect(mSettleTimer, &QTimer::timeout, [=]() {
+            handleMediaKey(doubleClick);
+        });
+        return accepted;
+    }
+
+    // postpone this to avoid blocking dbus method callers
+    QMetaObject::invokeMethod(this, "processHandleMediaKey", Qt::QueuedConnection, Q_ARG(bool, doubleClick));
+    return accepted;
+}
+
+void Approver::processHandleMediaKey(bool doubleClick)
+{
+    Q_UNUSED(doubleClick)
+
+    if (mPendingSnapDecision) {
+        onAcceptCallRequested();
+    } else if (CallManager::instance()->hasCalls()) {
+        // if there is no incoming call, we have to hangup the current active call
+        CallEntry *call =  CallManager::instance()->foregroundCall();
+        if (call) {
+            call->endCall();
+        }
+    }
+}
+

=== modified file 'approver/approver.h'
--- approver/approver.h	2014-10-09 19:32:20 +0000
+++ approver/approver.h	2015-01-15 14:17:50 +0000
@@ -56,6 +56,7 @@
     bool showSnapDecision(const Tp::ChannelDispatchOperationPtr dispatchOperation,
                           const Tp::ChannelPtr channel,
                           const QContact &contact = QContact());
+    bool handleMediaKey(bool doubleClick);
 
 protected:
     Tp::ChannelDispatchOperationPtr dispatchOperationForIncomingCall();
@@ -71,6 +72,8 @@
     void onAcceptCallRequested();
     void onRejectCallRequested();
     void updateNotification(const QtContacts::QContact &contact);
+    void onSettleTimerTimeout();
+    void processHandleMediaKey(bool doubleClick);
 
 private:
     QList<Tp::ChannelDispatchOperationPtr> mDispatchOps;
@@ -81,6 +84,7 @@
     QString mCachedBody;
     QFeedbackHapticsEffect mVibrateEffect;
     QTimer mVibrateTimer;
+    QTimer *mSettleTimer;
     QMap<QString,QString> mRejectActions;
 };
 

=== modified file 'approver/approverdbus.cpp'
--- approver/approverdbus.cpp	2014-01-20 12:57:43 +0000
+++ approver/approverdbus.cpp	2015-01-15 14:17:50 +0000
@@ -29,7 +29,7 @@
 static const char* DBUS_SERVICE = "com.canonical.Approver";
 static const char* DBUS_OBJECT_PATH = "/com/canonical/Approver";
 
-ApproverDBus::ApproverDBus(QObject* parent) : QObject(parent)
+ApproverDBus::ApproverDBus(Approver *approver, QObject* parent) : QObject(parent), mApprover(approver)
 {
 }
 
@@ -64,3 +64,8 @@
 {
     Q_EMIT rejectCallRequested();
 }
+
+bool ApproverDBus::HandleMediaKey(bool doubleClick)
+{
+    return mApprover->handleMediaKey(doubleClick);
+}

=== modified file 'approver/approverdbus.h'
--- approver/approverdbus.h	2014-01-20 12:57:43 +0000
+++ approver/approverdbus.h	2015-01-15 14:17:50 +0000
@@ -26,6 +26,7 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusContext>
 #include "chatmanager.h"
+#include "approver.h"
 
 /**
  * DBus interface for the phone approver
@@ -35,7 +36,7 @@
     Q_OBJECT
 
 public:
-    ApproverDBus(QObject* parent=0);
+    ApproverDBus(Approver *approver, QObject* parent=0);
     ~ApproverDBus();
 
     bool connectToBus();
@@ -44,11 +45,14 @@
     Q_NOREPLY void HangUpAndAcceptCall();
     Q_NOREPLY void AcceptCall();
     Q_NOREPLY void RejectCall();
+    bool HandleMediaKey(bool doubleClick);
 
 Q_SIGNALS:
     void hangUpAndAcceptCallRequested();
     void acceptCallRequested();
     void rejectCallRequested();
+private:
+    Approver *mApprover;
 };
 
 #endif // APPROVERDBUS_H

=== modified file 'approver/main.cpp'
--- approver/main.cpp	2015-01-08 01:05:51 +0000
+++ approver/main.cpp	2015-01-15 14:17:50 +0000
@@ -58,11 +58,11 @@
     qputenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient");
 #endif
 
-    // register the approver
-    Approver *approver = new Approver();
-    QObject::connect(TelepathyHelper::instance(), &TelepathyHelper::setupReady, [approver]() {
+    QObject::connect(TelepathyHelper::instance(), &TelepathyHelper::setupReady, []() {
+        // register the approver
+        TelepathyHelper::instance()->registerChannelObserver("TelephonyServiceObserver");
+        Approver *approver = new Approver();
         TelepathyHelper::instance()->registerClient(approver, "TelephonyServiceApprover");
-        TelepathyHelper::instance()->registerChannelObserver("TelephonyServiceObserver");
     });
 
     return app.exec();

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2014-09-11 18:12:50 +0000
+++ libtelephonyservice/callmanager.cpp	2015-01-15 14:17:50 +0000
@@ -380,3 +380,14 @@
     /* calling without channel, DTMF tone is played only locally */
     phoneAppHandler->call("SendDTMF", "" , key);
 }
+
+bool CallManager::handleMediaKey(bool doubleClick)
+{
+    QDBusInterface *approverInterface = TelepathyHelper::instance()->approverInterface();
+    QDBusReply<bool> reply = approverInterface->call("HandleMediaKey", doubleClick);
+    if (reply.isValid()) {
+        return reply.value();
+    }
+    return false;
+}
+

=== modified file 'libtelephonyservice/callmanager.h'
--- libtelephonyservice/callmanager.h	2014-08-22 19:01:46 +0000
+++ libtelephonyservice/callmanager.h	2015-01-15 14:17:50 +0000
@@ -61,6 +61,7 @@
     Q_INVOKABLE void mergeCalls(CallEntry *firstCall, CallEntry *secondCall);
     Q_INVOKABLE void splitCall(CallEntry *callEntry);
     Q_INVOKABLE void playTone(const QString &key);
+    Q_INVOKABLE bool handleMediaKey(bool doubleClick);
 
     CallEntry *foregroundCall() const;
     CallEntry *backgroundCall() const;

=== modified file 'libtelephonyservice/telepathyhelper.cpp'
--- libtelephonyservice/telepathyhelper.cpp	2014-12-17 12:54:52 +0000
+++ libtelephonyservice/telepathyhelper.cpp	2015-01-15 14:17:50 +0000
@@ -43,6 +43,7 @@
       mFirstTime(true),
       mConnected(false),
       mHandlerInterface(0),
+      mApproverInterface(0),
       mDefaultSimSettings(new QGSettings("com.ubuntu.phone")),
       mFlightModeInterface("org.freedesktop.URfkill",
                            "/org/freedesktop/URfkill",
@@ -172,6 +173,18 @@
     return mHandlerInterface;
 }
 
+QDBusInterface *TelepathyHelper::approverInterface() const
+{
+    if (!mApproverInterface) {
+        mApproverInterface = new QDBusInterface("org.freedesktop.Telepathy.Client.TelephonyServiceApprover",
+                                               "/com/canonical/Approver",
+                                               "com.canonical.TelephonyServiceApprover",
+                                               QDBusConnection::sessionBus(),
+                                               const_cast<TelepathyHelper*>(this));
+    }
+    return mApproverInterface;
+}
+
 bool TelepathyHelper::connected() const
 {
     if (QCoreApplication::applicationName() != "telephony-service-handler" &&

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2014-12-17 12:54:52 +0000
+++ libtelephonyservice/telepathyhelper.h	2015-01-15 14:17:50 +0000
@@ -67,6 +67,7 @@
     QQmlListProperty<AccountEntry> qmlActiveAccounts();
     ChannelObserver *channelObserver() const;
     QDBusInterface *handlerInterface() const;
+    QDBusInterface *approverInterface() const;
     AccountEntry *defaultMessagingAccount() const;
     AccountEntry *defaultCallAccount() const;
 
@@ -136,6 +137,7 @@
     bool mFirstTime;
     bool mConnected;
     mutable QDBusInterface *mHandlerInterface;
+    mutable QDBusInterface *mApproverInterface;
     QGSettings *mDefaultSimSettings;
     QDBusInterface mFlightModeInterface;
 };