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

[Gustavo Pichorim Boiko]

Make it possible to acknowledge all pending messages of a given conversation
at once.

Make it possible to acknowledge all pending messages of a given conversation
at once.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1119
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/549/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/217/console

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

review: Needs Fixing (continuous-integration)

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

1120. By Gustavo Pichorim Boiko on 2015-09-03

Registering/unregistering the observers multiple times in the test is making it
fail. Leave it registered for now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1120
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/550/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/222
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/218

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

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Just one small remark and one question.

review: Needs Fixing

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

1121. By Gustavo Pichorim Boiko on 2015-09-21

Make the ack call asynchronous and fix a typo.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'handler/Handler.xml'
--- handler/Handler.xml	2015-01-19 21:14:26 +0000
+++ handler/Handler.xml	2015-09-21 19:32:25 +0000
@@ -44,6 +44,14 @@
             <arg name="messageIds" type="as" direction="in"/>
             <arg name="accountId" type="s" direction="in"/>
         </method>
+        <method name="AcknowledgeAllMessages">
+            <dox:d><![CDATA[
+                Request all messages messages from the given numbers to be acknowledged
+            ]]></dox:d>
+            <arg name="numbers" type="as" direction="in"/>
+            <arg name="accountId" type="s" direction="in"/>
+        </method>
+
 
         <!-- Call Related -->
         <method name="StartCall">

=== modified file 'handler/handlerdbus.cpp'
--- handler/handlerdbus.cpp	2015-01-19 21:14:26 +0000
+++ handler/handlerdbus.cpp	2015-09-21 19:32:25 +0000
@@ -114,6 +114,11 @@
     TextHandler::instance()->acknowledgeMessages(numbers, messageIds, accountId);
 }
 
+void HandlerDBus::AcknowledgeAllMessages(const QStringList &numbers, const QString &accountId)
+{
+    TextHandler::instance()->acknowledgeAllMessages(numbers, accountId);
+}
+
 void HandlerDBus::StartCall(const QString &number, const QString &accountId)
 {
     CallHandler::instance()->startCall(number, accountId);

=== modified file 'handler/handlerdbus.h'
--- handler/handlerdbus.h	2015-01-19 21:14:26 +0000
+++ handler/handlerdbus.h	2015-09-21 19:32:25 +0000
@@ -59,6 +59,7 @@
     Q_NOREPLY void SendSilentMessage(const QStringList &number, const QString &message, const QString &accountId);
     Q_NOREPLY void SendMMS(const QStringList &numbers, const AttachmentList &attachments, const QString &accountId);
     Q_NOREPLY void AcknowledgeMessages(const QStringList &numbers, const QStringList &messageIds, const QString &accountId);
+    Q_NOREPLY void AcknowledgeAllMessages(const QStringList &numbers, const QString &accountId);
 
     // call related
     Q_NOREPLY void StartCall(const QString &number, const QString &accountId);

=== modified file 'handler/texthandler.cpp'
--- handler/texthandler.cpp	2015-08-18 13:19:43 +0000
+++ handler/texthandler.cpp	2015-09-21 19:32:25 +0000
@@ -323,6 +323,18 @@
     }
 }
 
+void TextHandler::acknowledgeAllMessages(const QStringList &recipients, const QString &accountId)
+{
+    QList<Tp::TextChannelPtr> channels = existingChannels(recipients, accountId);
+    if (channels.isEmpty()) {
+        return;
+    }
+
+    Q_FOREACH(const Tp::TextChannelPtr &channel, channels) {
+        channel->acknowledge(channel->messageQueue());
+    }
+}
+
 void TextHandler::onTextChannelAvailable(Tp::TextChannelPtr channel)
 {
     AccountEntry *account = TelepathyHelper::instance()->accountForConnection(channel->connection());

=== modified file 'handler/texthandler.h'
--- handler/texthandler.h	2015-08-18 13:19:43 +0000
+++ handler/texthandler.h	2015-09-21 19:32:25 +0000
@@ -41,6 +41,7 @@
     void sendSilentMessage(const QStringList &recipients, const QString &message, const QString &accountId);
     void sendMMS(const QStringList &recipients, const AttachmentList &attachments, const QString &accountId);
     void acknowledgeMessages(const QStringList &recipients, const QStringList &messageIds, const QString &accountId);
+    void acknowledgeAllMessages(const QStringList &recipients, const QString &accountId);
 
 protected Q_SLOTS:
     void onTextChannelAvailable(Tp::TextChannelPtr channel);

=== modified file 'libtelephonyservice/chatmanager.cpp'
--- libtelephonyservice/chatmanager.cpp	2015-03-10 21:41:45 +0000
+++ libtelephonyservice/chatmanager.cpp	2015-09-21 19:32:25 +0000
@@ -204,6 +204,12 @@
     mMessagesToAck[account->accountId()][recipients].append(messageId);
 }
 
+void ChatManager::acknowledgeAllMessages(const QStringList &recipients, const QString &accountId)
+{
+    QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
+    phoneAppHandler->asyncCall("AcknowledgeAllMessages", recipients, accountId);
+}
+
 void ChatManager::onAckTimerTriggered()
 {
     // ack all pending messages

=== modified file 'libtelephonyservice/chatmanager.h'
--- libtelephonyservice/chatmanager.h	2015-03-10 22:03:10 +0000
+++ libtelephonyservice/chatmanager.h	2015-09-21 19:32:25 +0000
@@ -47,7 +47,8 @@
     void onMessageReceived(const Tp::ReceivedMessage &message);
     void onMessageSent(const Tp::Message &sentMessage, const Tp::MessageSendingFlags flags, const QString &message);
 
-    void acknowledgeMessage(const QStringList &recipients, const QString &messageId, const QString &accountId = QString::null);
+    void acknowledgeMessage(const QStringList &recipients, const QString &messageId, const QString &accountId);
+    void acknowledgeAllMessages(const QStringList &recipients, const QString &accountId);
 
 protected Q_SLOTS:
     void onAckTimerTriggered();

=== modified file 'tests/handler/HandlerTest.cpp'
--- tests/handler/HandlerTest.cpp	2015-08-18 13:19:43 +0000
+++ tests/handler/HandlerTest.cpp	2015-09-21 19:32:25 +0000
@@ -42,6 +42,7 @@
     void testConferenceCall();
     void testSendMessage();
     void testAcknowledgeMessage();
+    void testAcknowledgeAllMessages();
     void testActiveCallIndicator();
     void testNotApprovedChannels();
 
@@ -319,6 +320,40 @@
     QCOMPARE(messageReadSpy.first()[0].toString(), receivedMessageId);
 }
 
+void HandlerTest::testAcknowledgeAllMessages()
+{
+    // FIXME: we assume the observer is already registered from the test above
+    QString recipient("98437666");
+    QString recipient2("[phone]");
+    QString message("Hello, world! %1");
+    int messageCount = 10;
+    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
+
+    // first send a message to a certain number so the handler request one channel
+    HandlerController::instance()->sendMessage(recipient, message, mTpAccount->uniqueIdentifier());
+    TRY_COMPARE(messageSentSpy.count(), 1);
+
+    QSignalSpy messageReceivedSpy(ChatManager::instance(), SIGNAL(messageReceived(QString,QString,QDateTime,QString,bool)));
+
+    // now receive some messages from a very similar number so CM creates another
+    // channel and the handler needs to deal with both
+    QVariantMap properties;
+    properties["Sender"] = recipient2;
+    properties["Recipients"] = (QStringList() << recipient2);
+    for (int i = 0; i < messageCount; ++i) {
+        mMockController->PlaceIncomingMessage(message.arg(QString::number(i)), properties);
+    }
+
+    TRY_COMPARE(messageReceivedSpy.count(), messageCount);
+
+    // then acknowledge the messages that arrived in the second channel and make sure handler
+    // does the right thing
+    QSignalSpy messageReadSpy(mMockController, SIGNAL(MessageRead(QString)));
+    ChatManager::instance()->acknowledgeAllMessages(properties["Recipients"].toStringList(), mTpAccount->uniqueIdentifier());
+
+    TRY_COMPARE(messageReadSpy.count(), messageCount);
+}
+
 void HandlerTest::testActiveCallIndicator()
 {
     // start by making sure the property is false by default