Fixes a problem where early accessing PhoneNumberContactSource service can lead it to a state where it will no longer work.

src/net/java/sip/communicator/plugin/phonenumbercontactsource/PNContactSourceActivator.java

@@ -10,6 +10,7 @@
 
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
 import org.jitsi.service.resources.*;
@@ -40,6 +41,11 @@ public class PNContactSourceActivator
      */
     private static List<ProtocolProviderService> phoneProviders;
 
+    /**
+     * Listens for registration state changes.
+     */
+    private static ProtocolProviderRegistrationListener ppRegListener;
+
     /**
      * The contact source.
      */
@@ -109,7 +115,10 @@ public static List<ProtocolProviderService> getPhoneNumberProviders()
 
         phoneProviders = new LinkedList<ProtocolProviderService>();
 
-        bundleContext.addServiceListener(new ProtocolProviderRegListener());
+        ppRegListener = new ProtocolProviderRegistrationListener();
+
+        bundleContext.addServiceListener(
+            new ProtocolProviderServiceRegListener());
 
         ServiceReference[] serRefs = null;
         try
@@ -154,7 +163,7 @@ public static List<ProtocolProviderService> getPhoneNumberProviders()
     /**
      * Listens for <tt>ProtocolProviderService</tt> registrations.
      */
-    private static class ProtocolProviderRegListener
+    private static class ProtocolProviderServiceRegListener
         implements ServiceListener
     {
         public void serviceChanged(ServiceEvent event)
@@ -199,10 +208,17 @@ private static void handleProviderAdded(
     {
         if (protocolProvider.getOperationSet(
                 OperationSetServerStoredContactInfo.class) != null
-            && protocolProvider.isRegistered()
             && !phoneProviders.contains(protocolProvider))
         {
-            phoneProviders.add(protocolProvider);
+            if(protocolProvider.isRegistered())
+            {
+                phoneProviders.add(protocolProvider);
+            }
+            else
+            {
+                protocolProvider.addRegistrationStateChangeListener(
+                    ppRegListener);
+            }
         }
     }
 
@@ -218,6 +234,8 @@ private static void handleProviderRemoved(
     {
         if (phoneProviders.contains(protocolProvider))
             phoneProviders.remove(protocolProvider);
+
+        protocolProvider.removeRegistrationStateChangeListener(ppRegListener);
     }
 
     /**
@@ -235,4 +253,23 @@ public static PhoneNumberI18nService getPhoneNumberI18nService()
 
         return phoneNumberI18nService;
     }
+
+    /**
+     * Listens for provider change in registration state.
+     */
+    private static class ProtocolProviderRegistrationListener
+        implements RegistrationStateChangeListener
+    {
+        @Override
+        public void registrationStateChanged(RegistrationStateChangeEvent evt)
+        {
+            ProtocolProviderService protocolProvider = evt.getProvider();
+
+            if (evt.getNewState() == RegistrationState.REGISTERED)
+            {
+                if(!phoneProviders.contains(protocolProvider))
+                    phoneProviders.add(protocolProvider);
+            }
+        }
+    }
 }