1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-02 06:45:59 +01:00

Use bare JID when using FriendshipDeniedCache

As it only contains bare JIDs.
This commit is contained in:
Florian Schmaus 2016-11-05 18:26:44 +01:00
parent 32b4e74910
commit 48a46e43ab

View file

@ -142,7 +142,9 @@ public final class IoTProvisioningManager extends Manager {
} }
}, UNFRIEND_MESSAGE); }, UNFRIEND_MESSAGE);
// Stanza listener for XEP-0324 § 3.2.4. // Stanza listener for XEP-0324 § 3.2.4 "Recommending Friendships".
// Also includes business logic for thing-to-thing friendship recommendations, which is not
// (yet) part of the XEP.
connection.addAsyncStanzaListener(new StanzaListener() { connection.addAsyncStanzaListener(new StanzaListener() {
@Override @Override
public void processPacket(final Stanza stanza) throws NotConnectedException, InterruptedException { public void processPacket(final Stanza stanza) throws NotConnectedException, InterruptedException {
@ -163,12 +165,14 @@ public final class IoTProvisioningManager extends Manager {
// tried to become friends with. If this is the case, then // tried to become friends with. If this is the case, then
// thing is likely telling us that we can become now // thing is likely telling us that we can become now
// friends. // friends.
Jid from = friendMessage.getFrom(); BareJid bareFrom = friendMessage.getFrom().asBareJid();
if (!friendshipDeniedCache.containsKey(from)) { if (!friendshipDeniedCache.containsKey(bareFrom)) {
LOGGER.log(Level.WARNING, "Ignoring friendship recommendation "
+ friendMessage
+ " because friendship to this JID was not previously denied.");
return; return;
} }
BareJid bareFrom = from.asBareJid();
// Sanity check: If a thing recommends us itself as friend, // Sanity check: If a thing recommends us itself as friend,
// which should be the case once we reach this code, then // which should be the case once we reach this code, then
// the bare 'from' JID should be equals to the JID of the // the bare 'from' JID should be equals to the JID of the