aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index d1b8c03ae..72f822ca8 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -239,6 +239,12 @@ public class MessageParser extends AbstractParser implements
final Jid to = packet.getTo();
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());
+ return;
+ }
+
boolean isTypeGroupChat = packet.getType() == MessagePacket.TYPE_GROUPCHAT;
boolean isProperlyAddressed = !to.isBareJid() || account.countPresences() == 1;
boolean isMucStatusMessage = from.isBareJid() && mucUserElement != null && mucUserElement.hasChild("status");
@@ -250,11 +256,6 @@ public class MessageParser extends AbstractParser implements
counterpart = from;
}
- if (from == null || to == null) {
- Log.d(Config.LOGTAG,"no to or from in: "+packet.toString());
- return;
- }
-
Invite invite = extractInvite(packet);
if (invite != null && invite.execute(account)) {
return;