Merge lp:~renatofilho/phone-app/fix-1191820 into lp:phone-app

[Renato Araujo Oliveira Filho]

Used hex format for message id to avoid invalid character

[Gustavo Pichorim Boiko (boiko)]

20 + QMetaObject::invokeMethod(ChatManager::instance(), "acknowledgeMessage",
21 + Q_ARG(QString, phoneNumber), Q_ARG(QString, messageId));

There is no need to use the invokeMethod here: as you are already in a slot, just call the acknowledgeMessage() method directly.

review: Needs Fixing

[lp:~renatofilho/phone-app/fix-1191820]

692. By Renato Araujo Oliveira Filho on 2013-06-25

Direct call "acknowledgeMessage" instead of use "invokeMethod"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/phone-app-ci/155/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/370/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/155/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/phone-app/fix-1191820]

693. By Renato Araujo Oliveira Filho on 2013-06-25

Merged mainline.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:693
http://jenkins.qa.ubuntu.com/job/phone-app-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/371
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/371/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/337

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/156/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

While the code does not have any problems in itself, it doesn't fix the problem reported.

review: Needs Fixing

[Gustavo Pichorim Boiko (boiko)]

> While the code does not have any problems in itself, it doesn't fix the
> problem reported.

Please disregard the previous comment. I did something wrong while testing.
The fix works and the code looks fine.

review: Approve

=== modified file 'approver/phoneappapprover.cpp'
--- approver/phoneappapprover.cpp	2013-06-25 20:02:48 +0000
+++ approver/phoneappapprover.cpp	2013-06-25 21:46:27 +0000
@@ -63,7 +63,7 @@
             SIGNAL(replyReceived(QString,QString)),
             SLOT(onReplyReceived(QString,QString)));
     connect(MessagingMenu::instance(), SIGNAL(messageRead(QString,QString)),
-            ChatManager::instance(), SLOT(acknowledgeMessage(QString,QString)));
+            this, SLOT(onMessageRead(QString,QString)));
 
     connect(PhoneAppUtils::instance(),
             SIGNAL(applicationRunningChanged(bool)),
@@ -74,6 +74,13 @@
 {
 }
 
+void PhoneAppApprover::onMessageRead(const QString &phoneNumber, const QString &encodedMessageId)
+{
+    QString messageId(QByteArray::fromHex(encodedMessageId.toUtf8()));
+    ChatManager::instance()->acknowledgeMessage(phoneNumber, messageId);
+}
+
+
 Tp::ChannelClassSpecList PhoneAppApprover::channelFilters() const
 {
     Tp::ChannelClassSpecList specList;

=== modified file 'approver/phoneappapprover.h'
--- approver/phoneappapprover.h	2013-06-25 20:02:48 +0000
+++ approver/phoneappapprover.h	2013-06-25 21:46:27 +0000
@@ -58,6 +58,7 @@
     void onCallStateChanged(Tp::CallState state);
     void onReplyReceived(const QString &phoneNumber, const QString &reply);
     void closeSnapDecision();
+    void onMessageRead(const QString &phoneNumber, const QString &encodedMessageId);
     void onAcceptCallRequested();
     void onRejectCallRequested();
 

=== modified file 'approver/textchannelobserver.cpp'
--- approver/textchannelobserver.cpp	2013-05-27 18:57:45 +0000
+++ approver/textchannelobserver.cpp	2013-06-25 21:46:27 +0000
@@ -72,8 +72,9 @@
 
     g_object_unref(G_OBJECT(notification));
 
-    // and add the message to the messaging menu
-    MessagingMenu::instance()->addMessage(contact->id(), message.messageToken(), message.received(), message.text());
+    // and add the message to the messaging menu (use hex format to avoid invalid characters)  
+    QByteArray token(message.messageToken().toUtf8()); 
+    MessagingMenu::instance()->addMessage(contact->id(), token.toHex(), message.received(), message.text());
     Ringtone::instance()->playIncomingMessageSound();
 }