Skip to content

Commit b13fbd0

Browse files
authored
Merge pull request #493 from cordova-rtc/bugs/MediaUUID
Handle possible duplicate remote streamId/trackId with janus/kurento/freeswitch or short duplicate name
2 parents a535852 + ad28397 commit b13fbd0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/PluginMediaStream.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class PluginMediaStream : NSObject {
1818

1919
self.rtcMediaStream = rtcMediaStream
2020

21-
// Handle possible duplicate remote streamId with janus name
21+
/// Handle possible duplicate remote streamId with janus or short duplicate name
2222
// See: https://github.com/cordova-rtc/cordova-plugin-iosrtc/issues/432
23-
if (rtcMediaStream.streamId.starts(with: "janus")) {
23+
if (rtcMediaStream.streamId.count < 36) {
2424
self.id = rtcMediaStream.streamId + "_" + UUID().uuidString;
2525
} else {
2626
self.id = rtcMediaStream.streamId;

src/PluginMediaStreamTrack.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class PluginMediaStreamTrack : NSObject {
1616

1717
self.rtcMediaStreamTrack = rtcMediaStreamTrack
1818

19-
// Handle possible duplicate remote trackId with janus name
19+
// Handle possible duplicate remote trackId with janus or short duplicate name
2020
// See: https://github.com/cordova-rtc/cordova-plugin-iosrtc/issues/432
21-
if (rtcMediaStreamTrack.trackId.starts(with: "janus")) {
21+
if (rtcMediaStreamTrack.trackId.count < 36) {
2222
self.id = rtcMediaStreamTrack.trackId + "_" + UUID().uuidString;
2323
} else {
2424
self.id = rtcMediaStreamTrack.trackId;

0 commit comments

Comments
 (0)