From 0d9c25d475d91bc2eb030f9d7535cfb23d792c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Niess?=
 <niess@b35dd754-fafc-0310-a699-88a17e54d16e>
Date: Tue, 16 Feb 2010 09:10:51 +0000
Subject: [PATCH] SMACK-291: RosterGroup modifications should depend on roster
 push

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11634 b35dd754-fafc-0310-a699-88a17e54d16e
---
 source/org/jivesoftware/smack/RosterGroup.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/org/jivesoftware/smack/RosterGroup.java b/source/org/jivesoftware/smack/RosterGroup.java
index e479a85ca..80e6438bf 100644
--- a/source/org/jivesoftware/smack/RosterGroup.java
+++ b/source/org/jivesoftware/smack/RosterGroup.java
@@ -157,6 +157,8 @@ public class RosterGroup {
     /**
      * Adds a roster entry to this group. If the entry was unfiled then it will be removed from 
      * the unfiled list and will be added to this group.
+     * Note that this is an asynchronous call -- Smack must wait for the server
+     * to receive the updated roster.
      *
      * @param entry a roster entry.
      * @throws XMPPException if an error occured while trying to add the entry to the group.
@@ -187,8 +189,6 @@ public class RosterGroup {
             else if (response.getType() == IQ.Type.ERROR) {
                 throw new XMPPException(response.getError());
             }
-            // Add the new entry to the group since the server processed the request successfully
-            addEntryLocal(entry);
         }
     }
 
@@ -196,6 +196,8 @@ public class RosterGroup {
      * Removes a roster entry from this group. If the entry does not belong to any other group 
      * then it will be considered as unfiled, therefore it will be added to the list of unfiled 
      * entries.
+     * Note that this is an asynchronous call -- Smack must wait for the server
+     * to receive the updated roster.
      *
      * @param entry a roster entry.
      * @throws XMPPException if an error occured while trying to remove the entry from the group. 
@@ -229,8 +231,6 @@ public class RosterGroup {
             else if (response.getType() == IQ.Type.ERROR) {
                 throw new XMPPException(response.getError());
             }
-            // Remove the entry locally since the server processed the request successfully
-            removeEntryLocal(entry);
         }
     }