narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

use new 'api' to add messages to a conversation

Browse source
This commit is contained in:
iNPUTmice 2014-10-19 23:15:24 +02:00
parent c9238ef5ae
commit 44f9022d95
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -529,7 +529,7 @@ public class XmppConnectionService extends Service {
return connection; return connection;
} }
synchronized public void sendMessage(Message message) { public void sendMessage(Message message) {
Account account = message.getConversation().getAccount(); Account account = message.getConversation().getAccount();
account.deactivateGracePeriod(); account.deactivateGracePeriod();
Conversation conv = message.getConversation(); Conversation conv = message.getConversation();
@ -615,7 +615,7 @@ public class XmppConnectionService extends Service {
} }
} }
conv.getMessages().add(message); conv.add(message);
if (saveInDb) { if (saveInDb) {
if (message.getEncryption() == Message.ENCRYPTION_NONE if (message.getEncryption() == Message.ENCRYPTION_NONE
|| saveEncryptedMessages()) { || saveEncryptedMessages()) {
@ -881,7 +881,7 @@ public class XmppConnectionService extends Service {
for (Message message : messages) { for (Message message : messages) {
message.setConversation(conversation); message.setConversation(conversation);
} }
conversation.getMessages().addAll(0, messages); conversation.addAll(0, messages);
return messages.size(); return messages.size();
} }