Commit fd9d4903 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Use JID to check if a contact belongs to a shared group. JM-427

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2933 b35dd754-fafc-0310-a699-88a17e54d16e
parent dd7276f0
...@@ -97,7 +97,7 @@ public class Roster implements Cacheable { ...@@ -97,7 +97,7 @@ public class Roster implements Cacheable {
// Check if the item (i.e. contact) belongs to a shared group of the user. Add the // Check if the item (i.e. contact) belongs to a shared group of the user. Add the
// shared group (if any) to this item // shared group (if any) to this item
for (Group group : sharedGroups) { for (Group group : sharedGroups) {
if (group.isUser(item.getJid().getNode())) { if (group.isUser(item.getJid())) {
// TODO Group name conflicts are not being considered (do we need this?) // TODO Group name conflicts are not being considered (do we need this?)
item.addSharedGroup(group); item.addSharedGroup(group);
} }
...@@ -115,7 +115,7 @@ public class Roster implements Cacheable { ...@@ -115,7 +115,7 @@ public class Roster implements Cacheable {
RosterItem.RECV_NONE, nickname , null); RosterItem.RECV_NONE, nickname , null);
// Add the shared groups to the new roster item // Add the shared groups to the new roster item
for (Group group : sharedUsers.get(jid)) { for (Group group : sharedUsers.get(jid)) {
if (group.isUser(jid.getNode())) { if (group.isUser(jid)) {
item.addSharedGroup(group); item.addSharedGroup(group);
itemGroups.add(group); itemGroups.add(group);
} }
...@@ -134,7 +134,7 @@ public class Roster implements Cacheable { ...@@ -134,7 +134,7 @@ public class Roster implements Cacheable {
// the associated shared groups // the associated shared groups
boolean belongsToGroup = false; boolean belongsToGroup = false;
for (Group group : sharedUsers.get(jid)) { for (Group group : sharedUsers.get(jid)) {
if (group.isUser(jid.getNode())) { if (group.isUser(jid)) {
belongsToGroup = true; belongsToGroup = true;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment