diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-23 14:15:14 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-23 14:15:14 +0100 |
commit | 1b3c28822530b27adc7bd5657e89940e8c06fa49 (patch) | |
tree | 78e748409daea7c460f23304f77031ac686a24e7 /src/eu/siacs/conversations/utils/MessageParser.java | |
parent | a84a7d4fa460819670fd9faef93e49828671a0da (diff) |
holding wake locks during onStartCommand
Diffstat (limited to 'src/eu/siacs/conversations/utils/MessageParser.java')
-rw-r--r-- | src/eu/siacs/conversations/utils/MessageParser.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/eu/siacs/conversations/utils/MessageParser.java b/src/eu/siacs/conversations/utils/MessageParser.java index 6d644f03..4bdb2539 100644 --- a/src/eu/siacs/conversations/utils/MessageParser.java +++ b/src/eu/siacs/conversations/utils/MessageParser.java @@ -84,16 +84,15 @@ public class MessageParser { conversation.resetOtrSession(); Log.d(LOGTAG,"otr session stoped"); } + //isEmpty is a work around for some weird clients which send emtpty strings over otr + if ((body == null)||(body.isEmpty())) { + return null; + } + return new Message(conversation, packet.getFrom(), body, Message.ENCRYPTION_OTR,Message.STATUS_RECIEVED); } catch (Exception e) { conversation.resetOtrSession(); return null; } - - //isEmpty is a work around for some weird clients which send emtpty strings over otr - if ((body == null)||(body.isEmpty())) { - return null; - } - return new Message(conversation, packet.getFrom(), body, Message.ENCRYPTION_OTR,Message.STATUS_RECIEVED); } public static Message parseGroupchat(MessagePacket packet, Account account, XmppConnectionService service) { |