diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-14 20:35:11 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-14 20:35:11 +0200 |
| commit | 18c3333271541a63d3ce626601661b7fc9bb7f53 (patch) | |
| tree | df02cb95576f8ce19e67c38795bb701a0a86b545 /src/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 2014af0f7edec2433bc2dd2b65074db7af86a8ea (diff) | |
tried to fix some race conditions. not adding duplicate candidates. needs more checks though
Diffstat (limited to 'src/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index e5974c2d9..df0b287a2 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -134,8 +134,7 @@ public class XmppConnectionService extends Service { message = MessageParser.parsePgpChat(pgpBody, packet, account, service); message.markUnread(); - } else if (packet.hasChild("body") - && (packet.getBody().startsWith("?OTR"))) { + } else if ((packet.getBody()!=null) && (packet.getBody().startsWith("?OTR"))) { message = MessageParser.parseOtrChat(packet, account, service); if (message != null) { |