vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 12:02:05 +01:00
Code Issues Releases Wiki Activity

Don't send 'ask' roster item attribute

Browse source 
Fixes SMACK-766.
This commit is contained in:
Florian Schmaus 2017-05-22 16:24:03 +02:00
parent 1f4a728c37
commit 847890b037
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
View file

@ -283,14 +283,46 @@ public final class RosterEntry extends Manager {
return other.item.equals(this.item); return other.item.equals(this.item);
} }
/**
* Convert the RosterEntry to a Roster stanza <item/> element.
*
* @param entry the roster entry.
* @return the roster item.
*/
static RosterPacket.Item toRosterItem(RosterEntry entry) { static RosterPacket.Item toRosterItem(RosterEntry entry) {
return toRosterItem(entry, entry.getName()); return toRosterItem(entry, entry.getName(), false);
} }
private static RosterPacket.Item toRosterItem(RosterEntry entry, String name) { /**
* Convert the RosterEntry to a Roster stanza <item/> element.
*
* @param entry the roster entry
* @param name the name of the roster item.
* @return the roster item.
*/
static RosterPacket.Item toRosterItem(RosterEntry entry, String name) {
return toRosterItem(entry, name, false);
}
static RosterPacket.Item toRosterItem(RosterEntry entry, boolean includeAskAttribute) {
return toRosterItem(entry, entry.getName(), includeAskAttribute);
}
/**
* Convert a roster entry with the given name to a roster item. As per RFC 6121 § 2.1.2.2., clients MUST NOT include
* the 'ask' attribute, thus set {@code includeAskAttribute} to {@code false}.
*
* @param entry the roster entry.
* @param name the name of the roster item.
* @param includeAskAttribute whether or not to include the 'ask' attribute.
* @return the roster item.
*/
private static RosterPacket.Item toRosterItem(RosterEntry entry, String name, boolean includeAskAttribute) {
RosterPacket.Item item = new RosterPacket.Item(entry.getJid(), name); RosterPacket.Item item = new RosterPacket.Item(entry.getJid(), name);
item.setItemType(entry.getType()); item.setItemType(entry.getType());
if (includeAskAttribute) {
item.setSubscriptionPending(entry.isSubscriptionPending()); item.setSubscriptionPending(entry.isSubscriptionPending());
}
item.setApproved(entry.isApproved()); item.setApproved(entry.isApproved());
// Set the correct group names for the item. // Set the correct group names for the item.
for (RosterGroup group : entry.getGroups()) { for (RosterGroup group : entry.getGroups()) {