aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/services
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-22 18:21:04 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-22 18:21:04 +0200
commit1374fed31b96cbe4a16ee6349afe38f9203c8ac4 (patch)
tree6c7403d1743c14fcc20ac42fd50b71f68d6379f7 /src/eu/siacs/conversations/services
parentfafc5306d7856cb258dcacecf91366dfedf85f92 (diff)
fixed #220
Diffstat (limited to 'src/eu/siacs/conversations/services')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index b3cb8430..356342b4 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -763,9 +763,9 @@ public class XmppConnectionService extends Service {
if (message.getType() == Message.TYPE_TEXT) {
MessagePacket packet = null;
if (message.getEncryption() == Message.ENCRYPTION_NONE) {
- packet = mMessageGenerator.generateChat(message);
+ packet = mMessageGenerator.generateChat(message,true);
} else if ((message.getEncryption() == Message.ENCRYPTION_DECRYPTED)||(message.getEncryption() == Message.ENCRYPTION_PGP)) {
- packet = mMessageGenerator.generatePgpChat(message);
+ packet = mMessageGenerator.generatePgpChat(message,true);
} else if (message.getEncryption() == Message.ENCRYPTION_OTR) {
Presences presences = message.getConversation().getContact()
.getPresences();
@@ -1207,7 +1207,7 @@ public class XmppConnectionService extends Service {
msg.setPresence(otrSession.getSessionID().getUserID());
if (msg.getType() == Message.TYPE_TEXT) {
try {
- MessagePacket outPacket = mMessageGenerator.generateOtrChat(msg);
+ MessagePacket outPacket = mMessageGenerator.generateOtrChat(msg,true);
msg.setStatus(Message.STATUS_SEND);
databaseBackend.updateMessage(msg);
account.getXmppConnection().sendMessagePacket(outPacket);