8000 Update. · CodeStrings/flutter-webrtc@89cfe15 · GitHub
[go: up one dir, main page]
Skip to content

Commit 89cfe15

Browse files
cloudwebrtccloudwebrtc
committed
Update.
1 parent 6b460d5 commit 89cfe15

File tree

3 files changed

+7
-53
lines changed

3 files changed

+7
-53
lines changed

‎android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void onIceGatheringChange(PeerConnection.IceGatheringState iceGatheringSt
261261
sendEvent(params);
262262
}
263263

264-
private String getReactTagForStream(MediaStream mediaStream) {
264+
private String getUIDForStream(MediaStream mediaStream) {
265265
for (Iterator<Map.Entry<String, MediaStream>> i
266266
= remoteStreams.entrySet().iterator();
267267
i.hasNext();) {
@@ -275,7 +275,7 @@ private String getReactTagForStream(MediaStream mediaStream) {
275275

276276
@Override
277277
public void onAddStream(MediaStream mediaStream) {
278-
String streamReactTag = null;
278+
String streamUID = null;
279279
String streamId = mediaStream.label();
280280
// The native WebRTC implementation has a special concept of a default
281281
// MediaStream instance with the label default that the implementation
@@ -284,14 +284,14 @@ public void onAddStream(MediaStream mediaStream) {
284284
for (Map.Entry<String, MediaStream> e
285285
: remoteStreams.entrySet()) {
286286
if (e.getValue().equals(mediaStream)) {
287-
streamReactTag = e.getKey();
287+
streamUID = e.getKey();
288288
break;
289289
}
290290
}
291291
}
292292

293-
if (streamReactTag == null){
294-
streamReactTag = plugin.getNextStreamUUID();
293+
if (streamUID == null){
294+
streamUID = plugin.getNextStreamUUID();
295295
remoteStreams.put(streamId, mediaStream);
296296
}
297297

@@ -368,7 +368,6 @@ public void onAddTrack(MediaStream mediaStream,MediaStreamTrack track){
368368
Log.d(TAG, "onAddTrack");
369369

370370
String streamId = mediaStream.label();
371-
String streamReactTag = streamId;
372371

373372
ConstraintsMap params = new ConstraintsMap();
374373
params.putString("event", "onAddTrack");
@@ -393,7 +392,7 @@ public void onAddTrack(MediaStream mediaStream,MediaStreamTrack track){
393392
public void onRemoveTrack(MediaStream mediaStream,MediaStreamTrack track){
394393
Log.d(TAG, "onRemoveTrack");
395394
String streamId = mediaStream.label();
396-
String streamReactTag = streamId;
395+
397396
ConstraintsMap params = new ConstraintsMap();
398397
params.putString("event", "onRemoveTrack");
399398
params.putString("streamId", streamId);

‎android/src/main/java/com/cloudwebrtc/webrtc/utils/PermissionUtils.java

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,6 @@ public class PermissionUtils {
3636
*/
3737
private static int requestCode;
3838

39-
40-
private static void maybeRequestPermissionsOnHostResume(
41-
final FlutterWebRTCPlugin plugin,
42-
final String[] permissions,
43-
int[] grantResults,
44-
final ResultReceiver resultReceiver,
45-
int requestCode) {
46-
47-
/*
48-
if (!(context instanceof ReactContext)) {
49-
// I do not know how to wait for an Activity here.
50-
send(resultReceiver, requestCode, permissions, grantResults);
51-
return;
52-
}
53-
54-
final Context reactContext = (Context) context;
55-
reactContext.addLifecycleEventListener(
56-
new LifecycleEventListener() {
57-
@Override
58-
public void onHostDestroy() {
59-
}
60-
61-
@Override
62-
public void onHostPause() {
63-
}
64-
65-
@Override
66-
public void onHostResume() {
67-
reactContext.removeLifecycleEventListener(this);
68-
requestPermissions(context, permissions, resultReceiver);
69-
}
70-
});
71-
*/
72-
}
73-
7439
private static void requestPermissions(
7540
FlutterWebRTCPlugin plugin,
7641
String[] permissions,
@@ -115,20 +80,10 @@ private static void requestPermissions(
11580

11681
Activity activity = plugin.getActivity();
11782

118-
// If a ReactContext does not have a current Activity, then wait for
119-
// it to get a current Activity; otherwise, the user will not be asked
120-
// about the denied permissions and getUserMedia will fail.
12183
if (activity == null) {
122-
maybeRequestPermissionsOnHostResume(
123-
plugin,
124-
permissions,
125-
grantResults,
126-
resultReceiver,
127-
requestCode);
12884
return;
12985
}
13086

131-
13287
Bundle args = new Bundle();
13388
args.putInt(REQUEST_CODE, requestCode);
13489
args.putParcelable(RESULT_RECEIVER, resultReceiver);

‎ios/Classes/FlutterRTCVideoRenderer.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ -(void)setStreamId:(NSString*)streamId view:(FlutterRTCVideoRenderer*)view {
164164
NSArray *videoTracks = stream ? stream.videoTracks : nil;
165165
videoTrack = videoTracks && videoTracks.count ? videoTracks[0] : nil;
166166
if (!videoTrack) {
167-
NSLog(@"No video stream for react tag: %@", streamId);
167+
NSLog(@"No video track for RTCMediaStream: %@", streamId);
168168
}
169169
} else {
170170
videoTrack = nil;

0 commit comments

Comments
 (0)
0