aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-23 11:49:17 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-23 11:49:17 +0200
commitb14f693c2eea92ad4e35b6a299223ca81efde294 (patch)
tree37700d4f860edf0b49a3ed83b9b7fa85a36c73b4
parent12c2fde61bddbe20e16a21b18b7d9a177690dfc9 (diff)
dont mark message as send on resend
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index f80bb9ef..db3ee2b9 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -664,8 +664,13 @@ public class XmppConnectionService extends Service {
}
}
if (packet != null) {
+ if (!account.getXmppConnection().getFeatures().sm()
+ && message.getConversation().getMode() != Conversation.MODE_MULTI) {
+ markMessage(message, Message.STATUS_SEND);
+ } else {
+ markMessage(message, Message.STATUS_UNSEND);
+ }
sendMessagePacket(account, packet);
- markMessage(message, Message.STATUS_SEND);
}
}