aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-29 16:41:58 +0200
committerAndreas Straub <andy@strb.org>2015-07-29 16:41:58 +0200
commite6df4d81d23e4b7c0c3798f114714dd3caebfe8c (patch)
tree5104a74ceac0fb9782ed40cbe89cccb4d6b8b0e9 /src/main/java/eu/siacs/conversations/ui
parente10a6c5b87d5d4b4871fdf31bbc9a7ef8b8d6ff1 (diff)
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".
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java4
1 files changed, 2 insertions, 2 deletions
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;
}
}