Fix Master Password background.

Fix post http redirects in HttpUtils.
Enable google contacts in separate thread to avoid blocking initial felix registering of accounts.

1 files changed, 16 insertions, 9 deletions

diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
index a83ef22..0f1b681 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
+++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java
@@ -270,16 +270,23 @@ public class GoogleContactsActivator implements BundleActivator
      * @param provider the <tt>ProtocolProviderService</tt> which has been
      * registered as a service.
      */
-    private void handleProviderAdded(ProtocolProviderService provider)
+    private void handleProviderAdded(final ProtocolProviderService provider)
     {
-        String className = provider.getClass().getName();
-        className = className.substring(0, className.lastIndexOf('.'));
-        String acc = ProtocolProviderFactory.findAccountPrefix(
-                bundleContext, provider.getAccountID(), className);
-        String password = getCredentialsService().loadPassword(acc);
-
-        enableContactSource(provider.getAccountID().getAccountAddress(),
-                password);
+        // don't block felix, can be blocked if master password is set
+        new Thread(new Runnable()
+        {
+            public void run()
+            {
+                String className = provider.getClass().getName();
+                className = className.substring(0, className.lastIndexOf('.'));
+                String acc = ProtocolProviderFactory.findAccountPrefix(
+                        bundleContext, provider.getAccountID(), className);
+                String password = getCredentialsService().loadPassword(acc);
+
+                enableContactSource(provider.getAccountID().getAccountAddress(),
+                        password);
+            }
+        }).start();
     }
 
     /**