diff options
author | Christian S <christian@pix-art.de> | 2015-12-18 08:23:00 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-12-18 08:23:00 +0100 |
commit | ff7b766a8a8c0182d72850a2e64595cd2f724a1d (patch) | |
tree | 4c122255e795769c4fe793ebb62bb39d415f048f /src/main/java/eu/siacs/conversations/parser/MessageParser.java | |
parent | aaf82867e73f18a62bf0b0ba5e8143cf46f72e04 (diff) | |
parent | 20b4e756fe4dfcef6cb2158271944db394cad048 (diff) |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/MessageParser.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index d8190b707..23a23b2c8 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -304,17 +304,17 @@ public class MessageParser extends AbstractParser implements final Jid from = packet.getFrom(); final String remoteMsgId = packet.getId(); - if (from == null || to == null) { - Log.d(Config.LOGTAG,"no to or from in: "+packet.toString()); + if (from == null) { + Log.d(Config.LOGTAG,"no from in: "+packet.toString()); return; } boolean isTypeGroupChat = packet.getType() == MessagePacket.TYPE_GROUPCHAT; - boolean isProperlyAddressed = !to.isBareJid() || account.countPresences() == 1; + boolean isProperlyAddressed = (to != null ) && (!to.isBareJid() || account.countPresences() == 1); boolean isMucStatusMessage = from.isBareJid() && mucUserElement != null && mucUserElement.hasChild("status"); if (packet.fromAccount(account)) { status = Message.STATUS_SEND; - counterpart = to; + counterpart = to != null ? to : account.getJid(); } else { status = Message.STATUS_RECEIVED; counterpart = from; |