# HG changeset patch # User marseille # Date 1240570947 -7200 # Node ID 0ccad9608190f2cb46bc1c520ce32f200f29b5f8 # Parent e892a47de0861dff0ccd338e046c7128df768d3b Modification pour gerer les contacts avec les groupes. VOir avec bart pour recuperer le nom des groupes dans le roster ! diff -r e892a47de086 -r 0ccad9608190 src/com/beem/project/beem/ui/ContactList.java --- a/src/com/beem/project/beem/ui/ContactList.java Fri Apr 24 12:32:10 2009 +0200 +++ b/src/com/beem/project/beem/ui/ContactList.java Fri Apr 24 13:02:27 2009 +0200 @@ -170,8 +170,8 @@ ExpandableListAdapter Adapter; List> groupData = new ArrayList>(); List>> childData = new ArrayList>>(); - - if (listGroup.size() == 0) + int groupSize = listGroup.size(); + if (groupSize == 0) listGroup.add("Default"); for (int i = 0; i < listGroup.size(); i++) { Map curGroupMap = new HashMap(); @@ -182,10 +182,12 @@ List> children = new ArrayList>(); for (int j = 0; j < listContact.size(); ++j) { Contact c = listContact.get(j); - Log.i(TAG, c.getID() + " " + c.getJID()); - Map curChildMap = new HashMap(); - children.add(curChildMap); - curChildMap.put(CHILD, c); + if (groupSize == 0 || listGroup.get(i).equals(c.getGroupName())) { + Log.i(TAG, c.getID() + " " + c.getJID()); + Map curChildMap = new HashMap(); + children.add(curChildMap); + curChildMap.put(CHILD, c); + } } childData.add(children); }