Merge pull request #297 from opentok/0.11.0

v0.11.0
opentok · Jun 13, 2019 · 0ee1c8d · 0ee1c8d
2 parents e11c7aa + 7419a76
commit 0ee1c8d
Show file tree

Hide file tree

Showing 9 changed files with 1,690 additions and 1,612 deletions.
diff --git a/android/src/main/java/com/opentokreactnative/OTSessionManager.java b/android/src/main/java/com/opentokreactnative/OTSessionManager.java
@@ -558,6 +558,8 @@ public void onStreamDropped(Session session, Stream stream) {
     public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
 
         String publisherId = Utils.getPublisherId(publisherKit);
+        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);
@@ -572,6 +574,9 @@ 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);
             sendEventMap(this.getReactApplicationContext(), event, streamInfo);

diff --git a/android/src/main/java/com/opentokreactnative/utils/EventUtils.java b/android/src/main/java/com/opentokreactnative/utils/EventUtils.java
@@ -34,6 +34,11 @@ public static WritableMap prepareJSStreamMap(Stream stream) {
             streamInfo.putString("name", stream.getName());
             streamInfo.putBoolean("hasAudio", stream.hasAudio());
             streamInfo.putBoolean("hasVideo", stream.hasVideo());
+            if (stream.getStreamVideoType().equals(Stream.StreamVideoType.StreamVideoTypeScreen)) {
+                streamInfo.putString("videoType", "screen");
+            } else {
+                streamInfo.putString("videoType", "camera");
+            }
         }
         return streamInfo;
     }

diff --git a/docs/OTSubscriber.md b/docs/OTSubscriber.md
@@ -7,6 +7,7 @@
 | properties | Object | No | Properties passed into the native subscriber instance
 | streamProperties | Object | No | Used to update individual subscriber instance properties
 | eventHandlers | Object&lt;Function&gt; | No | Event handlers passed into the native subscriber instance
+| subscribeToSelf | Boolean | No | If true, subscribe to his own stream (default: false)
 
 ## Properties 
   * **subscribeToAudio** (Boolean) — Whether to subscribe to audio.

diff --git a/ios/OpenTokReactNative/OTSessionManager.swift b/ios/OpenTokReactNative/OTSessionManager.swift
@@ -411,6 +411,7 @@ extension OTSessionManager: OTSessionDelegate {
 extension OTSessionManager: OTPublisherDelegate {
     func publisher(_ publisher: OTPublisherKit, streamCreated stream: OTStream) {
         OTRN.sharedState.publisherStreams.updateValue(stream, forKey: stream.streamId)
+        OTRN.sharedState.subscriberStreams.updateValue(stream, forKey: stream.streamId)
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         if (publisherId.count > 0) {
             OTRN.sharedState.isPublishing[publisherId] = true;
@@ -424,6 +425,7 @@ extension OTSessionManager: OTPublisherDelegate {
     func publisher(_ publisher: OTPublisherKit, streamDestroyed stream: OTStream) {
         OTRN.sharedState.streamObservers.removeValue(forKey: stream.streamId)
         OTRN.sharedState.publisherStreams.removeValue(forKey: stream.streamId)
+        OTRN.sharedState.subscriberStreams.removeValue(forKey: stream.streamId)
         let publisherId = Utils.getPublisherId(publisher as! OTPublisher);
         OTRN.sharedState.isPublishing[publisherId] = false;
         if (publisherId.count > 0) {

diff --git a/ios/OpenTokReactNative/Utils/EventUtils.swift b/ios/OpenTokReactNative/Utils/EventUtils.swift
@@ -35,6 +35,7 @@ class EventUtils {
         streamInfo["creationTime"] = convertDateToString(stream.creationTime);
         streamInfo["height"] = stream.videoDimensions.height;
         streamInfo["width"] = stream.videoDimensions.width;
+        streamInfo["videoType"] = stream.videoType == OTStreamVideoType.screen ? "screen" : "camera"
         return streamInfo;
     }