narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Do disco for caps hashes we have never seen

Browse source 
Then cache it
This commit is contained in:
Stephen Paul Weber 2016-01-17 17:11:00 -05:00
parent 000f59d614
commit ae84ff2f0c
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
View file

@ -14,9 +14,11 @@ import eu.siacs.conversations.entities.ServiceDiscoveryResult;
import eu.siacs.conversations.generator.PresenceGenerator; import eu.siacs.conversations.generator.PresenceGenerator;
import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.xmpp.OnIqPacketReceived;
import eu.siacs.conversations.xmpp.OnPresencePacketReceived; import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
import eu.siacs.conversations.xmpp.jid.Jid; import eu.siacs.conversations.xmpp.jid.Jid;
import eu.siacs.conversations.xmpp.pep.Avatar; import eu.siacs.conversations.xmpp.pep.Avatar;
import eu.siacs.conversations.xmpp.stanzas.IqPacket;
import eu.siacs.conversations.xmpp.stanzas.PresencePacket; import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
public class PresenceParser extends AbstractParser implements public class PresenceParser extends AbstractParser implements
@ -161,7 +163,7 @@ public class PresenceParser extends AbstractParser implements
final String type = packet.getAttribute("type"); final String type = packet.getAttribute("type");
final Contact contact = account.getRoster().getContact(from); final Contact contact = account.getRoster().getContact(from);
if (type == null) { if (type == null) {
String presence = from.isBareJid() ? "" : from.getResourcepart(); final String presence = from.isBareJid() ? "" : from.getResourcepart();
contact.setPresenceName(packet.findChildContent("nick", "http://jabber.org/protocol/nick")); contact.setPresenceName(packet.findChildContent("nick", "http://jabber.org/protocol/nick"));
Avatar avatar = Avatar.parsePresence(packet.findChild("x", "vcard-temp:x:update")); Avatar avatar = Avatar.parsePresence(packet.findChild("x", "vcard-temp:x:update"));
if (avatar != null && !contact.isSelf()) { if (avatar != null && !contact.isSelf()) {
@ -180,11 +182,30 @@ public class PresenceParser extends AbstractParser implements
ServiceDiscoveryResult disco = null; ServiceDiscoveryResult disco = null;
Element caps = packet.findChild("c", "http://jabber.org/protocol/caps"); Element caps = packet.findChild("c", "http://jabber.org/protocol/caps");
if (caps != null) { if (caps != null) {
disco = mXmppConnectionService.databaseBackend. disco = mXmppConnectionService.databaseBackend.
findDiscoveryResult(caps.getAttribute("hash"), caps.getAttribute("ver")); findDiscoveryResult(caps.getAttribute("hash"), caps.getAttribute("ver"));
} }
contact.updatePresence(presence, new Presence(packet.findChild("show"), disco));
if (disco != null || caps == null) {
contact.updatePresence(presence, new Presence(packet.findChild("show"), disco));
} else {
IqPacket request = new IqPacket(IqPacket.TYPE.GET);
request.setTo(from);
request.query("http://jabber.org/protocol/disco#info");
mXmppConnectionService.sendIqPacket(account, request, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket discoPacket) {
if (discoPacket.getType() == IqPacket.TYPE.RESULT) {
ServiceDiscoveryResult disco = new ServiceDiscoveryResult(discoPacket);
contact.updatePresence(presence, new Presence(packet.findChild("show"), disco));
mXmppConnectionService.databaseBackend.insertDiscoveryResult(disco);
}
}
});
}
PgpEngine pgp = mXmppConnectionService.getPgpEngine(); PgpEngine pgp = mXmppConnectionService.getPgpEngine();
Element x = packet.findChild("x", "jabber:x:signed"); Element x = packet.findChild("x", "jabber:x:signed");