CodeStrings
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
Lines changed: 6 additions & 7 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java
Lines changed: 6 additions & 7 deletions
diff --git a/‎android/src/main/java/com/cloudwebrtc/webrtc/utils/PermissionUtils.java
Lines changed: 0 additions & 45 deletions b/‎android/src/main/java/com/cloudwebrtc/webrtc/utils/PermissionUtils.java
Lines changed: 0 additions & 45 deletions
diff --git a/‎ios/Classes/FlutterRTCVideoRenderer.m
Lines changed: 1 addition & 1 deletion b/‎ios/Classes/FlutterRTCVideoRenderer.m
Lines changed: 1 addition & 1 deletion
@@ -261,7 +261,7 @@ public void onIceGatheringChange(PeerConnection.IceGatheringState iceGatheringSt
         sendEvent(params);
     }
 
-    private String getReactTagForStream(MediaStream mediaStream) {
+    private String getUIDForStream(MediaStream mediaStream) {
         for (Iterator<Map.Entry<String, MediaStream>> i
                     = remoteStreams.entrySet().iterator();
                 i.hasNext();) {
@@ -275,7 +275,7 @@ private String getReactTagForStream(MediaStream mediaStream) {
 
     @Override
     public void onAddStream(MediaStream mediaStream) {
-        String streamReactTag = null;
+        String streamUID = null;
         String streamId = mediaStream.label();
         // The native WebRTC implementation has a special concept of a default
         // MediaStream instance with the label default that the implementation
@@ -284,14 +284,14 @@ public void onAddStream(MediaStream mediaStream) {
             for (Map.Entry<String, MediaStream> e
                     : remoteStreams.entrySet()) {
                 if (e.getValue().equals(mediaStream)) {
-                    streamReactTag = e.getKey();
+                    streamUID = e.getKey();
                     break;
                 }
             }
         }
 
-        if (streamReactTag == null){
-            streamReactTag = plugin.getNextStreamUUID();
+        if (streamUID == null){
+            streamUID = plugin.getNextStreamUUID();
             remoteStreams.put(streamId, mediaStream);
         }
 
@@ -368,7 +368,6 @@ public void onAddTrack(MediaStream mediaStream,MediaStreamTrack track){
         Log.d(TAG, "onAddTrack");
 
         String streamId = mediaStream.label();
-        String streamReactTag = streamId;
 
         ConstraintsMap params = new ConstraintsMap();
         params.putString("event", "onAddTrack");
@@ -393,7 +392,7 @@ public void onAddTrack(MediaStream mediaStream,MediaStreamTrack track){
     public void onRemoveTrack(MediaStream mediaStream,MediaStreamTrack track){
         Log.d(TAG, "onRemoveTrack");
         String streamId = mediaStream.label();
-        String streamReactTag = streamId;
+
         ConstraintsMap params = new ConstraintsMap();
         params.putString("event", "onRemoveTrack");
         params.putString("streamId", streamId);
 
@@ -36,41 +36,6 @@ public class PermissionUtils {
      */
     private static int requestCode;
 
-
-    private static void maybeRequestPermissionsOnHostResume(
-            final FlutterWebRTCPlugin plugin,
-            final String[] permissions,
-            int[] grantResults,
-            final ResultReceiver resultReceiver,
-            int requestCode) {
-
-        /*
-        if (!(context instanceof ReactContext)) {
-            // I do not know how to wait for an Activity here.
-            send(resultReceiver, requestCode, permissions, grantResults);
-            return;
-        }
-
-        final Context reactContext = (Context) context;
-        reactContext.addLifecycleEventListener(
-            new LifecycleEventListener() {
-                @Override
-                public void onHostDestroy() {
-                }
-
-                @Override
-                public void onHostPause() {
-                }
-
-                @Override
-                public void onHostResume() {
-                    reactContext.removeLifecycleEventListener(this);
-                    requestPermissions(context, permissions, result
10000
Receiver);
-                }
-            });
-        */
-    }
-
     private static void requestPermissions(
             FlutterWebRTCPlugin plugin,
             String[] permissions,
@@ -115,20 +80,10 @@ private static void requestPermissions(
 
         Activity activity = plugin.getActivity();
 
-        // If a ReactContext does not have a current Activity, then wait for
-        // it to get a current Activity; otherwise, the user will not be asked
-        // about the denied permissions and getUserMedia will fail.
         if (activity == null) {
-            maybeRequestPermissionsOnHostResume(
-                plugin,
-                permissions,
-                grantResults,
-                resultReceiver,
-                requestCode);
             return;
         }
 
-
         Bundle args = new Bundle();
         args.putInt(REQUEST_CODE, requestCode);
         args.putParcelable(RESULT_RECEIVER, resultReceiver);
 
@@ -164,7 +164,7 @@ -(void)setStreamId:(NSString*)streamId view:(FlutterRTCVideoRenderer*)view {
         NSArray *videoTracks = stream ? stream.videoTracks : nil;
         videoTrack = videoTracks && videoTracks.count ? videoTracks[0] : nil;
         if (!videoTrack) {
-            NSLog(@"No video stream for react tag: %@", streamId);
+            NSLog(@"No video track for RTCMediaStream: %@", streamId);
         }
     } else {
         videoTrack = nil;
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ -(void)setStreamId:(NSString)streamId view:(FlutterRTCVideoRenderer)view {`
`164`	`164`	`NSArray *videoTracks = stream ? stream.videoTracks : nil;`
`165`	`165`	`videoTrack = videoTracks && videoTracks.count ? videoTracks[0] : nil;`
`166`	`166`	`if (!videoTrack) {`
`167`		`- NSLog(@"No video stream for react tag: %@", streamId);`
	`167`	`+ NSLog(@"No video track for RTCMediaStream: %@", streamId);`
`168`	`168`	`}`
`169`	`169`	`} else {`
`170`	`170`	`videoTrack = nil;`