aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/xmpp
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-21 20:54:47 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-21 20:54:47 +0100
commitbfc43c8a897f239b734b8c7cfd15b783aeee9b83 (patch)
tree3a72e3c36f2ab2d3c827c1db32ae246a138e4454 /src/main/java/de/pixart/messenger/xmpp
parent244c29aa17cf52ae72e9c53106a0d333966433d2 (diff)
apperently some servers will ommit the from even for stanzas not going to them
Diffstat (limited to 'src/main/java/de/pixart/messenger/xmpp')
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/XmppConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 2fb3aa30c..8bb75ab72 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -803,7 +803,7 @@ public class XmppConnection implements Runnable {
Log.e(Config.LOGTAG, account.getJid().toBareJid().toString() + ": ignoring spoofed iq packet");
}
} else {
- if (packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
+ if (packet.getFrom() != null && packet.getFrom().equals(packetCallbackDuple.first.getTo())) {
callback = packetCallbackDuple.second;
packetCallbacks.remove(packet.getId());
} else {