aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-19 14:35:35 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-19 14:35:35 +0200
commit3da0d5adceca102502e4344bb368a3f9f33da3c6 (patch)
treeabd73537b648c6697eed28fbf70b75959394fe7b /src/eu/siacs
parenta11d4891b872ad4c30d168b0946fa3784f3d6adf (diff)
fixed #462
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index c019682e..a8900f71 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -585,18 +585,18 @@ public class XmppConnectionService extends Service {
}
}
+ conv.getMessages().add(message);
+ if (!account.getXmppConnection().getFeatures().sm()
+ && conv.getMode() != Conversation.MODE_MULTI) {
+ message.setStatus(Message.STATUS_SEND);
+ }
if (saveInDb) {
if (message.getEncryption() == Message.ENCRYPTION_NONE
|| saveEncryptedMessages()) {
databaseBackend.createMessage(message);
}
}
- conv.getMessages().add(message);
if ((send) && (packet != null)) {
- if (!account.getXmppConnection().getFeatures().sm()
- && conv.getMode() != Conversation.MODE_MULTI) {
- message.setStatus(Message.STATUS_SEND);
- }
sendMessagePacket(account, packet);
}
updateConversationUi();