refactor: Avoid redundant async

analysis_options.yaml

@@ -23,3 +23,4 @@ analyzer:
 dart_code_linter:
   rules:
     - avoid-dynamic
+    - avoid-redundant-async

integration_test/app_test.dart

@@ -17,38 +17,26 @@ import 'users.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  group(
+  group('Integration Test', () {
-    'Integration Test',
+    setUpAll(() {
-    () {
-      setUpAll(
-        () async {
       // this random dialog popping up is super hard to cover in tests
       SharedPreferences.setMockInitialValues({
         'chat.fluffy.show_no_google': false,
       });
-        },
+    });
-      );
 
-      testWidgets(
+    testWidgets('Start app, login and logout', (WidgetTester tester) async {
-        'Start app, login and logout',
-        (WidgetTester tester) async {
       app.main();
       await tester.ensureAppStartedHomescreen();
       await tester.ensureLoggedOut();
-        },
+    });
-      );
 
-      testWidgets(
+    testWidgets('Login again', (WidgetTester tester) async {
-        'Login again',
-        (WidgetTester tester) async {
       app.main();
       await tester.ensureAppStartedHomescreen();
-        },
+    });
-      );
 
-      testWidgets(
+    testWidgets('Start chat and send message', (WidgetTester tester) async {
-        'Start chat and send message',
-        (WidgetTester tester) async {
       app.main();
       await tester.ensureAppStartedHomescreen();
       await tester.waitFor(find.byType(TextField));
@@ -109,8 +97,7 @@ void main() {
       await tester.pumpAndSettle();
       await tester.waitFor(find.text('Test'));
       await tester.pumpAndSettle();
-        },
+    });
-      );
 
     testWidgets('Spaces', (tester) async {
       app.main();
@@ -182,6 +169,5 @@ void main() {
 
       expect(find.text(Users.user2.name), findsOneWidget);
     });
-    },
+  });
-  );
 }

lib/pages/bootstrap/bootstrap_dialog.dart

@@ -90,7 +90,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
     context.canPop() ? context.pop(success) : context.go('/rooms');
   }
 
-  void _decryptLastEvents() async {
+  void _decryptLastEvents() {
     for (final room in client.rooms) {
       final event = room.lastEvent;
       if (event != null &&

lib/pages/chat/chat.dart

@@ -257,7 +257,7 @@ class ChatController extends State<ChatPageWithRoom>
     }
   }
 
-  void _loadDraft() async {
+  void _loadDraft() {
     final prefs = Matrix.of(context).store;
     final draft = prefs.getString('draft_$roomId');
     if (draft != null && draft.isNotEmpty) {

lib/pages/chat/events/poll.dart

@@ -27,11 +27,7 @@ class PollWidget extends StatelessWidget {
   void _endPoll(BuildContext context) =>
       showFutureLoadingDialog(context: context, future: () => event.endPoll());
 
-  void _toggleVote(
+  void _toggleVote(BuildContext context, String answerId, int maxSelection) {
-    BuildContext context,
-    String answerId,
-    int maxSelection,
-  ) async {
     final userId = event.room.client.userID!;
     final answerIds = event.getPollResponses(timeline)[userId] ?? {};
     if (!answerIds.remove(answerId)) {

lib/pages/chat_list/chat_list.dart

@@ -372,7 +372,7 @@ class ChatListController extends State<ChatList>
     scrollController.addListener(_onScroll);
     _waitForFirstSync();
     _hackyWebRTCFixForWeb();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       if (mounted) {
         searchServer = Matrix.of(
           context,

lib/pages/dialer/dialer.dart

@@ -189,7 +189,7 @@ class MyCallingPage extends State<Calling> {
     _playCallSound();
   }
 
-  void initialize() async {
+  void initialize() {
     final call = this.call;
     call.onCallStateChanged.stream.listen(_handleCallState);
     call.onCallEventChanged.stream.listen((event) {
@@ -282,7 +282,7 @@ class MyCallingPage extends State<Calling> {
     });
   }
 
-  void _screenSharing() async {
+  void _screenSharing() {
     if (PlatformInfos.isAndroid) {
       if (!call.screensharingEnabled) {
         FlutterForegroundTask.init(

lib/pages/invitation_selection/invitation_selection.dart

@@ -66,7 +66,7 @@ class InvitationSelectionController extends State<InvitationSelection> {
     }
   }
 
-  void searchUserWithCoolDown(String text) async {
+  void searchUserWithCoolDown(String text) {
     coolDown?.cancel();
     coolDown = Timer(
       const Duration(milliseconds: 500),

lib/pages/login/login.dart

@@ -94,7 +94,7 @@ class LoginController extends State<Login> {
 
   Timer? _coolDown;
 
-  void checkWellKnownWithCoolDown(String userId) async {
+  void checkWellKnownWithCoolDown(String userId) {
     _coolDown?.cancel();
     _coolDown = Timer(
       const Duration(seconds: 1),

lib/pages/settings_style/settings_style.dart

@@ -19,7 +19,7 @@ class SettingsStyle extends StatefulWidget {
 }
 
 class SettingsStyleController extends State<SettingsStyle> {
-  void setChatColor(Color? color) async {
+  void setChatColor(Color? color) {
     AppSettings.colorSchemeSeedInt.setItem(
       color?.toARGB32() ?? AppSettings.colorSchemeSeedInt.defaultValue,
     );

lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/sqlcipher_stub.dart

@@ -1 +1,2 @@
-Future<void> applyWorkaroundToOpenSqlCipherOnOldAndroidVersions() async {}
+Future<void> applyWorkaroundToOpenSqlCipherOnOldAndroidVersions() =>
+    Future.value();

lib/widgets/qr_code_viewer.dart

@@ -27,7 +27,7 @@ class QrCodeViewer extends StatelessWidget {
   void _save(BuildContext context) async {
     final imageResult = await showFutureLoadingDialog(
       context: context,
-      future: () async {
+      future: () {
         final inviteLink = 'https://matrix.to/#/$content';
         final image = QRImage(inviteLink, size: 256, radius: 1).generate();
         return compute(encodePng, image);

test/archive_test.dart

@@ -6,5 +6,6 @@ void main() {
       testWidget: Archive(),
       testClient: await testClient(loggedIn: true),
     ));*/
+    return;
   });
 }

test/homeserver_picker_test.dart

@@ -13,5 +13,6 @@ void main() {
         testWidget: HomeserverPicker(),
       ),
     );*/
+    return;
   });
 }

test/widget_test.dart

@@ -16,5 +16,6 @@ void main() {
     /* await tester.pumpWidget(FluffyChatApp(
       client: await prepareTestClient(),
     ));*/
+    return;
   });
 }