Merge branch 'master' into desktop

Author: cloudwebrtc

.github/workflows/flutter.yml

@@ -0,0 +1,31 @@
+name: Flutter CI
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+      - action_test
+
+jobs:
+  test:
+    name: Test on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+#        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '12.x'
+      - uses: subosito/flutter-action@v1
+        with:
+          flutter-version: '1.7.8+hotfix.4'
+          channel: 'stable'
+      - run: flutter packages get
+      - run: flutter test
+      - run: flutter build apk --target-platform android-arm,android-arm64 --split-per-abi
+
+#      - run: curl

ios/Podfile

@@ -54,6 +54,9 @@ target 'Runner' do
   }
 end
 
+# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
+install! 'cocoapods', :disable_input_output_paths => true
+
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|

lib/src/call_sample/signaling.dart

@@ -22,7 +22,8 @@ enum SignalingState {
 typedef void SignalingStateCallback(SignalingState state);
 typedef void StreamStateCallback(MediaStream stream);
 typedef void OtherEventCallback(dynamic event);
-typedef void DataChannelMessageCallback(RTCDataChannel dc, RTCDataChannelMessage data);
+typedef void DataChannelMessageCallback(
+    RTCDataChannel dc, RTCDataChannelMessage data);
 typedef void DataChannelCallback(RTCDataChannel dc);
 
 class Signaling {
@@ -34,6 +35,8 @@ class Signaling {
   var _displayName;
   var _peerConnections = new Map<String, RTCPeerConnection>();
   var _dataChannels = new Map<String, RTCDataChannel>();
+  var _remoteCandidates = [];
+
   MediaStream _localStream;
   List<MediaStream> _remoteStreams;
   SignalingStateCallback onStateChange;
@@ -152,12 +155,17 @@ class Signaling {
             this.onStateChange(SignalingState.CallStateNew);
           }
 
-          _createPeerConnection(id, media, false).then((pc) {
-            _peerConnections[id] = pc;
-            pc.setRemoteDescription(new RTCSessionDescription(
-                description['sdp'], description['type']));
-            _createAnswer(id, pc, media);
-          });
+          var pc = await _createPeerConnection(id, media, false);
+          _peerConnections[id] = pc;
+          await pc.setRemoteDescription(new RTCSessionDescription(
+              description['sdp'], description['type']));
+          await _createAnswer(id, pc, media);
+          if (this._remoteCandidates.length > 0) {
+            _remoteCandidates.forEach((candidate) async {
+              await pc.addCandidate(candidate);
+            });
+            _remoteCandidates.clear();
+          }
         }
         break;
       case 'answer':
@@ -167,7 +175,7 @@ class Signaling {
 
           var pc = _peerConnections[id];
           if (pc != null) {
-            pc.setRemoteDescription(new RTCSessionDescription(
+            await pc.setRemoteDescription(new RTCSessionDescription(
                 description['sdp'], description['type']));
           }
         }
@@ -177,13 +185,14 @@ class Signaling {
           var id = data['from'];
           var candidateMap = data['candidate'];
           var pc = _peerConnections[id];
-
+          RTCIceCandidate candidate = new RTCIceCandidate(
+              candidateMap['candidate'],
+              candidateMap['sdpMid'],
+              candidateMap['sdpMLineIndex']);
           if (pc != null) {
-            RTCIceCandidate candidate = new RTCIceCandidate(
-                candidateMap['candidate'],
-                candidateMap['sdpMid'],
-                candidateMap['sdpMLineIndex']);
-            pc.addCandidate(candidate);
+            await pc.addCandidate(candidate);
+          } else {
+            _remoteCandidates.add(candidate);
           }
         }
         break;
@@ -278,7 +287,7 @@ class Signaling {
       );
 
       return webSocket;
-    }catch(e){
+    } catch (e) {
       throw e;
     }
   }

pubspec.yaml

@@ -20,7 +20,9 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
   flutter_webrtc:
-    path: ../flutter-webrtc
+    git:
+      url: https://github.com/cloudwebrtc/flutter-webrtc.git
+
   # Plugins from flutter/plugins, with local desktop implementations.
   shared_preferences: 0.5.2
   shared_preferences_fde:
@@ -35,6 +37,7 @@ dependencies:
       url: https://github.com/google/flutter-desktop-embedding.git
       path: plugins/flutter_plugins/path_provider_fde
 
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

test/widget_test.dart

@@ -13,17 +13,5 @@ void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
     await tester.pumpWidget(new MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
   });
 }