Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 16:22:06 +01:00
Code Issues Releases Wiki Activity

added functionality for removing roster entries

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2102 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2003-09-24 18:07:02 +00:00 committed by gdombiak
parent 5d628f4d36
commit 5286cb3895
1 changed files with 76 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/org/jivesoftware/smack/Roster.java
View file

@ -249,6 +249,27 @@ public class Roster {
connection.sendPacket(presencePacket); connection.sendPacket(presencePacket);
} }
/**
* Removes a roster entry from the roster.
*
* @param entry a roster entry.
*/
public void removeEntry(RosterEntry entry) {
// Only remove the entry if it's in the entry list.
// The actual removal logic takes place in RosterPacketListenerprocess>>Packet(Packet)
synchronized (entries) {
if (entries.contains(entry)) {
RosterPacket packet = new RosterPacket();
packet.setType(IQ.Type.SET);
RosterPacket.Item item = RosterEntry.toRosterItem(entry);
// Set the item type as REMOVE so that the server will delete the entry
item.setItemType(RosterPacket.ItemType.REMOVE);
packet.addRosterItem(item);
connection.sendPacket(packet);
}
}
}
/** /**
* Returns a count of the entries in the roster. * Returns a count of the entries in the roster.
* *
@ -509,6 +530,20 @@ public class Roster {
RosterEntry entry = new RosterEntry(item.getUser(), item.getName(), RosterEntry entry = new RosterEntry(item.getUser(), item.getName(),
item.getItemType(), connection); item.getItemType(), connection);
// If the packet is of the type REMOVE then remove the entry
if (RosterPacket.ItemType.REMOVE.equals(item.getItemType())) {
// Remove the entry from the entry list.
if (entries.contains(entry)) {
entries.remove(entry);
}
// Remove the entry from the unfiled entry list.
synchronized (unfiledEntries) {
if (unfiledEntries.contains(entry)) {
unfiledEntries.remove(entry);
}
}
}
else {
// Make sure the entry is in the entry list. // Make sure the entry is in the entry list.
if (!entries.contains(entry)) { if (!entries.contains(entry)) {
entries.add(entry); entries.add(entry);
@ -528,12 +563,17 @@ public class Roster {
} }
} }
} }
}
// Find the list of groups that the user currently belongs to. // Find the list of groups that the user currently belongs to.
List currentGroupNames = new ArrayList(); List currentGroupNames = new ArrayList();
for (Iterator j = entry.getGroups(); j.hasNext(); ) { for (Iterator j = entry.getGroups(); j.hasNext(); ) {
RosterGroup group = (RosterGroup)j.next(); RosterGroup group = (RosterGroup)j.next();
currentGroupNames.add(group.getName()); currentGroupNames.add(group.getName());
} }
// If the packet is not of the type REMOVE then add the entry to the groups
if (!RosterPacket.ItemType.REMOVE.equals(item.getItemType())) {
// Create the new list of groups the user belongs to. // Create the new list of groups the user belongs to.
List newGroupNames = new ArrayList(); List newGroupNames = new ArrayList();
for (Iterator k = item.getGroupNames(); k.hasNext(); ) { for (Iterator k = item.getGroupNames(); k.hasNext(); ) {
@ -557,6 +597,8 @@ public class Roster {
for (int m=0; m<newGroupNames.size(); m++) { for (int m=0; m<newGroupNames.size(); m++) {
currentGroupNames.remove(newGroupNames.get(m)); currentGroupNames.remove(newGroupNames.get(m));
} }
}
// Loop through any groups that remain and remove the entries. // Loop through any groups that remain and remove the entries.
for (int n=0; n<currentGroupNames.size(); n++) { for (int n=0; n<currentGroupNames.size(); n++) {
String groupName = (String)currentGroupNames.get(n); String groupName = (String)currentGroupNames.get(n);