[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=431db45

The following commit has been merged in the master branch:
commit 431db458de1417764ecdef00974fca4c412e19f8
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Thu Sep 8 13:20:01 2016 +0500

    [KTp/Message] Direction of received message now depends on sender
    
    If the sender is selfContact, then the direction is LocalToRemote.
    
    REVIEW: 128867
---
 KTp/message.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 566241e..10ceee8 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -70,7 +70,6 @@ Message::Message(const Tp::ReceivedMessage &original, const KTp::MessageContext
     d->token = original.messageToken();
     d->messageType = original.messageType();
     d->isHistory = original.isScrollback();
-    d->direction = KTp::Message::RemoteToLocal;
 
     setMainMessagePart(original.text());
 
@@ -79,6 +78,22 @@ Message::Message(const Tp::ReceivedMessage &original, const KTp::MessageContext
     } else {
         d->senderAlias = original.senderNickname();
     }
+
+    bool isLocalToRemote = false;
+
+    if (!d->sender.isNull()) {
+        if (context.channel()->interfaces().contains(TP_QT_IFACE_CHANNEL_INTERFACE_GROUP)) {
+            isLocalToRemote = d->sender->id() == context.channel()->groupSelfContact()->id();
+        } else {
+            isLocalToRemote = d->sender->id() == context.channel()->connection()->selfContact()->id();
+        }
+    }
+
+    if (isLocalToRemote) {
+        d->direction = KTp::Message::LocalToRemote;
+    } else {
+        d->direction = KTp::Message::RemoteToLocal;
+    }
 }
 
 Message::Message(const Message& other):

-- 
ktp-common-internals packaging