moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed #462

This commit is contained in:
iNPUTmice 2014-09-19 14:35:35 +02:00
parent a11d4891b8
commit 3da0d5adce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -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();