Commit 0714df19 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Overwrite existing roster item with subscription status BOTH when both the...

Overwrite existing roster item with subscription status BOTH when both the user and contact belong to the same shared group. JM-442

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@2999 b35dd754-fafc-0310-a699-88a17e54d16e
parent c2eec308
...@@ -100,6 +100,7 @@ public class Roster implements Cacheable { ...@@ -100,6 +100,7 @@ public class Roster implements Cacheable {
if (group.isUser(item.getJid())) { 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);
item.setSubStatus(RosterItem.SUB_BOTH);
} }
} }
rosterItems.put(item.getJid().toBareJID(), item); rosterItems.put(item.getJid().toBareJID(), item);
......
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