Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-27 00:32:07 +01:00
Code Issues Releases Wiki Activity

SMACK-294: Improve handling for empty groups

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11643 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Günther Niess 2010-02-18 14:33:45 +00:00 committed by niess
parent a441d856f8
commit 379b119d12
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -233,7 +233,7 @@ public class Roster {
RosterPacket.Item item = new RosterPacket.Item(user, name); RosterPacket.Item item = new RosterPacket.Item(user, name);
if (groups != null) { if (groups != null) {
for (String group : groups) { for (String group : groups) {
if (group != null) { if (group != null && group.trim().length() > 0) {
item.addGroupName(group); item.addGroupName(group);
} }
} }

3
source/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -369,9 +369,12 @@ public class PacketParserUtils {
item.setItemType(type); item.setItemType(type);
} }
if (parser.getName().equals("group") && item!= null) { if (parser.getName().equals("group") && item!= null) {
final String groupName = parser.nextText();
if (groupName != null && groupName.trim().length() > 0) {
item.addGroupName(parser.nextText()); item.addGroupName(parser.nextText());
} }
} }
}
else if (eventType == XmlPullParser.END_TAG) { else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals("item")) { if (parser.getName().equals("item")) {
roster.addRosterItem(item); roster.addRosterItem(item);