react-native-altibbi 0.2.0 → 0.3.0

package/android/build.gradle

@@ -99,6 +99,6 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'com.pusher:pusher-java-client:2.+'
   implementation 'com.google.code.gson:gson:2.+'
-  implementation 'com.opentok.android:opentok-android-sdk:2.26.1'
+  implementation 'com.opentok.android:opentok-android-sdk:2.28.0'
 }
 

package/android/src/main/java/com/altibbi/OTPublisherLayout.java

@@ -1,7 +1,8 @@
 package com.altibbi;
 
-import android.opengl.GLSurfaceView;
+import android.view.Gravity;
 import android.widget.FrameLayout;
+import android.opengl.GLSurfaceView;
 
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.opentok.android.BaseVideoRenderer;

package/android/src/main/java/com/altibbi/OTPublisherViewManager.java

@@ -1,9 +1,10 @@
 package com.altibbi;
 
 
+import android.util.Log;
 
-import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 

package/android/src/main/java/com/altibbi/OTRN.java

@@ -2,7 +2,6 @@ package com.altibbi;
 
 import android.widget.FrameLayout;
 
-import com.facebook.react.bridge.Callback;
 import com.opentok.android.Connection;
 import com.opentok.android.Publisher;
 import com.opentok.android.Session;
@@ -11,6 +10,8 @@ import com.opentok.android.Subscriber;
 
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.facebook.react.bridge.Callback;
+
 
 public class OTRN {
 

package/android/src/main/java/com/altibbi/OTScreenCapturer.java

@@ -1,5 +1,6 @@
 package com.altibbi;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.os.Handler;

package/android/src/main/java/com/altibbi/OTSessionManager.java

@@ -1,49 +1,50 @@
 package com.altibbi;
 
 
-
+import android.os.Build;
 import android.util.Log;
-import android.view.View;
 import android.widget.FrameLayout;
+import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.altibbi.utils.EventUtils;
+import com.altibbi.utils.Utils;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.opentok.android.AudioDeviceManager;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.Promise;
+
+import com.opentok.android.Session;
 import com.opentok.android.Connection;
 import com.opentok.android.MediaUtils;
 import com.opentok.android.MuteForcedInfo;
-import com.opentok.android.OpentokError;
 import com.opentok.android.Publisher;
 import com.opentok.android.PublisherKit;
 import com.opentok.android.PublisherKit.VideoTransformer;
-import com.opentok.android.Session;
-import com.opentok.android.Session.Builder.IceServer;
-import com.opentok.android.Session.Builder.IncludeServers;
-import com.opentok.android.Session.Builder.TransportPolicy;
 import com.opentok.android.Stream;
+import com.opentok.android.OpentokError;
 import com.opentok.android.Subscriber;
 import com.opentok.android.SubscriberKit;
 import com.opentok.android.VideoUtils;
-import com.altibbi.utils.EventUtils;
-import com.altibbi.utils.Utils;
+import com.opentok.android.Session.Builder.TransportPolicy;
+import com.opentok.android.Session.Builder.IncludeServers;
+import com.opentok.android.Session.Builder.IceServer;
+import com.opentok.android.AudioDeviceManager;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.ArrayList;
 
 public class OTSessionManager extends ReactContextBaseJavaModule
         implements Session.SessionListener,
@@ -53,6 +54,7 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         PublisherKit.AudioStatsListener,
         PublisherKit.MuteListener,
         PublisherKit.VideoStatsListener,
+        PublisherKit.VideoListener,
         SubscriberKit.SubscriberListener,
         Session.SignalListener,
         Session.ConnectionListener,
@@ -94,11 +96,6 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         final boolean useTextureViews = sessionOptions.getBoolean("useTextureViews");
         final boolean connectionEventsSuppressed = sessionOptions.getBoolean("connectionEventsSuppressed");
         final boolean ipWhitelist = sessionOptions.getBoolean("ipWhitelist");
-        final boolean enableStereoOutput = sessionOptions.getBoolean("enableStereoOutput");
-        if (enableStereoOutput) {
-            OTCustomAudioDriver otCustomAudioDriver = new OTCustomAudioDriver(this.getReactApplicationContext());
-            AudioDeviceManager.setAudioDevice(otCustomAudioDriver);
-        }
         final List<IceServer> iceServersList = Utils.sanitizeIceServer(sessionOptions.getArray("customServers"));
         final IncludeServers includeServers = Utils.sanitizeIncludeServer(sessionOptions.getString("includeServers"));
         final TransportPolicy transportPolicy = Utils.sanitizeTransportPolicy(sessionOptions.getString("transportPolicy"));
@@ -156,7 +153,8 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         Boolean videoTrack = properties.getBoolean("videoTrack");
         Boolean audioTrack = properties.getBoolean("audioTrack");
         String cameraPosition = properties.getString("cameraPosition");
-        Boolean audioFallbackEnabled = properties.getBoolean("audioFallbackEnabled");
+        Boolean publisherAudioFallback = properties.getBoolean("publisherAudioFallback");
+        Boolean subscriberAudioFallback = properties.getBoolean("subscriberAudioFallback");
         int audioBitrate = properties.getInt("audioBitrate");
         Boolean enableDtx = properties.getBoolean("enableDtx");
         String frameRate = "FPS_" + properties.getInt("frameRate");
@@ -188,25 +186,28 @@ public class OTSessionManager extends ReactContextBaseJavaModule
                     .videoTrack(videoTrack)
                     .name(name)
                     .audioBitrate(audioBitrate)
+                    .publisherAudioFallbackEnabled(publisherAudioFallback)
+                    .subscriberAudioFallbackEnabled(subscriberAudioFallback)
                     .resolution(Publisher.CameraCaptureResolution.valueOf(resolution))
                     .frameRate(Publisher.CameraCaptureFrameRate.valueOf(frameRate))
                     .build();
+
             if (cameraPosition.equals("back")) {
                 mPublisher.cycleCamera();
             }
-            if (mPublisher.getCapturer() != null) {
+            if (videoTrack && mPublisher.getCapturer() != null) {
                 mPublisher.getCapturer().setVideoContentHint(Utils.convertVideoContentHint(properties.getString("videoContentHint")));
             }
         }
         mPublisher.setPublisherListener(this);
         mPublisher.setAudioLevelListener(this);
         mPublisher.setRtcStatsReportListener(this);
-        mPublisher.setAudioFallbackEnabled(audioFallbackEnabled);
         mPublisher.setPublishVideo(publishVideo);
         mPublisher.setPublishAudio(publishAudio);
         mPublisher.setPublishCaptions(publishCaptions);
         mPublisher.setAudioStatsListener(this);
         mPublisher.setVideoStatsListener(this);
+        mPublisher.setVideoListener(this);
         mPublisher.setMuteListener(this);
         ConcurrentHashMap<String, Publisher> mPublishers = sharedState.getPublishers();
         mPublishers.put(publisherId, mPublisher);
@@ -330,7 +331,7 @@ public class OTSessionManager extends ReactContextBaseJavaModule
             Stream mStream = streams.get(streamId);
             if (mStream == null) {
                 promise.reject("Stream not found.");
-                return;
+                continue;
             }
             mExcludedStreams.add(mStream);
         }
@@ -486,11 +487,11 @@ public class OTSessionManager extends ReactContextBaseJavaModule
     }
 
     @ReactMethod
-    public void getSubscriberRtcStatsReport(String streamId) {
+    public void getSubscriberRtcStatsReport() {
 
         ConcurrentHashMap<String, Subscriber> mSubscribers = sharedState.getSubscribers();
-        Subscriber mSubscriber = mSubscribers.get(streamId);
-        if (mSubscriber != null) {
+        ArrayList<Subscriber> mSubscriberList = new ArrayList<>(mSubscribers.values());
+        for (Subscriber mSubscriber : mSubscriberList) {
             mSubscriber.getRtcStatsReport();
         }
     }
@@ -590,6 +591,19 @@ public class OTSessionManager extends ReactContextBaseJavaModule
 
     }
 
+    @ReactMethod
+    public void setEncryptionSecret(String sessionId, String secret, Callback callback) {
+        ConcurrentHashMap<String, Session> mSessions = sharedState.getSessions();
+        Session mSession = mSessions.get(sessionId);
+        if (mSession != null) {
+            mSession.setEncryptionSecret(secret);
+            callback.invoke();
+        } else {
+            WritableMap errorInfo = EventUtils.createError("There was an error setting the encryption secret. The native session instance could not be found.");
+            callback.invoke(errorInfo);
+        }
+    }
+
     @ReactMethod
     public void destroyPublisher(final String publisherId, final Callback callback) {
 
@@ -844,14 +858,14 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         printLogs("onStreamDropped: Stream Dropped: "+stream.getStreamId() +" in session: "+session.getSessionId());
     }
     @Override
-    public void onMuteForced​(Session session, MuteForcedInfo info) {
+    public void onMuteForced(Session session, MuteForcedInfo info) {
 
         WritableMap muteForcedInfo = Arguments.createMap();
         String sessionId = session.getSessionId();
         muteForcedInfo.putString("sessionId", sessionId);
         Boolean active = info.getActive();
         muteForcedInfo.putBoolean("active", active);
-        sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onMuteForced​", muteForcedInfo);
+        sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onMuteForced", muteForcedInfo);
         printLogs("Mute forced -- active: " + active + " in session: " + sessionId);
     }
 
@@ -862,9 +876,9 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         ConcurrentHashMap<String, Stream> mSubscriberStreams = sharedState.getSubscriberStreams();
         mSubscriberStreams.put(stream.getStreamId(), stream);
         if (publisherId.length() > 0) {
-            String event = publisherId + ":" + publisherPreface + "onStreamCreated";;
             WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, publisherKit.getSession());
-            sendEventMap(this.getReactApplicationContext(), event, streamInfo);
+            streamInfo.putString("publisherId", publisherId);
+            sendEventMap(this.getReactApplicationContext(), "publisherStreamCreated", streamInfo);
         }
         printLogs("onStreamCreated: Publisher Stream Created. Own stream "+stream.getStreamId());
 
@@ -874,13 +888,13 @@ public class OTSessionManager extends ReactContextBaseJavaModule
     public void onStreamDestroyed(PublisherKit publisherKit, Stream stream) {
 
         String publisherId = Utils.getPublisherId(publisherKit);
-        String event = publisherId + ":" + publisherPreface + "onStreamDestroyed";
         ConcurrentHashMap<String, Stream> mSubscriberStreams = sharedState.getSubscriberStreams();
         String mStreamId = stream.getStreamId();
         mSubscriberStreams.remove(mStreamId);
         if (publisherId.length() > 0) {
             WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, publisherKit.getSession());
-            sendEventMap(this.getReactApplicationContext(), event, streamInfo);
+            streamInfo.putString("publisherId", publisherId);
+            sendEventMap(this.getReactApplicationContext(), "publisherStreamDestroyed", streamInfo);
         }
         Callback mCallback = sharedState.getPublisherDestroyedCallbacks().get(publisherId);
         if (mCallback != null) {
@@ -947,7 +961,7 @@ public class OTSessionManager extends ReactContextBaseJavaModule
     }
 
     @Override
-    public void onMuteForced​(PublisherKit publisher) {
+    public void onMuteForced(PublisherKit publisher) {
 
         String publisherId = Utils.getPublisherId(publisher);
         if (publisherId.length() > 0) {
@@ -956,6 +970,50 @@ public class OTSessionManager extends ReactContextBaseJavaModule
         }
     }
 
+    @Override
+    public void onVideoDisabled(PublisherKit publisher, String reason) {
+        String publisherId = Utils.getPublisherId(publisher);
+        if (publisherId.length() > 0) {
+            String event = publisherId + ":" + publisherPreface + "onVideoDisabled";
+            WritableMap publisherInfo = Arguments.createMap();
+            publisherInfo.putString("reason", reason);
+            sendEventMap(this.getReactApplicationContext(), event, publisherInfo);
+        }
+        printLogs("Publisher onVideoDisabled " + reason);
+    }
+
+    @Override
+    public void onVideoEnabled(PublisherKit publisher, String reason) {
+        String publisherId = Utils.getPublisherId(publisher);
+        if (publisherId.length() > 0) {
+            String event = publisherId + ":" + publisherPreface + "onVideoEnabled";
+            WritableMap publisherInfo = Arguments.createMap();
+            publisherInfo.putString("reason", reason);
+            sendEventMap(this.getReactApplicationContext(), event, publisherInfo);
+        }
+        printLogs("Publisher onVideoEnabled " + reason);
+    }
+
+    @Override
+    public void onVideoDisableWarning(PublisherKit publisher) {
+        String publisherId = Utils.getPublisherId(publisher);
+        if (publisherId.length() > 0) {
+            String event = publisherId + ":" + publisherPreface + "onVideoDisableWarning";
+            sendEventMap(this.getReactApplicationContext(), event, null);
+        }
+        printLogs("Publisher onVideoDisableWarning");
+    }
+
+    @Override
+    public void onVideoDisableWarningLifted(PublisherKit publisher) {
+        String publisherId = Utils.getPublisherId(publisher);
+        if (publisherId.length() > 0) {
+            String event = publisherId + ":" + publisherPreface + "onVideoDisableWarningLifted";
+            sendEventMap(this.getReactApplicationContext(), event, null);
+        }
+        printLogs("Publisher onVideoDisableWarningLifted");
+    }
+
     @Override
     public void onConnected(SubscriberKit subscriberKit) {
 

package/android/src/main/java/com/altibbi/OTSubscriberLayout.java

@@ -8,7 +8,6 @@ import com.facebook.react.uimanager.ThemedReactContext;
 import com.opentok.android.BaseVideoRenderer;
 import com.opentok.android.Session;
 import com.opentok.android.Subscriber;
-
 import java.util.concurrent.ConcurrentHashMap;
 
 

package/android/src/main/java/com/altibbi/OTSubscriberViewManager.java

@@ -1,9 +1,10 @@
 package com.altibbi;
 
 
-import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import android.util.Log;
 
 
 public class OTSubscriberViewManager extends ViewGroupManager<OTSubscriberLayout> {

package/android/src/main/java/com/altibbi/utils/EventUtils.java

@@ -6,10 +6,10 @@ import com.facebook.react.bridge.WritableMap;
 import com.opentok.android.Connection;
 import com.opentok.android.MediaUtils;
 import com.opentok.android.OpentokError;
-import com.opentok.android.PublisherKit;
 import com.opentok.android.Session;
 import com.opentok.android.Stream;
 import com.opentok.android.SubscriberKit;
+import com.opentok.android.PublisherKit;
 
 public final class EventUtils {
 

package/android/src/main/java/com/altibbi/utils/Utils.java

@@ -1,21 +1,22 @@
 package com.altibbi.utils;
 
-import com.facebook.react.bridge.ReadableArray;
-import com.opentok.android.BaseVideoCapturer.VideoContentHint;
+import com.altibbi.OTRN;
 import com.opentok.android.OpentokError;
 import com.opentok.android.Publisher;
 import com.opentok.android.PublisherKit;
 import com.opentok.android.PublisherKit.VideoTransformer;
-import com.opentok.android.Session.Builder.IceServer;
-import com.opentok.android.Session.Builder.IncludeServers;
-import com.opentok.android.Session.Builder.TransportPolicy;
 import com.opentok.android.Subscriber;
 import com.opentok.android.SubscriberKit;
-import com.altibbi.OTRN;
+import com.opentok.android.Session.Builder.TransportPolicy;
+import com.opentok.android.Session.Builder.IncludeServers;
+import com.opentok.android.Session.Builder.IceServer;
+import com.opentok.android.BaseVideoCapturer.VideoContentHint;
+
+import com.facebook.react.bridge.ReadableArray;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
+import java.util.List;
 
 public final class Utils {
 
@@ -105,10 +106,6 @@ public final class Utils {
         if (transformerList != null) {
             for (int i = 0; i < transformerList.size(); i++) {
                 String transformerName = transformerList.getMap(i).getString("name");
-                if (transformerName == "BackgroundReplacement" ) {
-                    // Only implemented in iOS -- ignore in Androd for now.
-                    continue;
-                }
                 VideoTransformer transformer = publisher.new VideoTransformer(
                     transformerName,
                     transformerList.getMap(i).getString("properties")

package/ios/OTSessionManager.m

@@ -49,11 +49,10 @@ RCT_EXTERN_METHOD(publishVideo:
                   pubVideo:(BOOL)pubVideo)
 RCT_EXTERN_METHOD(publishCaptions:
                   (NSString*)publisherId
-                  pubAudio:(BOOL)publishCaptions)
+                  pubCaptions:(BOOL)publishCaptions)
 RCT_EXTERN_METHOD(getRtcStatsReport:
                   (NSString*)publisherId)
-RCT_EXTERN_METHOD(getSubscriberRtcStatsReport:
-                  (NSString*)subscriberId)
+RCT_EXTERN_METHOD(getSubscriberRtcStatsReport)
 RCT_EXTERN_METHOD(subscribeToAudio:
                   (NSString*)streamId
                   subAudio:(BOOL)subAudio)
@@ -62,7 +61,7 @@ RCT_EXTERN_METHOD(subscribeToVideo:
                   subVideo:(BOOL)subVideo)
 RCT_EXTERN_METHOD(subscribeToCaptions:
                   (NSString*)streamId
-                  subAudio:(BOOL)subCaptions)
+                  subCaptions:(BOOL)subCaptions)
 RCT_EXTERN_METHOD(setPreferredResolution:
                   (NSString*)streamId
                   resolution:(NSDictionary*)resolution)
@@ -86,6 +85,10 @@ RCT_EXTERN_METHOD(sendSignal:
                   (NSString*)sessionId
                   signal:(NSDictionary*)signal
                   callback:(RCTResponseSenderBlock*)callback)
+RCT_EXTERN_METHOD(setEncryptionSecret:
+                  (NSString*)sessionId
+                  secret:(NSString*)secret
+                  callback:(RCTResponseSenderBlock*)callback)
 RCT_EXTERN_METHOD(destroyPublisher:
                   (NSString*)publisherId
                   callback:(RCTResponseSenderBlock)callback)