Presence subscription is now of type both when each shared group can be seen...

Presence subscription is now of type both when each shared group can be seen by a group where the other user belongs. JM-985

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

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

@@ -885,20 +885,20 @@ public class RosterManager extends BasicModule implements GroupEventListener, Us
                                 otherGroupNames.contains(group.getName())) {
                             return true;
                         }
-                        // Check if both shared groups have a common group that can see both shared groups and
-                        // the users belong to such group
+                        // Check if each shared group can be seen by a group where each user belongs
                         Collection<Group> groupList = parseGroups(groupNames);
                         Collection<Group> otherGroupList = parseGroups(otherGroupNames);
                         for (Group groupName : groupList) {
+                            if (groupName.isUser(otherUser)) {
                                 for (Group otherGroupName : otherGroupList) {
-                                if (groupName.equals(otherGroupName) && groupName.isUser(user) &&
-                                        otherGroupName.isUser(otherUser)) {
+                                    if (otherGroupName.isUser(user)) {
                                         return true;
                                     }
                                 }
                             }
                         }
                     }
+                }
                 else if ("everybody".equals(showInRoster) && "onlyGroup".equals(otherShowInRoster)) {
                     // Return true if one group is public and the other group allowed the public
                     // group to see him