Merge pull request #423 from opentok/0.14.0

Update Native SDK to 2.17.x (#421)
opentok · Jun 26, 2020 · 1baf989 · 1baf989
2 parents ed9feb6 + f0d8e2f
commit 1baf989
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.14.0 (May 22, 2020)
+
+- **[Feature]**: Update of iOS SDK to `2.17.0` and Android SDK to `2.17.1`
+- OTSessionManager.java#248 mSubscriber.destroy() removed as from 2.17.x, resources will be automatically released by the garbage collector.
+
 # 0.13.0 (Mar 23, 2020)
 
 - **[Feature]**: Add Session Options support, both [iOS](https://tokbox.com/developer/sdks/ios/reference/Classes/OTSessionSettings.html) and [Android](https://tokbox.com/developer/sdks/android/reference/). Note: iceConfig option is not currently supported
@@ -28,6 +33,6 @@
 
 -   **[Feature]**: Enable `OTSubscriber` children custom render (merged from [PR306](https://github.com/opentok/opentok-react-native/pull/306)). Adheres to: [#289](https://github.com/opentok/opentok-react-native/issues/289), [#174](https://github.com/opentok/opentok-react-native/issues/174)
 -  iOS SDK updated to `2.16.1`
--   Android SDK updated to `2.16.1`
+-  Android SDK updated to `2.16.1`
 
 # 0.x.x (todo)
diff --git a/README.md b/README.md
@@ -4,17 +4,15 @@
 
 React Native library for OpenTok iOS and Android SDKs
 
-- [Pre-Requisites](#pre-requisites)
-- [Installation](#installation)
-  - [iOS Installation](#ios-installation)
-  - [Android Installation](#android-installation)
-- API Reference
-  - [OTSession Component](https://github.com/opentok/opentok-react-native/tree/master/docs/OTSession.md)
-  - [OTPublisher Component](https://github.com/opentok/opentok-react-native/tree/master/docs/OTPublisher.md)
-  - [OTSubscriber Component](https://github.com/opentok/opentok-react-native/tree/master/docs/OTSubscriber.md)
-  - [Event Data](https://github.com/opentok/opentok-react-native/tree/master/docs/EventData.md)
-- [Samples](#samples)
-- [Contributing](#contributing)
+- [opentok-react-native](#opentok-react-native)
+    - [In this repo, you'll find the OpenTok React Native library:](#in-this-repo-youll-find-the-opentok-react-native-library)
+  - [Pre-Requisites:](#pre-requisites)
+  - [Installation:](#installation)
+    - [iOS Installation](#ios-installation)
+    - [Android Installation](#android-installation)
+  - [Samples](#samples)
+  - [Development and Contributing](#development-and-contributing)
+  - [Getting Help](#getting-help)
 
 ### In this repo, you'll find the OpenTok React Native library:
 
@@ -54,7 +52,7 @@ If you've installed this package before, you may need to edit your `Podfile` and
     target '<YourProjectName>' do
 
       # Pods for <YourProject>
-        pod 'OpenTok', '2.16.3'
+        pod 'OpenTok', '2.17.0'
     end
 
 ```

diff --git a/android/build.gradle b/android/build.gradle
@@ -22,5 +22,5 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:${_reactNativeVersion}"  // From node_modules
-    implementation 'com.opentok.android:opentok-android-sdk:2.16.5'
+    implementation 'com.opentok.android:opentok-android-sdk:2.17.1'
 }
diff --git a/android/src/main/java/com/opentokreactnative/OTSessionManager.java b/android/src/main/java/com/opentokreactnative/OTSessionManager.java
@@ -202,13 +202,13 @@ public void publish(String sessionId, String publisherId, Callback callback) {
     }
 
     @ReactMethod
-    public void subscribeToStream(String streamId, ReadableMap properties, Callback callback) {
+    public void subscribeToStream(String streamId, String sessionId, ReadableMap properties, Callback callback) {
 
         ConcurrentHashMap<String, Stream> mSubscriberStreams = sharedState.getSubscriberStreams();
         ConcurrentHashMap<String, Subscriber> mSubscribers = sharedState.getSubscribers();
         ConcurrentHashMap<String, Session> mSessions = sharedState.getSessions();
         Stream stream = mSubscriberStreams.get(streamId);
-        Session mSession = mSessions.get(stream.getSession().getSessionId());
+        Session mSession = mSessions.get(sessionId);
         Subscriber mSubscriber = new Subscriber.Builder(getReactApplicationContext(), stream).build();
         mSubscriber.setSubscriberListener(this);
         mSubscriber.setAudioLevelListener(this);
@@ -246,9 +246,6 @@ public void run() {
                     mSubscriberViewContainer.removeAllViews();
                 }
                 mSubscriberViewContainers.remove(mStreamId);
-                if (mSubscriber != null) {
-                    mSubscriber.destroy();
-                }
                 mSubscribers.remove(mStreamId);
                 mSubscriberStreams.remove(mStreamId);
                 mCallback.invoke();
@@ -388,7 +385,7 @@ public void run() {
                 Publisher mPublisher = mPublishers.get(publisherId);
                 Session mSession = null;
                 mPublisherDestroyedCallbacks.put(publisherId, callback);
-                if (mPublisher != null && mPublisher.getSession() != null) {
+                if (mPublisher != null && mPublisher.getSession() != null && mPublisher.getSession().getSessionId() != null) {
                     mSession = mSessions.get(mPublisher.getSession().getSessionId());
                 }
 
@@ -400,10 +397,9 @@ public void run() {
                     mSession.unpublish(mPublisher);
                 }
                 if (mPublisher != null) {
-                    mPublisher.destroy();
+                    mPublisher.getCapturer().stopCapture();
                 }
                 mPublishers.remove(publisherId);
-                callback.invoke();
             }
         });
     }
@@ -507,7 +503,7 @@ public void onStreamReceived(Session session, Stream stream) {
 
         ConcurrentHashMap<String, Stream> mSubscriberStreams = sharedState.getSubscriberStreams();
         mSubscriberStreams.put(stream.getStreamId(), stream);
-        WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream);
+        WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamReceived", streamInfo);
         printLogs("onStreamReceived: New Stream Received " + stream.getStreamId() + " in session: " + session.getSessionId());
 
@@ -587,7 +583,7 @@ public void onConnectionDestroyed(Session session, Connection connection) {
     @Override
     public void onStreamDropped(Session session, Stream stream) {
 
-        WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream);
+        WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamDropped", streamInfo);
         printLogs("onStreamDropped: Stream Dropped: "+stream.getStreamId() +" in session: "+session.getSessionId());
     }
@@ -600,7 +596,7 @@ public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
         mSubscriberStreams.put(stream.getStreamId(), stream);
         if (publisherId.length() > 0) {
             String event = publisherId + ":" + publisherPreface + "onStreamCreated";;
-            WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream);
+            WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, publisherKit.getSession());
             sendEventMap(this.getReactApplicationContext(), event, streamInfo);
         }
         printLogs("onStreamCreated: Publisher Stream Created. Own stream "+stream.getStreamId());
@@ -616,7 +612,7 @@ public void onStreamDestroyed(PublisherKit publisherKit, Stream stream) {
         String mStreamId = stream.getStreamId();
         mSubscriberStreams.remove(mStreamId);
         if (publisherId.length() > 0) {
-            WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream);
+            WritableMap streamInfo = EventUtils.prepareJSStreamMap(stream, publisherKit.getSession());
             sendEventMap(this.getReactApplicationContext(), event, streamInfo);
         }
         Callback mCallback = sharedState.getPublisherDestroyedCallbacks().get(publisherId);
@@ -659,7 +655,7 @@ public void onConnected(SubscriberKit subscriberKit) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriberKit.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface +  "onConnected", subscriberInfo);
         }
@@ -675,7 +671,7 @@ public void onDisconnected(SubscriberKit subscriberKit) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriberKit.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface +  "onDisconnected", subscriberInfo);
         }
@@ -691,7 +687,7 @@ public void onReconnected(SubscriberKit subscriberKit) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriberKit.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface +  "onReconnected", subscriberInfo);
         }
@@ -707,7 +703,7 @@ public void onError(SubscriberKit subscriberKit, OpentokError opentokError) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriberKit.getSession()));
             }
             subscriberInfo.putMap("error", EventUtils.prepareJSErrorMap(opentokError));
             sendEventMap(this.getReactApplicationContext(), subscriberPreface +  "onError", subscriberInfo);
@@ -740,7 +736,7 @@ public void onAudioStats(SubscriberKit subscriber, SubscriberKit.SubscriberAudio
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             subscriberInfo.putMap("audioStats", EventUtils.prepareAudioNetworkStats(stats));
             sendEventMap(this.getReactApplicationContext(), subscriberPreface +  "onAudioStats", subscriberInfo);
@@ -756,7 +752,7 @@ public void onVideoStats(SubscriberKit subscriber, SubscriberKit.SubscriberVideo
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             subscriberInfo.putMap("videoStats", EventUtils.prepareVideoNetworkStats(stats));
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoStats", subscriberInfo);
@@ -772,7 +768,7 @@ public void onAudioLevelUpdated(SubscriberKit subscriber, float audioLevel) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             subscriberInfo.putString("audioLevel", String.valueOf(audioLevel));
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onAudioLevelUpdated", subscriberInfo);
@@ -788,7 +784,7 @@ public void onVideoDisabled(SubscriberKit subscriber, String reason) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             subscriberInfo.putString("reason", reason);
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoDisabled", subscriberInfo);
@@ -805,7 +801,7 @@ public void onVideoEnabled(SubscriberKit subscriber, String reason) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             subscriberInfo.putString("reason", reason);
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoEnabled", subscriberInfo);
@@ -822,7 +818,7 @@ public void onVideoDisableWarning(SubscriberKit subscriber) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoDisableWarning", subscriberInfo);
         }
@@ -838,7 +834,7 @@ public void onVideoDisableWarningLifted(SubscriberKit subscriber) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoDisableWarningLifted", subscriberInfo);
         }
@@ -854,7 +850,7 @@ public void onVideoDataReceived(SubscriberKit subscriber) {
             Stream mStream = streams.get(streamId);
             WritableMap subscriberInfo = Arguments.createMap();
             if (mStream != null) {
-                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream));
+                subscriberInfo.putMap("stream", EventUtils.prepareJSStreamMap(mStream, subscriber.getSession()));
             }
             sendEventMap(this.getReactApplicationContext(), subscriberPreface + "onVideoDataReceived", subscriberInfo);
         }
@@ -863,14 +859,14 @@ public void onVideoDataReceived(SubscriberKit subscriber) {
     @Override
     public void onStreamHasAudioChanged(Session session, Stream stream, boolean Audio) {
 
-        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("hasAudio", !Audio, Audio, stream);
+        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("hasAudio", !Audio, Audio, stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamPropertyChanged", eventData);
         printLogs("onStreamHasAudioChanged");
     }
     @Override
     public void onStreamHasVideoChanged(Session session, Stream stream, boolean Video) {
 
-        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("hasVideo", !Video, Video, stream);
+        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("hasVideo", !Video, Video, stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamPropertyChanged", eventData);
         printLogs("onStreamHasVideoChanged");
     }
@@ -887,7 +883,7 @@ public void onStreamVideoDimensionsChanged(Session session, Stream stream, int w
         WritableMap newVideoDimensions = Arguments.createMap();
         newVideoDimensions.putInt("height", height);
         newVideoDimensions.putInt("width", width);
-        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("videoDimensions", oldVideoDimensions, newVideoDimensions, stream);
+        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("videoDimensions", oldVideoDimensions, newVideoDimensions, stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamPropertyChanged", eventData);
         printLogs("onStreamVideoDimensionsChanged");
 
@@ -898,7 +894,7 @@ public void onStreamVideoTypeChanged(Session session, Stream stream, Stream.Stre
 
         ConcurrentHashMap<String, Stream> mSubscriberStreams = sharedState.getSubscriberStreams();
         String oldVideoType = stream.getStreamVideoType().toString();
-        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("videoType", oldVideoType, videoType.toString(), stream);
+        WritableMap eventData = EventUtils.prepareStreamPropertyChangedEventData("videoType", oldVideoType, videoType.toString(), stream, session);
         sendEventMap(this.getReactApplicationContext(), session.getSessionId() + ":" + sessionPreface + "onStreamPropertyChanged", eventData);
         printLogs("onStreamVideoTypeChanged");
     }