8000 null safety migration · next-coder/flutter-webrtc@537353a · GitHub
[go: up one dir, main page]
Skip to content

Commit 537353a

Browse files
wer-mathurinwer-mathurin
committed
null safety migration
1 parent 73db858 commit 537353a

33 files changed

+289
-248
lines changed

‎lib/src/helper.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class Helper {
4343
}
4444

4545
/// For web implementation, make sure to pass the target deviceId
46-
static Future<bool> switchCamera(MediaStreamTrack track,
47-
[String deviceId, MediaStream stream]) async {
48-
if (track?.kind != 'video') {
46+
static Future<bool?> switchCamera(MediaStreamTrack track,
47+
[String? deviceId, MediaStream? stream]) async {
48+
if (track.kind != 'video') {
4949
throw 'The is not a video track => $track';
5050
}
5151

‎lib/src/interface/enums.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ final typeRtpTransceiverDirectionToString = <TransceiverDirection, String>{
8888
TransceiverDirection.Inactive: 'inactive',
8989
};
9090

91-
RTCIceConnectionState iceConnectionStateForString(String state) {
91+
RTCIceConnectionState iceConnectionStateForString(String? state) {
9292
switch (state) {
9393
case 'new':
9494
return RTCIceConnectionState.RTCIceConnectionStateNew;
@@ -110,7 +110,7 @@ RTCIceConnectionState iceConnectionStateForString(String state) {
110110
return RTCIceConnectionState.RTCIceConnectionStateClosed;
111111
}
112112

113-
RTCIceGatheringState iceGatheringStateforString(String state) {
113+
RTCIceGatheringState iceGatheringStateforString(String? state) {
114114
switch (state) {
115115
case 'new':
116116
return RTCIceGatheringState.RTCIceGatheringStateNew;
@@ -122,7 +122,7 @@ RTCIceGatheringState iceGatheringStateforString(String state) {
122122
return RTCIceGatheringState.RTCIceGatheringStateNew;
123123
}
124124

125-
RTCSignalingState signalingStateForString(String state) {
125+
RTCSignalingState signalingStateForString(String? state) {
126126
switch (state) {
127127
case 'stable':
128128
return RTCSignalingState.RTCSignalingStateStable;
@@ -154,7 +154,7 @@ RTCDataChannelState rtcDataChannelStateForString(String state) {
154154
return RTCDataChannelState.RTCDataChannelClosed;
155155
}
156156

157-
RTCPeerConnectionState peerConnectionStateForString(String state) {
157+
RTCPeerConnectionState peerConnectionStateForString(String? state) {
158158
switch (state) {
159159
case 'new':
160160
return RTCPeerConnectionState.RTCPeerConnectionStateNew;

‎lib/src/interface/media_recorder.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ abstract class MediaRecorder {
77
/// For iOS use audioTrack
88
Future<void> start(
99
String path, {
10-
MediaStreamTrack videoTrack,
11-
RecorderAudioChannel audioChannel,
10+
MediaStreamTrack? videoTrack,
11+
RecorderAudioChannel? audioChannel,
1212
});
1313

1414
/// Only for Flutter Web
1515
void startWeb(
1616
MediaStream stream, {
17-
Function(dynamic blob, bool isLastOne) onDataChunk,
17+
Function(dynamic blob, bool isLastOne)? onDataChunk,
1818
String mimeType,
1919
});
2020

‎lib/src/interface/media_stream.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class MediaStream {
2121
/// The active attribute return true if this [MediaStream] is active and false otherwise.
2222
/// [MediaStream] is considered active if at least one of its [MediaStreamTracks] is not in the [MediaStreamTrack.ended] state.
2323
/// Once every track has ended, the stream's active property becomes false.
24-
bool get active;
24+
bool? get active;
2525

2626
@deprecated
2727
Future<void> getMediaTracks();

‎lib/src/interface/media_stream_track.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ abstract class MediaStreamTrack {
66
MediaStreamTrack();
77

88
/// Returns the unique identifier of the track
9-
String get id;
9+
String? get id;
1010

1111
/// This may label audio and video sources (e.g., "Internal microphone" or
1212
/// "External USB Webcam").
1313
///
1414
/// Returns the label of the object's corresponding source, if any.
1515
/// If the corresponding source has or had no label, returns an empty string.
16-
String get label;
16+
String? get label;
1717

1818
/// Returns the string 'audio' if this object represents an audio track
1919
/// or 'video' if this object represents a video track.
20-
String get kind;
20+
String? get kind;
2121

2222
/// Callback for onmute event
2323
StreamTrackCallback? onMute;
@@ -29,16 +29,16 @@ abstract class MediaStreamTrack {
2929
StreamTrackCallback? onEnded;
3030

3131
/// Returns the enable state of [MediaStreamTrack]
32-
bool get enabled;
32+
bool? get enabled;
3333

3434
/// Set the enable state of [MediaStreamTrack]
3535
///
3636
/// Note: After a [MediaStreamTrack] has ended, setting the enable state
3737
/// will not change the ended state.
38-
set enabled(bool b);
38+
set enabled(bool? b);
3939

4040
/// Returns true if the track is muted, and false otherwise.
41-
bool get muted;
41+
bool? get muted;
4242

4343
/// Returns a map containing the set of constraints most recently established
4444
/// for the track using a prior call to applyConstraints().

‎lib/src/interface/mediadevices.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,29 +120,29 @@ abstract class MediaDevices {
120120
/// cameras, headsets, and so forth.
121121
class MediaDeviceInfo {
122122
MediaDeviceInfo({
123-
required this.kind,
124-
required this.label,
125-
required this.groupId,
126-
required this.deviceId,
123+
this.kind,
124+
this.label,
125+
this.groupId,
126+
this.deviceId,
127127
});
128128

129129
/// Returns a String that is an identifier for the represented device that
130130
/// is persisted across sessions. It is un-guessable by other applications
131131
/// and unique to the origin of the calling application. It is reset when
132132
/// the user clears cookies (for Private Browsing, a different identifier
133133
/// is used that is not persisted across sessions).
134-
final String deviceId;
134+
final String? deviceId;
135135

136136
/// Returns a String that is a group identifier. Two devices have the same
137137
/// group identifier if they belong to the same physical device
138138
/// — for example a monitor with both a built-in camera and a microphone.
139-
final String groupId;
139+
final String? groupId;
140140

141141
/// Returns an enumerated value that is either 'videoinput', 'audioinput' or
142142
/// 'audiooutput'.
143-
final String kind;
143+
final String? kind;
144144

145145
/// Returns a String that is a label describing this device
146146
/// (for example "External USB Webcam").
147-
final String label;
147+
final String? label;
148148
}

‎lib/src/interface/rtc_ice_candidate.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class RTCIceCandidate {
22
RTCIceCandidate(this.candidate, this.sdpMid, this.sdpMlineIndex);
3-
final String candidate;
4-
final String sdpMid;
5-
final int sdpMlineIndex;
3+
final String? candidate;
4+
final String? sdpMid;
5+
final int? sdpMlineIndex;
66
dynamic toMap() {
77
return {
88
'candidate': candidate,

‎lib/src/interface/rtc_peerconnection.dart

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@ abstract class RTCPeerConnection {
3535
RTCPeerConnection();
3636

3737
// public: delegate
38-
SignalingStateCallback onSignalingState;
39-
PeerConnectionStateCallback onConnectionState;
40-
IceGatheringStateCallback onIceGatheringState;
41-
IceConnectionStateCallback onIceConnectionState;
42-
IceCandidateCallback onIceCandidate;
43-
AddStreamCallback onAddStream;
44-
RemoveStreamCallback onRemoveStream;
45-
AddTrackCallback onAddTrack;
46-
RemoveTrackCallback onRemoveTrack;
47-
RTCDataChannelCallback onDataChannel;
48-
RenegotiationNeededCallback onRenegotiationNeeded;
38+
SignalingStateCallback? onSignalingState;
39+
PeerConnectionStateCallback? onConnectionState;
40+
IceGatheringStateCallback? onIceGatheringState;
41+
IceConnectionStateCallback? onIceConnectionState;
42+
IceCandidateCallback? onIceCandidate;
43+
AddStreamCallback? onAddStream;
44+
RemoveStreamCallback? onRemoveStream;
45+
AddTrackCallback? onAddTrack;
46+
RemoveTrackCallback? onRemoveTrack;
47+
RTCDataChannelCallback? onDataChannel;
48+
RenegotiationNeededCallback? onRenegotiationNeeded;
4949

5050
/// Unified-Plan
51-
UnifiedPlanTrackCallback onTrack;
51+
UnifiedPlanTrackCallback? onTrack;
5252

53-
RTC 9096 SignalingState get signalingState;
53+
RTCSignalingState? get signalingState;
5454

55-
RTCIceGatheringState get iceGatheringState;
55+
RTCIceGatheringState? get iceGatheringState;
5656

57-
RTCIceConnectionState get iceConnectionState;
57+
RTCIceConnectionState? get iceConnectionState;
5858

59-
RTCPeerConnectionState get connectionState;
59+
RTCPeerConnectionState? get connectionState;
6060

6161
Future<void> dispose();
6262

0 commit comments

Comments
 (0)
0