diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-23 14:30:27 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-23 14:30:27 +0200 |
| commit | 5c118f6dd751905ccab2d9d65f28ec8e210c484a (patch) | |
| tree | 474e0ba6acd64d82abcfb6cae139ac27112c857e /src/eu/siacs/conversations/parser | |
| parent | 04156e945cc832e83c0f12e4ed6ebe06b3070b53 (diff) | |
more disco. fixed chat markers with jappix
Diffstat (limited to 'src/eu/siacs/conversations/parser')
| -rw-r--r-- | src/eu/siacs/conversations/parser/IqParser.java | 19 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/parser/MessageParser.java | 2 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/eu/siacs/conversations/parser/IqParser.java b/src/eu/siacs/conversations/parser/IqParser.java index 049d37e1d..023fb4df3 100644 --- a/src/eu/siacs/conversations/parser/IqParser.java +++ b/src/eu/siacs/conversations/parser/IqParser.java @@ -56,23 +56,8 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived { mXmppConnectionService.getJingleConnectionManager().deliverIbbPacket(account, packet); } else if (packet.hasChild("query", "http://jabber.org/protocol/disco#info")) { - IqPacket iqResponse = packet - .generateRespone(IqPacket.TYPE_RESULT); - Element query = iqResponse.addChild("query", - "http://jabber.org/protocol/disco#info"); - query.addChild("feature").setAttribute("var", - "urn:xmpp:jingle:1"); - query.addChild("feature").setAttribute("var", - "urn:xmpp:jingle:apps:file-transfer:3"); - query.addChild("feature").setAttribute("var", - "urn:xmpp:jingle:transports:s5b:1"); - query.addChild("feature").setAttribute("var", - "urn:xmpp:jingle:transports:ibb:1"); - if (mXmppConnectionService.confirmMessages()) { - query.addChild("feature").setAttribute("var", - "urn:xmpp:receipts"); - } - account.getXmppConnection().sendIqPacket(iqResponse, null); + IqPacket response = mXmppConnectionService.getIqGenerator().discoResponse(packet); + account.getXmppConnection().sendIqPacket(response, null); } else { if ((packet.getType() == IqPacket.TYPE_GET) || (packet.getType() == IqPacket.TYPE_SET)) { diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index 08930a3b3..f6cd47ee4 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -295,6 +295,8 @@ public class MessageParser extends AbstractParser implements message.markUnread(); } } + } else { + parseNormal(packet, account); } } else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) { |