fix: Fixes outgoing calls and not live rooms. (#604)

* fix: Fixes outgoing calls and not live rooms.

* squash: Create outgoing sip call when meeting is not live.

* squash: Adds a log.

Author: damencho

src/main/java/org/jitsi/jigasi/AbstractGateway.java

@@ -199,6 +199,10 @@ public void onJvbRoomJoined(T source)
     public void onLobbyWaitReview(ChatRoom lobbyRoom)
     {}
 
+    @Override
+    public void notifyConferenceNotLive()
+    {}
+
     /**
      * Finds {@link AbstractGatewaySession} for given <tt>callResource</tt> if
      * one is currently active.

src/main/java/org/jitsi/jigasi/AbstractGatewaySession.java

@@ -311,7 +311,18 @@ public void notifyOnLobbyWaitReview(ChatRoom lobbyRoom)
      * Method called to notify that the conference is not live yet.
      */
     public void notifyConferenceNotLive()
-    {}
+    {
+        Iterable<GatewaySessionListener> gwListeners;
+        synchronized (listeners)
+        {
+            gwListeners = new ArrayList<>(listeners);
+        }
+
+        for (GatewaySessionListener listener : gwListeners)
+        {
+            listener.notifyConferenceNotLive();
+        }
+    }
 
     /**
      *  Method called by {@link JvbConference} that it has reached

src/main/java/org/jitsi/jigasi/GatewaySessionListener.java

@@ -36,6 +36,8 @@ public interface GatewaySessionListener<T extends AbstractGatewaySession>
      */
     void onJvbRoomJoined(T source);
 
+    void notifyConferenceNotLive();
+
     /**
      * Called when a <tt>AbstractGatewaySession</tt> has joined the lobby MUC
      *

src/main/java/org/jitsi/jigasi/SipGatewaySession.java

@@ -549,6 +549,7 @@ public void peerStateChanged(CallPeerChangeEvent evt)
     }
 
     /**
+     * jvbConferenceCall can be null in case of outgoing call where the xmpp meeting is not live.
      * {@inheritDoc}
      */
     Exception onConferenceCallStarted(Call jvbConferenceCall)
@@ -594,16 +595,6 @@ Exception onConferenceCallStarted(Call jvbConferenceCall)
                 return null;
             }
 
-            //sendPresenceExtension(
-              //  createPresenceExtension(
-                //    SipGatewayExtension.STATE_RINGING, null));
-
-            //if (jvbConference != null)
-            //{
-              //  jvbConference.setPresenceStatus(
-                //    SipGatewayExtension.STATE_RINGING);
-            //}
-
             // Make an outgoing call
             final OperationSetBasicTelephony tele
                 = sipProvider.getOperationSet(
@@ -652,9 +643,12 @@ public void callEnded(CallEvent callEvent)
                 this.sipCall = tele.createCall(outboundPrefix + destination);
                 this.initSipCall();
 
-                // Outgoing SIP connection mode sets common conference object
-                // just after the call has been created
-                jvbConferenceCall.setConference(sipCall.getConference());
+                if (jvbConferenceCall != null)
+                {
+                    // Outgoing SIP connection mode sets common conference object
+                    // just after the call has been created
+                    jvbConferenceCall.setConference(sipCall.getConference());
+                }
 
                 logger.info("Created outgoing call to " + this);
 
@@ -672,7 +666,10 @@ public void callEnded(CallEvent callEvent)
 
         try
         {
-            CallManager.acceptCall(jvbConferenceCall);
+            if (jvbConferenceCall != null)
+            {
+                CallManager.acceptCall(jvbConferenceCall);
+            }
         }
         catch(OperationFailedException e)
         {
@@ -1193,6 +1190,23 @@ public void notifyConferenceNotLive()
         {
             logger.error("Cannot send visitor message", ex);
         }
+
+        if (this.callContext.getDestination() != null && this.getSipCall() == null)
+        {
+            Exception error = this.onConferenceCallStarted(null);
+
+            if (error != null)
+            {
+                logger.error(error.toString(), error);
+
+                if (error instanceof OperationFailedException)
+                {
+                    OperationFailedException ex = (OperationFailedException)error;
+
+                    hangUpSipCall(ex.getErrorCode(), ex.getMessage());
+                }
+            }
+        }
     }
 
     /**

src/main/java/org/jitsi/jigasi/xmpp/CallControlMucActivator.java

@@ -30,7 +30,6 @@
 import org.jitsi.utils.logging.Logger;
 import org.jitsi.xmpp.extensions.rayo.*;
 import org.jitsi.service.configuration.*;
-import org.jitsi.xmpp.util.*;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.bosh.*;
 import org.jivesoftware.smack.iqrequest.*;
@@ -376,6 +375,10 @@ public void onJvbRoomJoined(AbstractGatewaySession source)
         updatePresenceStatusForXmppProviders();
     }
 
+    @Override
+    public void notifyConferenceNotLive()
+    {}
+
     @Override
     public void onLobbyWaitReview(ChatRoom lobbyRoom)
     {}
@@ -686,11 +689,19 @@ private void setDialResponseAndRegisterHangUpHandler(
                 room = waiter.lobbyRoom;
             }
 
-            response.setUri("xmpp:" + room.getIdentifier() + "/" + room.getUserNickname());
+            // room can be null when the meeting is not live yet
+            if (room != null)
+            {
+                response.setUri("xmpp:" + room.getIdentifier() + "/" + room.getUserNickname());
 
-            final XMPPConnection roomConnection = ((ProtocolProviderServiceJabberImpl) room.getParentProvider())
-                .getConnection();
-            roomConnection.registerIQRequestHandler(new HangUpIqHandler(room.getParentProvider()));
+                final XMPPConnection roomConnection = ((ProtocolProviderServiceJabberImpl) room.getParentProvider())
+                        .getConnection();
+                roomConnection.registerIQRequestHandler(new HangUpIqHandler(room.getParentProvider()));
+            }
+            else
+            {
+                logger.warn("Room is null for session: " + session);
+            }
         }
     }
 
@@ -716,6 +727,12 @@ public void onJvbRoomJoined(AbstractGatewaySession source)
             countDownLatch.countDown();
         }
 
+        @Override
+        public void notifyConferenceNotLive()
+        {
+            countDownLatch.countDown();
+        }
+
         @Override
         public void onLobbyWaitReview(ChatRoom lobbyRoom)
         {

src/test/java/org/jitsi/jigasi/GatewaySessionAsserts.java

@@ -39,6 +39,10 @@ public void onJvbRoomJoined(AbstractGatewaySession source)
         }
     }
 
+    @Override
+    public void notifyConferenceNotLive()
+    {}
+
     @Override
     public void onLobbyWaitReview(ChatRoom lobbyRoom)
     {}