Improvements

jitsi · Oct 18, 2020 · b9e9ac8 · b9e9ac8
1 parent ec00826
commit b9e9ac8
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 10 deletions.
diff --git a/src/main/java/org/jitsi/jigasi/JvbConference.java b/src/main/java/org/jitsi/jigasi/JvbConference.java
@@ -837,9 +837,7 @@ public void joinConferenceRoom()
             // the room)
             inviteTimeout.scheduleTimeout();
 
-            this.getConnection()
-                    .addAsyncStanzaListener(this.roomConfigurationListener,
-                                            new StanzaTypeFilter(org.jivesoftware.smack.packet.Message.class));
+            registerRoomConfigurationChange();
 
             if (StringUtils.isNullOrEmpty(roomPassword))
             {
@@ -1057,10 +1055,8 @@ private void onJvbCallEnded()
 
     private void leaveConferenceRoom()
     {
-        if (roomConfigurationListener != null)
-        {
-            this.getConnection().removeAsyncStanzaListener(this.roomConfigurationListener);
-        }
+
+        unregisterRoomConfigurationChange();
 
         if (this.jitsiMeetTools != null)
         {
@@ -2141,9 +2137,22 @@ private void onAllowedToUnmute()
     /**
      * Called when room configuration has changed.
      */
-    private void onRoomConfigurationChanged() {
-        try {
-            if (this.mucRoom != null) {
+    private void onRoomConfigurationChanged()
+    {
+        try
+        {
+            if (this.mucRoom != null)
+            {
+                /**
+                 * Check the room configuration only if force mute is enabled.
+                 * This should probably be in jitsi SDK.
+                 */
+
+                if (!this.forceMute.enabled())
+                {
+                    return;
+                }
+
                 ServiceDiscoveryManager serviceDiscoveryManager
                         = ServiceDiscoveryManager.getInstanceFor(this.getConnection());
 
@@ -2187,5 +2196,39 @@ private void onRoomConfigurationChanged() {
             logger.error(ex.toString());
         }
     }
+
+    /**
+     *
+     */
+    private void registerRoomConfigurationChange()
+    {
+        if (this.xmppProvider instanceof ProtocolProviderServiceJabberImpl)
+        {
+            XMPPConnection xmppConnection = ((ProtocolProviderServiceJabberImpl) this.xmppProvider)
+                .getConnection();
+
+            xmppConnection
+                    .addAsyncStanzaListener(this.roomConfigurationListener,
+                            new StanzaTypeFilter(org.jivesoftware.smack.packet.Message.class));
+        }
+    }
+
+    /**
+     *
+     */
+    private void unregisterRoomConfigurationChange()
+    {
+        if (this.xmppProvider instanceof ProtocolProviderServiceJabberImpl)
+        {
+            if (roomConfigurationListener != null)
+            {
+                XMPPConnection xmppConnection = ((ProtocolProviderServiceJabberImpl) this.xmppProvider)
+                        .getConnection();
+
+                xmppConnection
+                        .removeAsyncStanzaListener(this.roomConfigurationListener);
+            }
+        }
+    }
 }
 
diff --git a/src/main/java/org/jitsi/jigasi/mute/ForceMute.java b/src/main/java/org/jitsi/jigasi/mute/ForceMute.java
@@ -5,4 +5,6 @@ public interface ForceMute
     void requestAudioMute(boolean muted);
 
     void setAllowedToSpeak(boolean allowedToSpeak);
+
+    boolean enabled();
 }
diff --git a/src/main/java/org/jitsi/jigasi/mute/ForceMuteDisabled.java b/src/main/java/org/jitsi/jigasi/mute/ForceMuteDisabled.java
@@ -24,4 +24,9 @@ public void setAllowedToSpeak(boolean allowedToSpeak)
     {
 
     }
+
+    @Override
+    public boolean enabled() {
+        return false;
+    }
 }
diff --git a/src/main/java/org/jitsi/jigasi/mute/ForceMuteEnabled.java b/src/main/java/org/jitsi/jigasi/mute/ForceMuteEnabled.java
@@ -36,4 +36,9 @@ public void setAllowedToSpeak(boolean allowedToSpeak)
     {
         this.allowedToSpeak = allowedToSpeak;
     }
+
+    @Override
+    public boolean enabled() {
+        return true;
+    }
 }