From e6df4d81d23e4b7c0c3798f114714dd3caebfe8c Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Wed, 29 Jul 2015 16:41:58 +0200
Subject: Tag carbon messages in parser, adapt session logic

Messages sent from another device of the own account are now explicitly
tagged as carboned message. The session detection logic now uses this
tag to find "session borders".
---
 src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui')

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index c44796ba..c4b1e6fc 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -567,7 +567,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					wasEncrypted = true;
 					break;
 				}
-				if (iterator.getRemoteMsgId() == null && iterator.getType() == SENT) {
+				if (!iterator.isCarbon() && iterator.getType() == SENT) {
 					break;
 				}
 			}
@@ -577,7 +577,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					willBeEncrypted = true;
 					break;
 				}
-				if (iterator.getRemoteMsgId() == null && iterator.getType() == SENT) {
+				if (!iterator.isCarbon() && iterator.getType() == SENT) {
 					break;
 				}
 			}
-- 
cgit v1.2.3