From 5bfc460b0f51a529be0980a8dc6566cd2f95c2cb Mon Sep 17 00:00:00 2001
From: Valentin Martinet <vmartinet@java.net>
Date: Mon, 18 Jan 2010 08:21:03 +0000
Subject: [PATCH] Yahoo: deleted useless things and fixed bug in creating a
 conference.

---
 .../yahoo/AdHocChatRoomYahooImpl.java         |  6 --
 ...erationSetAdHocMultiUserChatYahooImpl.java | 55 +++----------------
 2 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
index cb21c3a38..7406b78be 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/AdHocChatRoomYahooImpl.java
@@ -292,14 +292,8 @@ public void invite(String userAddress, String reason)
     {
         try
         {
-            // the contact is invited unless if he wasn't invited during room's 
-            // creation:
-            if(!opSetMuc.getAlreadyInvitedContactAddresses().contains(
-                userAddress))
-            {
                 provider.getYahooSession().extendConference(yahooConference,
                     userAddress, reason);
-            }
         }
         catch (IOException ioe)
         {
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
index 3019f04fc..69cc82b0e 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetAdHocMultiUserChatYahooImpl.java
@@ -74,15 +74,6 @@ public class OperationSetAdHocMultiUserChatYahooImpl
      */
     private final MessageDecoder messageDecoder = new MessageDecoder();
 
-    /**
-     * Contacts who have been invited to a chat room during his creation (when a
-     * Yahoo! chat room is created with contacts, an invitation to this chat
-     * room is sent to each of them). These contacts are stored here in order to
-     * avoid them to be invited again after room's creation.
-     */
-    private final List<String> alreadyInvitedContactAddresses
-        = new Vector<String>();
-
     /**
      * Instantiates the user operation set with a currently valid instance of
      * the Yahoo protocol provider.
@@ -238,27 +229,13 @@ public AdHocChatRoom createAdHocChatRoom(   String adHocRoomName,
                                                 String reason)
         throws OperationFailedException
     {
-        String[] invitedContacts = null; // parameter used for room's creation
-
-        if (contacts != null)
-        {
-            int contactsIndex = 0;
-
-            invitedContacts = new String[contacts.size()];
-            for (Contact contact : contacts)
-            {
-                String contactAddress = contact.getAddress();
-
-                invitedContacts[contactsIndex] = contactAddress;
-                contactsIndex++;
-
-                // contact's address is stored here in order to avoid this
-                // contact to be invited again in the chat room implementation:
-                this.alreadyInvitedContactAddresses.add(contactAddress);
-            }
-        }
-
-        return createAdHocChatRoom(adHocRoomName, invitedContacts, reason);
+    	String[] contactsToInvite = new String[contacts.size()];
+    	for(int i=0; i<contacts.size(); i++)
+    	{	System.out.println(contacts.get(i).getAddress()+" is being invited");
+    		contactsToInvite[i] = contacts.get(i).getAddress();
+    	}
+        return createAdHocChatRoom(
+        		adHocRoomName, contactsToInvite, reason);
     }
 
     /**
@@ -490,17 +467,6 @@ public void fireLocalUserPresenceEvent(AdHocChatRoom chatRoom,
             listener.localUserAdHocPresenceChanged(evt);
     }
 
-    /**
-     * Returns the Vector of addresses of the contacts invited during a chat
-     * room creation.
-     * 
-     * @return Vector<String> contact addresses
-     */
-    public List<String> getAlreadyInvitedContactAddresses()
-    {
-        return alreadyInvitedContactAddresses;
-    }
-
     /**
      * Create a Message instance for sending arbitrary MIME-encoding content.
      * 
@@ -649,13 +615,6 @@ public void conferenceLogonReceived(SessionConferenceEvent ev)
                     Contact participant =
                         presenceOpSet.findContactByID(ev.getFrom());
 
-                    if (alreadyInvitedContactAddresses.contains(participant
-                        .getAddress()))
-                    {
-                        alreadyInvitedContactAddresses.remove(participant
-                            .getAddress());
-                    }
-
                     chatRoom.addChatRoomParticipant(participant);
                 }
             }