Fix adding contact requiring authorization. Now creates unresolved contact not volatile one through the process.

build.xml

@@ -1142,7 +1142,7 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta2.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
         </jar>
     </target>
@@ -1157,7 +1157,7 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta2.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
         </jar>
     </target>

src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java

@@ -1520,7 +1520,7 @@ public void authorizationRequestReceived(Screenname screenname,
                     authResponse.getReason());
         }
 
-        public boolean authorizationRequired(Screenname screenname)
+        public boolean authorizationRequired(Screenname screenname, Group parentGroup)
         {
             logger.trace("authorizationRequired from " + screenname);
 
@@ -1528,7 +1528,11 @@ public boolean authorizationRequired(Screenname screenname)
             Contact srcContact = findContactByID(screenname.getFormatted());
 
             if(srcContact == null)
-                srcContact = createVolatileContact(screenname.getFormatted());
+            {
+                ContactGroup parent = ssContactList.findContactGroup(parentGroup);
+                srcContact = 
+                    createUnresolvedContact(screenname.getFormatted(), null, parent);
+            }
 
             AuthorizationRequest authRequest =
                 authorizationHandler.createAuthorizationRequest(

test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPresence.java

@@ -567,7 +567,7 @@ public void postTestSubscribe()
         }
 
         assertEquals("Subscription event dispatching failed."
-                     , 2, subEvtCollector.collectedEvents.size());
+                     , 1, subEvtCollector.collectedEvents.size());
 
         // after the authorization process finished
         // we must have received two events
@@ -593,33 +593,6 @@ public void postTestSubscribe()
             srcProvider = subEvt.getSourceProvider();
         }
 
-        assertEquals("SubscriptionEvent Source:",
-                     fixture.testerAgent.getIcqUIN(),
-                     ((Contact)source).getAddress());
-        assertEquals("SubscriptionEvent Source Contact:",
-                     fixture.testerAgent.getIcqUIN(),
-                     srcContact.getAddress());
-        assertSame("SubscriptionEvent Source Provider:",
-                     fixture.provider,
-                     srcProvider);
-
-        evt = (EventObject)subEvtCollector.collectedEvents.get(1);
-
-        source = null;
-        srcContact = null;
-        srcProvider = null;
-
-        if(evt instanceof SubscriptionMovedEvent)
-        {
-            SubscriptionMovedEvent mvEvt = (SubscriptionMovedEvent)evt;
-
-            source = mvEvt.getSource();
-            srcContact = mvEvt.getSourceContact();
-            srcProvider = mvEvt.getSourceProvider();
-        }
-        else
-            fail("Second event must be SubscriptionMovedEvent");
-
         assertEquals("SubscriptionEvent Source:",
                      fixture.testerAgent.getIcqUIN(),
                      ((Contact)source).getAddress());