aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-04 22:52:32 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-04 22:52:32 +0200
commitee24baa0fd62f959a2d91c787d3a405281eeb311 (patch)
treee4b637a8f1963f011610999e2d3bc62e8e655252 /src/eu/siacs/conversations/services
parent34bd79ac04e6e7908faeacd9b1bcfa50bc73397e (diff)
marked incoming carbons as unread
Diffstat (limited to 'src/eu/siacs/conversations/services')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 722245b2e..f2b000dbf 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -136,11 +136,13 @@ public class XmppConnectionService extends Service {
|| (packet.hasChild("sent"))) {
message = MessageParser.parseCarbonMessage(packet, account,
service);
- if ((message != null)&&(message.getStatus() == Message.STATUS_SEND)) {
- message.getConversation().markRead();
- notify = false;
- } else {
- notify = true;
+ if (message != null) {
+ if (message.getStatus() == Message.STATUS_SEND) {
+ notify = false;
+ message.getConversation().markRead();
+ } else {
+ message.markUnread();
+ }
}
}