diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-04 11:55:38 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-04 11:55:38 +0200 |
| commit | 2f2aa7aa21ef1dc9e465776991bac1c0c1899c3a (patch) | |
| tree | 4c615b8ead5bfd37de9fe3e3260f69add7977415 /src/eu/siacs/conversations/services | |
| parent | 657df841551cecc8ade139c6313fdee6b4d01ebd (diff) | |
fixed pgp on incoming carbon messages
Diffstat (limited to 'src/eu/siacs/conversations/services')
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 6cb5e6b08..7eb691386 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -142,12 +142,7 @@ public class XmppConnectionService extends Service { if ((packet.getType() == MessagePacket.TYPE_CHAT)) { - String pgpBody = mMessageParser.getPgpBody(packet); - if (pgpBody != null) { - message = mMessageParser.parsePgpChat(pgpBody, packet, - account); - message.markUnread(); - } else if ((packet.getBody() != null) + if ((packet.getBody() != null) && (packet.getBody().startsWith("?OTR"))) { message = mMessageParser.parseOtrChat(packet, account); if (message != null) { @@ -155,7 +150,7 @@ public class XmppConnectionService extends Service { } } else if (packet.hasChild("body")) { message = mMessageParser - .parsePlainTextChat(packet, account); + .parseChat(packet, account); message.markUnread(); } else if (packet.hasChild("received") || (packet.hasChild("sent"))) { |