Merge pull request flutter-webrtc#90 from cloudwebrtc/rostopira-datachannel-patch

cloudwebrtc · web-flow · commit 6b2b3b901fcf · 2019-05-15T09:36:53.000+08:00
Workaround for WebRTC issue 10588
diff --git a/ios/Classes/FlutterRTCDataChannel.m b/ios/Classes/FlutterRTCDataChannel.m
@@ -25,6 +25,16 @@ - (void)setEventSink:(FlutterEventSink)eventSink
     objc_setAssociatedObject(self, @selector(eventSink), eventSink, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
+- (NSNumber *)flutterChannelId
+{
+    return objc_getAssociatedObject(self, _cmd);
+}
+
+- (void)setFlutterChannelId:(NSNumber *)flutterChannelId
+{
+    objc_setAssociatedObject(self, @selector(flutterChannelId), flutterChannelId, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
 - (FlutterEventChannel *)eventChannel
 {
     return objc_getAssociatedObject(self, _cmd);
@@ -59,10 +69,11 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
     RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
     RTCDataChannel *dataChannel = [peerConnection dataChannelForLabel:label configuration:config];
     
-    if (nil != dataChannel && -1 != dataChannel.channelId) {
+    if (nil != dataChannel) {
         dataChannel.peerConnectionId = peerConnectionId;
-        NSNumber *dataChannelId = [NSNumber numberWithInteger:dataChannel.channelId];
+        NSNumber *dataChannelId = [NSNumber numberWithInteger:config.channelId];
         peerConnection.dataChannels[dataChannelId] = dataChannel;
+        dataChannel.flutterChannelId = dataChannelId;
         dataChannel.delegate = self;
         
         FlutterEventChannel *eventChannel = [FlutterEventChannel
@@ -145,7 +156,7 @@ - (void)dataChannel:(RTCDataChannel *)channel didReceiveMessageWithBuffer:(RTCDa
     FlutterEventSink eventSink = channel.eventSink;
     if(eventSink) {
         eventSink(@{ @"event" : @"dataChannelReceiveMessage",
-                     @"id": @(channel.channelId),
+                     @"id": @(channel.flutterChannelId),
                      @"type": type,
                      @"data": (data ? data : [NSNull null])});
     }
diff --git a/ios/flutter_webrtc.podspec b/ios/flutter_webrtc.podspec
@@ -16,7 +16,7 @@ A new flutter plugin project.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'libyuv-iOS'
-  s.dependency 'GoogleWebRTC', '1.1.27299' # DON'T UPDATE UNTIL FIXED: https://bugs.chromium.org/p/webrtc/issues/detail?id=10588
+  s.dependency 'GoogleWebRTC', '1.1.27299'
   s.ios.deployment_target = '9.0'
   s.static_framework = true
 end
