Merge pull request #753 from opentok/fix-android-crash-v2.27.5

Fix android crash in develop v2.27.5
opentok · Jun 19, 2024 · 91abf9d · 91abf9d
2 parents ae06aa5 + d6c8b89
commit 91abf9d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/android/src/main/java/com/opentokreactnative/OTSessionManager.java b/android/src/main/java/com/opentokreactnative/OTSessionManager.java
@@ -878,9 +878,8 @@ public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
         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());
@@ -891,13 +890,12 @@ public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
     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);

diff --git a/ios/OpenTokReactNative/OTSessionManager.swift b/ios/OpenTokReactNative/OTSessionManager.swift
@@ -652,7 +652,7 @@ extension OTSessionManager: OTPublisherDelegate {
         if (publisherId.count > 0) {
             OTRN.sharedState.isPublishing[publisherId] = true;
             let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)streamCreated", data: streamInfo);
+            streamInfo["publisherId"] = publisherId;
             self.emitEvent("publisherStreamCreated", data: streamInfo);
             setStreamObservers(stream: stream, isPublisherStream: true)
         }
@@ -668,7 +668,7 @@ extension OTSessionManager: OTPublisherDelegate {
         if (publisherId.count > 0) {
             OTRN.sharedState.isPublishing[publisherId] = false;
             let streamInfo: Dictionary<String, Any> = EventUtils.prepareJSStreamEventData(stream);
-            self.emitEvent("\(publisherId):\(EventUtils.publisherPreface)streamDestroyed", data: streamInfo);
+            streamInfo["publisherId"] = publisherId;
             self.emitEvent("publisherStreamDestroyed", data: streamInfo);
         }
         OTRN.sharedState.publishers[publisherId] = nil;

diff --git a/src/OTPublisher.js b/src/OTPublisher.js
@@ -31,6 +31,8 @@ class OTPublisher extends Component {
   }
   initComponent = () => {
     this.componentEvents = {
+      publisherStreamCreated: 'publisherStreamCreated',
+      publisherStreamDestroyed: 'publisherStreamDestroyed:',
       sessionConnected:
         Platform.OS === 'android'
           ? 'session:onConnected'
@@ -44,6 +46,14 @@ class OTPublisher extends Component {
     );
     setNativeEvents(this.publisherEvents);
     OT.setJSComponentEvents(this.componentEventsArray);
+    this.publisherStreamCreated = nativeEvents.addListener(
+      'publisherStreamCreated',
+      stream => this.publisherStreamCreatedHandler(stream)
+    );
+    this.publisherStreamDestroyed = nativeEvents.addListener(
+      'publisherStreamDestroyed',
+      stream => this.publisherStreamDestroyedHandler(stream)
+    );
     if (this.context.sessionId) {
       this.sessionConnected = nativeEvents.addListener(
         `${this.context.sessionId}:${this.componentEvents.sessionConnected}`,
@@ -159,6 +169,26 @@ class OTPublisher extends Component {
     OT.getRtcStatsReport(this.state.publisherId);
   }
 
+  publisherStreamCreatedHandler = (stream) => {
+    if (
+      this.props.eventHandlers
+      && this.props.eventHandlers.streamCreated
+      && stream.publisherId === this.state.publisherId
+    ) {
+      this.props.eventHandlers.streamCreated(stream);
+    }
+  }
+
+  publisherStreamDestroyedHandler = (stream) => {
+    if (
+      this.props.eventHandlers
+      && this.props.eventHandlers.streamCreated
+      && stream.publisherId === this.state.publisherId
+    ) {
+      this.props.eventHandlers.streamDestroyed(stream);
+    }
+  }
+
   setVideoTransformers(videoTransformers) {
     OT.setVideoTransformers(this.state.publisherId, videoTransformers);
   }

diff --git a/src/helpers/OTPublisherHelper.js b/src/helpers/OTPublisherHelper.js
@@ -149,8 +149,8 @@ const sanitizePublisherEvents = (publisherId, events) => {
       videoDisableWarningLifted: 'videoDisableWarningLifted',
     },
     android: {
-      streamCreated: 'onStreamCreated',
-      streamDestroyed: 'onStreamDestroyed',
+      streamCreated: 'streamCreated',
+      streamDestroyed: 'streamDestroyed',
       error: 'onError',
       audioLevel: 'onAudioLevelUpdated',
       audioNetworkStats: 'onAudioStats',

diff --git a/src/helpers/OTSessionHelper.js b/src/helpers/OTSessionHelper.js
@@ -39,8 +39,6 @@ const sanitizeSessionEvents = (sessionId, events) => {
       archiveStopped: 'archiveStoppedWithId',
       streamPropertyChanged: 'streamPropertyChanged',
       muteForced: 'muteForced',
-      publisherStreamCreated: 'publisherStreamCreated',
-      publisherStreamDestroyed: 'publisherStreamDestroyed',
     },
     android: {
       streamCreated: 'onStreamReceived',
@@ -57,8 +55,6 @@ const sanitizeSessionEvents = (sessionId, events) => {
       archiveStopped: 'onArchiveStopped',
       streamPropertyChanged: 'onStreamPropertyChanged',
       muteForced: 'onMuteForced',
-      publisherStreamCreated: 'publisherStreamCreated',
-      publisherStreamDestroyed: 'publisherStreamDestroyed',
     }
   };
   return reassignEvents('session', customEvents, events, sessionId);