diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:57:53 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-23 17:57:53 +0200 |
| commit | 7bd0f312446fb74b480becb9b3b05cee446e5752 (patch) | |
| tree | ace2f23214b21ed50e4ea4ce9df4396206ee2fbc /src/main/java/eu/siacs/conversations/parser/IqParser.java | |
| parent | 777dd4b51e83a32cc252e1c87e1d0632d27c87b5 (diff) | |
| parent | 0dfb9bd1a06436ffb6dd7a5cfbdefa11d3ae130e (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/IqParser.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/IqParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java index 4488eed8..cef5b03d 100644 --- a/src/main/java/eu/siacs/conversations/parser/IqParser.java +++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java @@ -236,7 +236,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived { @Override public void onIqPacketReceived(final Account account, final IqPacket packet) { - if (packet.getType() == IqPacket.TYPE.ERROR) { + if (packet.getType() == IqPacket.TYPE.ERROR || packet.getType() == IqPacket.TYPE.TIMEOUT) { return; } else if (packet.hasChild("query", Xmlns.ROSTER) && packet.fromServer(account)) { final Element query = packet.findChild("query"); |