ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly handle roster items which are in multiple groups.

Browse source
This commit is contained in:
Jonathan Schleifer 2011-03-22 00:37:53 +01:00
parent 08e9104a17
commit a972fe397e
1 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/XMPPConnection.m
View file

@ -638,27 +638,41 @@
assert(0); assert(0);
for (OFXMLElement *elem in rosterElem.children) { for (OFXMLElement *elem in rosterElem.children) {
OFString *group; OFArray *groups;
OFMutableArray *rosterGroup;
if (![elem.name isEqual: @"item"] || if (![elem.name isEqual: @"item"] ||
![elem.ns isEqual: NS_ROSTER]) ![elem.ns isEqual: NS_ROSTER])
continue; continue;
group = [[elem groups = [elem elementsForName: @"group"
elementsForName: @"group" namespace: NS_ROSTER];
namespace: NS_ROSTER].firstObject stringValue];
if (group == nil) for (OFXMLElement *groupElem in groups) {
group = @""; OFString *group = groupElem.stringValue;
OFMutableArray *rosterGroup =
[roster objectForKey: group];
if ((rosterGroup = [roster objectForKey: group]) == nil) { if (rosterGroup == nil) {
rosterGroup = [OFMutableArray array]; rosterGroup = [OFMutableArray array];
[roster setObject: rosterGroup [roster setObject: rosterGroup
forKey: group]; forKey: group];
}
[rosterGroup addObject: elem];
} }
[rosterGroup addObject: elem]; if (groups.count == 0) {
OFMutableArray *rosterGroup =
[roster objectForKey: @""];
if (rosterGroup == nil) {
rosterGroup = [OFMutableArray array];
[roster setObject: rosterGroup
forKey: @""];
}
[rosterGroup addObject: elem];
}
} }
if ([delegate respondsToSelector: if ([delegate respondsToSelector: