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

[Gustavo Pichorim Boiko]

Ignore accounts not explicitly supported for now.

Ignore accounts not explicitly supported for now.

== 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/<package-name>) 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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1017
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/367/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/35

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

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 'approver/approver.cpp'
--- approver/approver.cpp	2015-01-20 16:53:01 +0000
+++ approver/approver.cpp	2015-02-09 20:34:47 +0000
@@ -146,6 +146,11 @@
 void Approver::addDispatchOperation(const Tp::MethodInvocationContextPtr<> &context,
                                         const Tp::ChannelDispatchOperationPtr &dispatchOperation)
 {
+    if (!TelepathyHelper::instance()->supportedProtocols().contains(dispatchOperation->account()->protocolName())) {
+        context->setFinishedWithError(TP_QT_ERROR_NOT_CAPABLE, "The account for this request is not supported.");
+        return;
+    }
+
     bool willHandle = false;
 
     QList<Tp::ChannelPtr> channels = dispatchOperation->channels();

=== modified file 'handler/handler.cpp'
--- handler/handler.cpp	2014-02-27 21:11:59 +0000
+++ handler/handler.cpp	2015-02-09 20:34:47 +0000
@@ -47,12 +47,17 @@
                              const QDateTime &userActionTime,
                              const Tp::AbstractClientHandler::HandlerInfo &handlerInfo)
 {
-    Q_UNUSED(account)
     Q_UNUSED(connection)
     Q_UNUSED(requestsSatisfied)
     Q_UNUSED(userActionTime)
     Q_UNUSED(handlerInfo)
 
+    if (!TelepathyHelper::instance()->supportedProtocols().contains(account->protocolName())) {
+        context->setFinishedWithError(TP_QT_ERROR_NOT_CAPABLE, "The account for this request is not supported.");
+        return;
+    }
+
+
     Q_FOREACH(const Tp::ChannelPtr channel, channels) {
         Tp::TextChannelPtr textChannel = Tp::TextChannelPtr::dynamicCast(channel);
         if (textChannel) {

=== modified file 'libtelephonyservice/channelobserver.cpp'
--- libtelephonyservice/channelobserver.cpp	2014-02-27 21:11:59 +0000
+++ libtelephonyservice/channelobserver.cpp	2015-02-09 20:34:47 +0000
@@ -50,12 +50,16 @@
                                       const QList<Tp::ChannelRequestPtr> &requestsSatisfied,
                                       const Tp::AbstractClientObserver::ObserverInfo &observerInfo)
 {
-    Q_UNUSED(account)
     Q_UNUSED(connection)
     Q_UNUSED(dispatchOperation)
     Q_UNUSED(requestsSatisfied)
     Q_UNUSED(observerInfo)
 
+    if (!TelepathyHelper::instance()->supportedProtocols().contains(account->protocolName())) {
+        context->setFinishedWithError(TP_QT_ERROR_NOT_CAPABLE, "The account for this request is not supported.");
+        return;
+    }
+
     Q_FOREACH (Tp::ChannelPtr channel, channels) {
         mContexts[channel.data()] = context;
         mChannels.append(channel);

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2015-01-27 18:56:43 +0000
+++ libtelephonyservice/telepathyhelper.h	2015-02-09 20:34:47 +0000
@@ -115,9 +115,9 @@
 public Q_SLOTS:
     Q_INVOKABLE void registerChannelObserver(const QString &observerName = QString::null);
     Q_INVOKABLE void unregisterChannelObserver();
+    QStringList supportedProtocols() const;
 
 protected:
-    QStringList supportedProtocols() const;
     void setupAccountEntry(AccountEntry *entry);
 
 private Q_SLOTS: