fix callbacks not fired

Author: USAMAWIZARD

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java

@@ -16,7 +16,6 @@
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.WindowManager;
-import android.widget.GridLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -64,6 +63,7 @@
 import org.webrtc.audio.JavaAudioDeviceModule;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -86,6 +86,7 @@
 import io.antmedia.webrtcandroidframework.apprtc.AppRTCAudioManager;
 import io.antmedia.webrtcandroidframework.websocket.AntMediaSignallingEvents;
 import io.antmedia.webrtcandroidframework.websocket.Broadcast;
+import io.antmedia.webrtcandroidframework.websocket.WebSocketConstants;
 import io.antmedia.webrtcandroidframework.websocket.WebSocketHandler;
 
 public class WebRTCClient implements IWebRTCClient, AntMediaSignallingEvents {
@@ -1576,6 +1577,7 @@ public void onJoinedTheRoom(String streamId, String[] streams) {
         config.webRTCListener.onJoinedTheRoom(streamId, streams);
     }
 
+
     @Override
     public void onRoomInformation(String[] streams) {
         config.webRTCListener.onRoomInformation(streams);
@@ -1787,6 +1789,11 @@ public void onStateChange() {
                 }
             });
         }
+        protected String toTextMessage(DataChannel.Buffer buffer) {
+            ByteBuffer data = buffer.data;
+            String messageText = new String(data.array(), StandardCharsets.UTF_8);
+            return messageText;
+        }
 
         @Override
         public void onMessage(final DataChannel.Buffer buffer) {
@@ -1799,6 +1806,7 @@ public void onMessage(final DataChannel.Buffer buffer) {
             handler.post(() -> {
                 if (config.dataChannelObserver == null || dataChannel == null) return;
                 try{
+                    handleNotification(toTextMessage(bufferCopy));
                     config.dataChannelObserver.onMessage(bufferCopy, dataChannel.label());
                 }catch (IllegalStateException e) {
                     Log.e(TAG, "Data channel related error:" + e.getMessage());
@@ -1807,6 +1815,37 @@ public void onMessage(final DataChannel.Buffer buffer) {
         }
     }
 
+    public void handleNotification(String message) {
+        if (message == null || !message.contains("eventType"))
+            return;
+
+        JSONObject jsonMessage;
+        String streamId;
+        String eventTyp;
+
+        try {
+            jsonMessage = new JSONObject(message);
+            streamId = jsonMessage.getString(WebSocketConstants.STREAM_ID);
+            eventTyp = jsonMessage.getString("eventType");
+        } catch (Exception e) {
+           return;
+        }
+
+        switch (eventTyp) {
+            case WebSocketConstants.CAM_TURNED_OFF:
+                config.webRTCListener.onCameraTurnOffFor(streamId);
+                break;
+            case WebSocketConstants.CAM_TURNED_ON:
+                config.webRTCListener.onCameraTurnOnFor(streamId);
+                break;
+            case WebSocketConstants.MIC_MUTED:
+                config.webRTCListener.onMutedFor(streamId);
+                break;
+            case WebSocketConstants.MIC_UNMUTED:
+                config.webRTCListener.onUnmutedFor(streamId);
+        }
+    }
+
     public void sendMessageViaDataChannel(String streamId, DataChannel.Buffer buffer) {
         if (isDataChannelEnabled()) {
             executor.execute(() -> {

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketConstants.java

@@ -451,4 +451,11 @@ private WebSocketConstants() {
 
     public static final int WEBSOCKET_CONNECTION_TIMEOUT = 10000; //10 sec
 
+    public static final String CAM_TURNED_OFF  = "CAM_TURNED_OFF";
+
+    public static final String CAM_TURNED_ON  = "CAM_TURNED_ON";
+
+    public static final String MIC_MUTED  = "MIC_MUTED";
+
+    public static final String MIC_UNMUTED  = "MIC_UNMUTED";
 }

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/websocket/WebSocketHandler.java

@@ -212,7 +212,6 @@ else if (commandText.equals(WebSocketConstants.STREAM_INFORMATION_NOTIFICATION))
                 signallingListener.onStreamInfoList(streamId, streamInfos);
             }
             else if (commandText.equals(NOTIFICATION_COMMAND)) {
-
                 String definition = json.getString(DEFINITION);
 
                 Log.d(TAG, "notification:   " + definition);
@@ -280,7 +279,6 @@ else if (definition.equals(WebSocketConstants.BROADCAST_OBJECT_NOTIFICATION)) {
                 }else if(definition.equals(WebSocketConstants.RESOLUTION_CHANGE_INFO_COMMAND)){
                     int resolution = json.getInt(WebSocketConstants.STREAM_HEIGHT);
                     signallingListener.onResolutionChange(streamId, resolution);
-
                 }
             }
             else if (commandText.equals(WebSocketConstants.TRACK_LIST)) {

webrtc-android-framework/src/test/java/io/antmedia/webrtcandroidframework/WebRTCClientTest.java

@@ -1399,5 +1399,21 @@ public void testLeaveP2P() {
 
         Mockito.verify(webRTCClient, times(1)).release(true);
     }
+    @Test
+    public void handleNotification(){
+        IWebRTCListener listener1 = webRTCClient.getConfig().webRTCListener;
+        webRTCClient.handleNotification("{\"streamId\":\"test\",\"eventType\":\"CAM_TURNED_OFF\"}");
+        verify(listener1).onCameraTurnOffFor("test");
+
+        webRTCClient.handleNotification("{\"streamId\":\"test\",\"eventType\":\"CAM_TURNED_ON\"}");
+        verify(listener1).onCameraTurnOnFor("test");
+
+        webRTCClient.handleNotification("{\"streamId\":\"test\",\"eventType\":\"MIC_UNMUTED\"}");
+        verify(listener1).onUnmutedFor("test");
+
+        webRTCClient.handleNotification("{\"streamId\":\"test\",\"eventType\":\"MIC_MUTED\"}");
+        verify(listener1).onMutedFor("test");
+
+    }
 
 }