Do not send presence of group members of non-shared groups that can see shared groups. JM-745

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4217 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/roster/RosterManager.java

@@ -750,23 +750,23 @@ public class RosterManager extends BasicModule implements GroupEventListener {
         Collection<JID> users = new HashSet<JID>(group.getMembers());
         users.addAll(group.getAdmins());
         
-        // Check if anyone can see this shared group
-        if ("everybody".equals(showInRoster)) {
-            // If the user of the roster belongs to the public group then we should return all users
-            // in the system since they all need to be in the roster with subscription "from"
-            if (group.isUser(roster.getUsername())) {
+        // If the user of the roster belongs to the shared group then we should return
+        // users that need to be in the roster with subscription "from"
+        if (group.isUser(roster.getUsername())) {
+            // Check if anyone can see this shared group
+            if ("everybody".equals(showInRoster)) {
                 // Add all users in the system
                 for (String username : UserManager.getInstance().getUsernames()) {
                     users.add(server.createJID(username, null));
                 }
             }
-        }
-        else {
-            // Add the users that may see the group
-            Collection<Group> groupList = parseGroups(groupNames);
-            for (Group groupInList : groupList) {
-                users.addAll(groupInList.getMembers());
-                users.addAll(groupInList.getAdmins());
+            else {
+                // Add the users that may see the group
+                Collection<Group> groupList = parseGroups(groupNames);
+                for (Group groupInList : groupList) {
+                    users.addAll(groupInList.getMembers());
+                    users.addAll(groupInList.getAdmins());
+                }
             }
         }
         return users;