Merge pull request #49 from dpocock/sip-uri-on-boot

Sip uri on boot

src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java

@@ -26,6 +26,20 @@
 public class UriHandlerSipImpl
     implements UriHandler, ServiceListener, AccountManagerListener
 {
+    /**
+     * Property to set the amount of time to wait for SIP registration
+     * to complete before trying to dial a URI from the command line.
+     * (value in milliseconds).
+     */
+    public static final String INITIAL_REGISTRATION_TIMEOUT_PROP
+        = "net.java.sip.communicator.impl.protocol.sip.call.INITIAL_REGISTRATION_TIMEOUT";
+
+    /**
+     * Default value for INITIAL_REGISTRATION_TIMEOUT (milliseconds)
+     */
+    public static final long DEFAULT_INITIAL_REGISTRATION_TIMEOUT
+        = 5000;
+
     /**
      * The <tt>Logger</tt> used by the <tt>UriHandlerSipImpl</tt> class and its
      * instances for logging output.
@@ -254,12 +268,11 @@ public String getProtocol()
     }
 
     /**
-     * Parses the specified URI and creates a call with the currently active
-     * telephony operation set.
+     * Parses the specified URI and tries to create a call when online.
      *
      * @param uri the SIP URI that we have to call.
      */
-    public void handleUri(String uri)
+    public void handleUri(final String uri)
     {
         /*
          * TODO If the requirement to register the factory service after
@@ -278,7 +291,7 @@ public void handleUri(String uri)
             }
         }
 
-        ProtocolProviderService provider;
+        final ProtocolProviderService provider;
         try
         {
             provider = selectHandlingProvider(uri);
@@ -301,6 +314,73 @@ public void handleUri(String uri)
             return;
         }
 
+        if(provider.getRegistrationState() == RegistrationState.REGISTERED)
+        {
+            handleUri(uri, provider);
+        }
+        else
+        {
+            // Allow a grace period for the provider to register in case
+            // we have just started up
+            long initialRegistrationTimeout =
+                SipActivator.getConfigurationService()
+                    .getLong(INITIAL_REGISTRATION_TIMEOUT_PROP,
+                        DEFAULT_INITIAL_REGISTRATION_TIMEOUT);
+            final DelayRegistrationStateChangeListener listener =
+                new DelayRegistrationStateChangeListener(uri, provider);
+            provider.addRegistrationStateChangeListener(listener);
+            new Timer().schedule(new TimerTask()
+            {
+                @Override
+                public void run()
+                {
+                    provider.removeRegistrationStateChangeListener(listener);
+                    // Even if not registered after the timeout, try the call
+                    // anyway and the error popup will appear to ask the
+                    // user if they want to register
+                    handleUri(uri, provider);
+                }
+            }, initialRegistrationTimeout);
+        }
+    }
+
+    /**
+     * Listener on provider state changes that handles the passed URI if the
+     * provider becomes registered.
+     */
+    private class DelayRegistrationStateChangeListener
+        implements RegistrationStateChangeListener
+    {
+        private String uri;
+        private ProtocolProviderService provider;
+        private boolean handled = false;
+
+        public DelayRegistrationStateChangeListener(String uri,
+            ProtocolProviderService provider)
+        {
+            this.uri = uri;
+            this.provider = provider;
+        }
+
+        @Override
+        public void registrationStateChanged(RegistrationStateChangeEvent evt)
+        {
+            if (evt.getNewState() == RegistrationState.REGISTERED && !handled)
+            {
+                provider.removeRegistrationStateChangeListener(this);
+                handled = true;
+                handleUri(uri, provider);
+            }
+        }
+    }
+
+    /**
+     * Creates a call with the currently active telephony operation set.
+     *
+     * @param uri the SIP URI that we have to call.
+     */
+    protected void handleUri(String uri, ProtocolProviderService provider)
+    {
         //handle "sip://" URIs as "sip:" 
         if(uri != null)
             uri = uri.replace("sip://", "sip:");