8000 Add peerConnectionId to data channel EventChannel · hicodeboy/flutter-webrtc@6eba414 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6eba414

Browse files
author
optimygmbh
committed
Add peerConnectionId to data channel EventChannel
1 parent 66e529e commit 6eba414

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

‎ios/Classes/FlutterRTCDataChannel.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
7777
dataChannel.delegate = self;
7878

7979
FlutterEventChannel *eventChannel = [FlutterEventChannel
80-
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%d", [dataChannelId intValue]]
80+
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%1$@%2$d", peerConnectionId, [dataChannelId intValue]]
8181
binaryMessenger:messenger];
8282

8383
dataChannel.eventChannel = eventChannel;

‎ios/Classes/FlutterRTCPeerConnection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ - (void)peerConnection:(RTCPeerConnection*)peerConnection didOpenDataChannel:(RT
483483
peerConnection.dataChannels[dataChannelId] = dataChannel;
484484

485485
FlutterEventChannel *eventChannel = [FlutterEventChannel
486-
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%d", dataChannel.channelId]
486+
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%1$@%2$d", peerConnection.flutterId, dataChannel.channelId]
487487
binaryMessenger:self.messenger];
488488

489489
dataChannel.eventChannel = eventChannel;

‎lib/rtc_data_channel.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class RTCDataChannel {
113113
RTCDataChannel(this._peerConnectionId, this._label, this._dataChannelId) {
114114
stateChangeStream = _stateChangeController.stream;
115115
messageStream = _messageController.stream;
116-
_eventSubscription = _eventChannelFor(_dataChannelId)
116+
_eventSubscription = _eventChannelFor(_peerConnectionId, _dataChannelId)
117117
.receiveBroadcastStream()
118118
.listen(eventListener, onError: errorListener);
119119
}
@@ -149,8 +149,8 @@ class RTCDataChannel {
149149
}
150150
}
151151

152-
EventChannel _eventChannelFor(int dataChannelId) {
153-
return new EventChannel('FlutterWebRTC/dataChannelEvent$dataChannelId');
152+
EventChannel _eventChannelFor(String peerConnectionId, int dataChannelId) {
153+
return new EventChannel('FlutterWebRTC/dataChannelEvent$peerConnectionId$dataChannelId');
154154
}
155155

156156
void errorListener(Object obj) {

‎macos/Classes/FlutterRTCDataChannel.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
7777
dataChannel.delegate = self;
7878

7979
FlutterEventChannel *eventChannel = [FlutterEventChannel
80-
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%d", [dataChannelId intValue]]
80+
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%1$@%2$d", peerConnectionId, [dataChannelId intValue]]
8181
binaryMessenger:messenger];
8282

8383
dataChannel.eventChannel = eventChannel;

‎macos/Classes/FlutterRTCPeerConnection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ - (void)peerConnection:(RTCPeerConnection*)peerConnection didOpenDataChannel:(RT
483483
peerConnection.dataChannels[dataChannelId] = dataChannel;
484484

485485
FlutterEventChannel *eventChannel = [FlutterEventChannel
486-
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%d", dataChannel.channelId]
486+
eventChannelWithName:[NSString stringWithFormat:@"FlutterWebRTC/dataChannelEvent%1$@%2$d", peerConnection.flutterId, dataChannel.channelId]
487487
binaryMessenger:self.messenger];
488488

489489
dataChannel.eventChannel = eventChannel;

0 commit comments

Comments
 (0)
0