next-coder
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java‎
Lines changed: 3 additions & 2 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java‎
Lines changed: 10 additions & 6 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java‎
Lines changed: 10 additions & 6 deletions
diff --git a/‎common/darwin/Classes/FlutterRTCPeerConnection.m‎
Lines changed: 6 additions & 3 deletions b/‎common/darwin/Classes/FlutterRTCPeerConnection.m‎
Lines changed: 6 additions & 3 deletions
@@ -916,10 +916,11 @@ private RTCConfiguration parseRTCConfiguration(ConstraintsMap map) {
 
   public String peerConnectionInit(ConstraintsMap configuration, ConstraintsMap constraints) {
     String peerConnectionId = getNextStreamUUID();
-    PeerConnectionObserver observer = new PeerConnectionObserver(this, messenger, peerConnectionId);
+    RTCConfiguration conf =  parseRTCConfiguration(configuration);
+    PeerConnectionObserver observer = new PeerConnectionObserver(conf,this, messenger, peerConnectionId);
     PeerConnection peerConnection
         = mFactory.createPeerConnection(
-        parseRTCConfiguration(configuration),
+        conf,
         parseMediaConstraints(constraints),
         observer);
     observer.setPeerConnection(peerConnection);
 
@@ -38,13 +38,15 @@ class PeerConnectionObserver implements PeerConnection.Observer, EventChannel.St
   private BinaryMessenger messenger;
   private final String id;
   private PeerConnection peerConnection;
+  private PeerConnection.RTCConfiguration configuration;
   final Map<String, MediaStream> remoteStreams = new HashMap<>();
   final Map<String, MediaStreamTrack> remoteTracks = new HashMap<>();
   private final StateProvider stateProvider;
   private final EventChannel eventChannel;
   private EventChannel.EventSink eventSink;
 
-  PeerConnectionObserver(StateProvider stateProvider, BinaryMessenger messenger, String id) {
+  PeerConnectionObserver(PeerConnection.RTCConfiguration configuration, StateProvider stateProvider, BinaryMessenger messenger, String id) {
+    this.configuration = configuration;
     this.stateProvider = stateProvider;
     this.messenger = messenger;
     this.id = id;
@@ -430,11 +432,13 @@ public void onAddTrack(RtpReceiver receiver, MediaStream[] mediaStreams) {
       params.putMap("track", mediaTrackToMap(receiver.track()));
       params.putMap("receiver", rtpReceiverToMap(receiver));
 
-      List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
-      for( RtpTransceiver transceiver : transceivers ) {
-            if(transceiver.getReceiver() != null && receiver.id().equals(transceiver.getReceiver().id())) {
-                params.putMap("transceiver", transceiverToMap(transceiver));
-            }
+      if(this.configuration.sdpSemantics == PeerConnection.SdpSemantics.UNIFIED_PLAN) {
+          List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
+          for( RtpTransceiver transceiver : transceivers ) {
+              if(transceiver.getReceiver() != null && receiver.id().equals(transceiver.getReceiver().id())) {
+                  params.putMap("transceiver", transceiverToMap(transceiver));
+              }
+          }
       }
       sendEvent(params);
   }
 
@@ -537,11 +537,14 @@ - (void)peerConnection:(RTCPeerConnection *)peerConnection
         @"streams": streams,
         }];
 
-        for(RTCRtpTransceiver *transceiver in  peerConnection.transceivers) {
-            if(transceiver.receiver != nil && [transceiver.receiver.receiverId isEqualToString:rtpReceiver.receiverId]) {
-                [event setValue:[self transceiverToMap:transceiver] forKey:@"transceiver"];
+        if(peerConnection.configuration.sdpSemantics == RTCSdpSemanticsUnifiedPlan) {
+            for(RTCRtpTransceiver *transceiver in  peerConnection.transceivers) {
+                if(transceiver.receiver != nil && [transceiver.receiver.receiverId isEqualToString:rtpReceiver.receiverId]) {
+                    [event setValue:[self transceiverToMap:transceiver] forKey:@"transceiver"];
+                }
             }
         }
+        
         eventSink(event);
     }
 }