Fix the correct return value of createDataChannel under darwin.

cloudwebrtc · cloudwebrtc · commit 7d1f18ac910f · 2021-10-13T22:59:43.000+08:00
diff --git a/common/darwin/Classes/FlutterRTCDataChannel.h b/common/darwin/Classes/FlutterRTCDataChannel.h
@@ -14,7 +14,8 @@
 -(void)createDataChannel:(nonnull NSString *)peerConnectionId
                    label:(nonnull NSString *)label
                   config:(nonnull RTCDataChannelConfiguration *)config
-               messenger:(nonnull NSObject<FlutterBinaryMessenger> *)messenger;
+               messenger:(nonnull NSObject<FlutterBinaryMessenger> *)messenger
+                  result:(nonnull FlutterResult)result;
 
 -(void)dataChannelClose:(nonnull NSString *)peerConnectionId
           dataChannelId:(nonnull NSString *)dataChannelId;
diff --git a/common/darwin/Classes/FlutterRTCDataChannel.m b/common/darwin/Classes/FlutterRTCDataChannel.m
@@ -65,6 +65,7 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
                               label:(NSString *)label
                              config:(RTCDataChannelConfiguration *)config
                messenger:(NSObject<FlutterBinaryMessenger>*)messenger
+                  result:(nonnull FlutterResult)result
 {
     RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
     RTCDataChannel *dataChannel = [peerConnection dataChannelForLabel:label configuration:config];
@@ -82,6 +83,8 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId
         
         dataChannel.eventChannel = eventChannel;
         [eventChannel setStreamHandler:dataChannel];
+        
+        result(@{@"label": label, @"id": dataChannelId});
     }
 }
 
diff --git a/common/darwin/Classes/FlutterWebRTCPlugin.m b/common/darwin/Classes/FlutterWebRTCPlugin.m
@@ -334,8 +334,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult) result
         [self createDataChannel:peerConnectionId
                           label:label
                          config:[self RTCDataChannelConfiguration:dataChannelDict]
-                      messenger:_messenger];
-        result(nil);
+                      messenger:_messenger
+                         result:result];
     } else if ([@"dataChannelSend" isEqualToString:call.method]){
         NSDictionary* argsMap = call.arguments;
         NSString* peerConnectionId = argsMap[@"peerConnectionId"];

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId`
`65`	`65`	`label:(NSString *)label`
`66`	`66`	`config:(RTCDataChannelConfiguration *)config`
`67`	`67`	`messenger:(NSObject<FlutterBinaryMessenger>*)messenger`
	`68`	`+ result:(nonnull FlutterResult)result`
`68`	`69`	`{`
`69`	`70`	`RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];`
`70`	`71`	`RTCDataChannel *dataChannel = [peerConnection dataChannelForLabel:label configuration:config];`
`@@ -82,6 +83,8 @@ -(void)createDataChannel:(nonnull NSString *)peerConnectionId`
`82`	`83`
`83`	`84`	`dataChannel.eventChannel = eventChannel;`
`84`	`85`	`[eventChannel setStreamHandler:dataChannel];`
	`86`	`+`
	`87`	`+ result(@{@"label": label, @"id": dataChannelId});`
`85`	`88`	`}`
`86`	`89`	`}`
`87`	`90`