From a0970b7fcbd86bd50f4e6ed87c8d4f2cb06e922c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 2 Nov 2023 10:31:00 +0100 Subject: [PATCH] chore: don't manually enable default rules --- analysis_options.yaml | 3 --- lib/src/database/hive_collections_database.dart | 8 ++++---- lib/src/room.dart | 4 ++-- lib/src/voip/call.dart | 12 ++++++------ lib/src/voip/group_call.dart | 9 +++++---- lib/src/voip/utils.dart | 4 ++-- test/encryption/key_manager_test.dart | 4 ++-- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index a9d10322..7cc6e101 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -2,9 +2,7 @@ include: package:lints/recommended.yaml linter: rules: - camel_case_types: true avoid_print: true - constant_identifier_names: true prefer_final_locals: true prefer_final_in_for_each: true sort_pub_dependencies: true @@ -14,7 +12,6 @@ linter: sort_child_properties_last: true unawaited_futures: true unsafe_html: true - avoid_function_literals_in_foreach_calls: false non_constant_identifier_names: false # seems to wrongly diagnose static const variables analyzer: diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart index e40262ba..c30d5bc5 100644 --- a/lib/src/database/hive_collections_database.dart +++ b/lib/src/database/hive_collections_database.dart @@ -612,7 +612,7 @@ class HiveCollectionsDatabase extends DatabaseApi { // post-load the heroes final heroes = room.summary.mHeroes; if (heroes != null) { - heroes.forEach((hero) => membersToPostload.add(hero)); + membersToPostload.addAll(heroes); } } // Load members @@ -771,9 +771,9 @@ class HiveCollectionsDatabase extends DatabaseApi { .toList(); final states = await _roomMembersBox.getAll(keys); states.removeWhere((state) => state == null); - states.forEach( - (state) => users.add(Event.fromJson(copyMap(state!), room).asUser), - ); + for (final state in states) { + users.add(Event.fromJson(copyMap(state!), room).asUser); + } return users; } diff --git a/lib/src/room.dart b/lib/src/room.dart index 3c3b2443..1a9e1014 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -2280,7 +2280,7 @@ class Room { } final Map servers = {}; - users.forEach((user) { + for (final user in users) { if (user.id.domain != null) { if (servers.containsKey(user.id.domain!)) { servers[user.id.domain!] = servers[user.id.domain!]! + 1; @@ -2288,7 +2288,7 @@ class Room { servers[user.id.domain!] = 1; } } - }); + } final sortedServers = Map.fromEntries(servers.entries.toList() ..sort((e1, e2) => e1.value.compareTo(e2.value))); for (var i = 0; i <= 2; i++) { diff --git a/lib/src/voip/call.dart b/lib/src/voip/call.dart index e71cc42c..b6e76f54 100644 --- a/lib/src/voip/call.dart +++ b/lib/src/voip/call.dart @@ -698,7 +698,7 @@ class CallSession { Logs().i( 'Stream purpose update: \nid = "$streamId", \npurpose = "${sdpStreamMetadata.purpose}", \naudio_muted = ${sdpStreamMetadata.audio_muted}, \nvideo_muted = ${sdpStreamMetadata.video_muted}'); }); - getRemoteStreams.forEach((wpstream) { + for (final wpstream in getRemoteStreams) { final streamId = wpstream.stream!.id; final purpose = metadata.sdpStreamMetadatas[streamId]; if (purpose != null) { @@ -712,7 +712,7 @@ class CallSession { wpstream.stopped = true; fireCallEvent(CallEvent.kFeedsChanged); } - }); + } } Future onSDPStreamMetadataReceived(SDPStreamMetadata metadata) async { @@ -1516,11 +1516,11 @@ class CallSession { Future tryRemoveStopedStreams() async { final removedStreams = {}; - streams.forEach((stream) { + for (final stream in streams) { if (stream.stopped) { removedStreams[stream.stream!.id] = stream; } - }); + } streams .removeWhere((stream) => removedStreams.containsKey(stream.stream!.id)); for (final element in removedStreams.entries) { @@ -1561,9 +1561,9 @@ class CallSession { try { if (candidatesQueue.isNotEmpty) { final candidates = >[]; - candidatesQueue.forEach((element) { + for (final element in candidatesQueue) { candidates.add(element.toMap()); - }); + } localCandidates = []; final res = await sendCallCandidates( opts.room, callId, localPartyId, candidates); diff --git a/lib/src/voip/group_call.dart b/lib/src/voip/group_call.dart index 272b16a9..b61fbd95 100644 --- a/lib/src/voip/group_call.dart +++ b/lib/src/voip/group_call.dart @@ -150,8 +150,9 @@ class IGroupCallRoomMemberState { List calls = []; IGroupCallRoomMemberState.fromJson(MatrixEvent event) { if (event.content['m.calls'] != null) { - (event.content['m.calls'] as List).forEach( - (call) => calls.add(IGroupCallRoomMemberCallState.fromJson(call))); + for (final call in (event.content['m.calls'] as List)) { + calls.add(IGroupCallRoomMemberCallState.fromJson(call)); + } } } } @@ -276,12 +277,12 @@ class GroupCall { final List events = []; final roomStates = await client.getRoomState(room.id); roomStates.sort((a, b) => a.originServerTs.compareTo(b.originServerTs)); - roomStates.forEach((value) { + for (final value in roomStates) { if (value.type == EventTypes.GroupCallMemberPrefix && !room.callMemberStateIsExpired(value, groupCallId)) { events.add(value); } - }); + } return events; } diff --git a/lib/src/voip/utils.dart b/lib/src/voip/utils.dart index 037da1ec..182843e2 100644 --- a/lib/src/voip/utils.dart +++ b/lib/src/voip/utils.dart @@ -23,9 +23,9 @@ Future stopMediaStream(MediaStream? stream) async { } void setTracksEnabled(List tracks, bool enabled) { - tracks.forEach((element) { + for (final element in tracks) { element.enabled = enabled; - }); + } } Future hasAudioDevice() async { diff --git a/test/encryption/key_manager_test.dart b/test/encryption/key_manager_test.dart index dbdf12c1..7110bc75 100644 --- a/test/encryption/key_manager_test.dart +++ b/test/encryption/key_manager_test.dart @@ -123,9 +123,9 @@ void main() { 0); // rotate after too many messages - Iterable.generate(300).forEach((_) { + for (final _ in Iterable.generate(300)) { sess.outboundGroupSession!.encrypt('some string'); - }); + } await client.encryption!.keyManager .clearOrUseOutboundGroupSession(roomId); expect(