From d4f9387e0c2843caaab23e29cf30a270118f7440 Mon Sep 17 00:00:00 2001 From: Caleb Jasik Date: Thu, 13 Feb 2025 11:23:20 -0600 Subject: [PATCH] `dart fix --apply --code=avoid_function_literals_in_foreach_calls` --- lib/models/Site.dart | 20 +++++++++---------- lib/models/StaticHosts.dart | 4 ++-- lib/screens/HostInfoScreen.dart | 8 ++++---- lib/screens/MainScreen.dart | 4 ++-- lib/screens/SiteDetailScreen.dart | 4 ++-- lib/screens/siteConfig/CAListScreen.dart | 10 +++++----- lib/screens/siteConfig/SiteConfigScreen.dart | 4 ++-- .../siteConfig/StaticHostmapScreen.dart | 4 ++-- .../siteConfig/UnsafeRoutesScreen.dart | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/models/Site.dart b/lib/models/Site.dart index 20d8d98..0f81ed6 100644 --- a/lib/models/Site.dart +++ b/lib/models/Site.dart @@ -169,15 +169,15 @@ class Site { List rawUnsafeRoutes = json['unsafeRoutes']; List unsafeRoutes = []; - rawUnsafeRoutes.forEach((val) { + for (var val in rawUnsafeRoutes) { unsafeRoutes.add(UnsafeRoute.fromJson(val)); - }); + } List rawCA = json['ca']; List ca = []; - rawCA.forEach((val) { + for (var val in rawCA) { ca.add(CertificateInfo.fromJson(val)); - }); + } CertificateInfo? certInfo; if (json['cert'] != null) { @@ -186,9 +186,9 @@ class Site { List rawErrors = json["errors"]; List errors = []; - rawErrors.forEach((error) { + for (var error in rawErrors) { errors.add(error); - }); + } return { "name": json["name"], @@ -295,9 +295,9 @@ class Site { List f = jsonDecode(ret); List hosts = []; - f.forEach((v) { + for (var v in f) { hosts.add(HostInfo.fromJson(v)); - }); + } return hosts; } on PlatformException catch (err) { @@ -317,9 +317,9 @@ class Site { List f = jsonDecode(ret); List hosts = []; - f.forEach((v) { + for (var v in f) { hosts.add(HostInfo.fromJson(v)); - }); + } return hosts; } on PlatformException catch (err) { diff --git a/lib/models/StaticHosts.dart b/lib/models/StaticHosts.dart index 8c853fa..489ee9a 100644 --- a/lib/models/StaticHosts.dart +++ b/lib/models/StaticHosts.dart @@ -10,9 +10,9 @@ class StaticHost { var list = json['destinations'] as List; var result = []; - list.forEach((item) { + for (var item in list) { result.add(IPAndPort.fromString(item)); - }); + } return StaticHost(lighthouse: json['lighthouse'], destinations: result); } diff --git a/lib/screens/HostInfoScreen.dart b/lib/screens/HostInfoScreen.dart index 5d394e8..3408b23 100644 --- a/lib/screens/HostInfoScreen.dart +++ b/lib/screens/HostInfoScreen.dart @@ -124,7 +124,7 @@ class _HostInfoScreenState extends State { final double ipWidth = Utils.textSize("000.000.000.000:000000", CupertinoTheme.of(context).textTheme.textStyle).width; - hostInfo.remoteAddresses.forEach((remoteObj) { + for (var remoteObj in hostInfo.remoteAddresses) { String remote = remoteObj.toString(); items.add( ConfigCheckboxItem( @@ -148,7 +148,7 @@ class _HostInfoScreenState extends State { }, ), ); - }); + } return ConfigSection(label: items.isNotEmpty ? 'Tap to change the active address' : null, children: items); } @@ -159,7 +159,7 @@ class _HostInfoScreenState extends State { final double ipWidth = Utils.textSize("000.000.000.000:000000", CupertinoTheme.of(context).textTheme.textStyle).width; - hostInfo.remoteAddresses.forEach((remoteObj) { + for (var remoteObj in hostInfo.remoteAddresses) { String remote = remoteObj.toString(); items.add( ConfigCheckboxItem( @@ -169,7 +169,7 @@ class _HostInfoScreenState extends State { checked: currentRemote == remote, ), ); - }); + } return ConfigSection(label: items.isNotEmpty ? 'REMOTES' : null, children: items); } diff --git a/lib/screens/MainScreen.dart b/lib/screens/MainScreen.dart index f39f4b7..bfd82d0 100644 --- a/lib/screens/MainScreen.dart +++ b/lib/screens/MainScreen.dart @@ -207,7 +207,7 @@ class _MainScreenState extends State { } List items = []; - sites!.forEach((site) { + for (var site in sites!) { items.add( SiteItem( key: Key(site.id), @@ -223,7 +223,7 @@ class _MainScreenState extends State { }, ), ); - }); + } Widget child = ReorderableListView( shrinkWrap: true, diff --git a/lib/screens/SiteDetailScreen.dart b/lib/screens/SiteDetailScreen.dart index 58bf3d9..601b485 100644 --- a/lib/screens/SiteDetailScreen.dart +++ b/lib/screens/SiteDetailScreen.dart @@ -117,14 +117,14 @@ class _SiteDetailScreenState extends State { } List items = []; - site.errors.forEach((error) { + for (var error in site.errors) { items.add( ConfigItem( labelWidth: 0, content: Padding(padding: EdgeInsets.symmetric(vertical: 10), child: SelectableText(error)), ), ); - }); + } return ConfigSection( label: 'ERRORS', diff --git a/lib/screens/siteConfig/CAListScreen.dart b/lib/screens/siteConfig/CAListScreen.dart index 22d4fb4..b37de67 100644 --- a/lib/screens/siteConfig/CAListScreen.dart +++ b/lib/screens/siteConfig/CAListScreen.dart @@ -39,9 +39,9 @@ class _CAListScreenState extends State { @override void initState() { - widget.cas.forEach((ca) { + for (var ca in widget.cas) { cas[ca.cert.fingerprint] = ca; - }); + } super.initState(); } @@ -115,14 +115,14 @@ class _CAListScreenState extends State { var ignored = 0; List certs = jsonDecode(rawCerts); - certs.forEach((rawCert) { + for (var rawCert in certs) { final info = CertificateInfo.fromJson(rawCert); if (!info.cert.details.isCa) { ignored++; - return; + continue; } cas[info.cert.fingerprint] = info; - }); + } if (ignored > 0) { error = 'One or more certificates were ignored because they were not certificate authorities.'; diff --git a/lib/screens/siteConfig/SiteConfigScreen.dart b/lib/screens/siteConfig/SiteConfigScreen.dart index dcb6d57..0a406cc 100644 --- a/lib/screens/siteConfig/SiteConfigScreen.dart +++ b/lib/screens/siteConfig/SiteConfigScreen.dart @@ -163,11 +163,11 @@ class _SiteConfigScreenState extends State { if (!site.managed) { caError = site.ca.isEmpty; if (!caError) { - site.ca.forEach((ca) { + for (var ca in site.ca) { if (ca.validity == null || !ca.validity!.valid) { caError = true; } - }); + } } } diff --git a/lib/screens/siteConfig/StaticHostmapScreen.dart b/lib/screens/siteConfig/StaticHostmapScreen.dart index 83f122b..c8c1bff 100644 --- a/lib/screens/siteConfig/StaticHostmapScreen.dart +++ b/lib/screens/siteConfig/StaticHostmapScreen.dart @@ -50,9 +50,9 @@ class _StaticHostmapScreenState extends State { _nebulaIp = widget.nebulaIp; _lighthouse = widget.lighthouse; _destinations = {}; - widget.destinations.forEach((dest) { + for (var dest in widget.destinations) { _destinations[UniqueKey()] = _IPAndPort(focusNode: FocusNode(), destination: dest); - }); + } if (_destinations.isEmpty) { _addDestination(); diff --git a/lib/screens/siteConfig/UnsafeRoutesScreen.dart b/lib/screens/siteConfig/UnsafeRoutesScreen.dart index 47f8727..1621ec6 100644 --- a/lib/screens/siteConfig/UnsafeRoutesScreen.dart +++ b/lib/screens/siteConfig/UnsafeRoutesScreen.dart @@ -24,9 +24,9 @@ class _UnsafeRoutesScreenState extends State { @override void initState() { unsafeRoutes = {}; - widget.unsafeRoutes.forEach((route) { + for (var route in widget.unsafeRoutes) { unsafeRoutes[UniqueKey()] = route; - }); + } super.initState(); }