From b94677240bd55910c8b81ff402f2b8c53e536d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Mon, 26 May 2025 12:09:31 +0200
Subject: [PATCH] refactor: Clean up new dart version lints

---
 analysis_options.yaml               | 1 -
 lib/fake_matrix_api.dart            | 1 +
 lib/src/client.dart                 | 2 +-
 lib/src/voip/call_session.dart      | 8 ++++----
 lib/src/voip/utils/conn_tester.dart | 4 ++--
 lib/src/voip/voip.dart              | 2 +-
 test_driver/test_config.dart        | 6 ++++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 55408e80..8378c682 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -26,7 +26,6 @@ linter:
     throw_in_finally: true
     unawaited_futures: true
     unnecessary_statements: true
-    unsafe_html: true
 
     # Readability & Style
     # These are opinionated choices, where Dart gives us 2 ways to express the same thing.
diff --git a/lib/fake_matrix_api.dart b/lib/fake_matrix_api.dart
index 657dc713..f3281824 100644
--- a/lib/fake_matrix_api.dart
+++ b/lib/fake_matrix_api.dart
@@ -84,6 +84,7 @@ class FakeMatrixApi extends BaseClient {
     StreamSubscription<String>? sub;
     sub = currentApi!._apiCallStream.stream.listen((action) {
       if (test(action)) {
+        // ignore: discarded_futures
         sub?.cancel();
         completer.complete(action);
       }
diff --git a/lib/src/client.dart b/lib/src/client.dart
index b1d55bfd..ba92e608 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -2245,7 +2245,7 @@ class Client extends MatrixApi {
         _currentSync ??= _innerSync(timeout: timeout).whenComplete(() {
       _currentSync = null;
       if (_backgroundSync && isLogged() && !_disposed) {
-        _sync();
+        unawaited(_sync());
       }
     });
     return currentSync;
diff --git a/lib/src/voip/call_session.dart b/lib/src/voip/call_session.dart
index a809de1f..45205c6b 100644
--- a/lib/src/voip/call_session.dart
+++ b/lib/src/voip/call_session.dart
@@ -288,7 +288,7 @@ class CallSession {
         Logs().v('[VOIP] Call invite has expired. Hanging up.');
 
         fireCallEvent(CallStateChange.kHangup);
-        hangup(reason: CallErrorCode.inviteTimeout);
+        unawaited(hangup(reason: CallErrorCode.inviteTimeout));
       }
       _ringingTimer?.cancel();
       _ringingTimer = null;
@@ -1117,7 +1117,7 @@ class CallSession {
 
       _inviteTimer = Timer(CallTimeouts.callInviteLifetime, () {
         if (state == CallState.kInviteSent) {
-          hangup(reason: CallErrorCode.inviteTimeout);
+          unawaited(hangup(reason: CallErrorCode.inviteTimeout));
         }
         _inviteTimer?.cancel();
         _inviteTimer = null;
@@ -1173,7 +1173,7 @@ class CallSession {
         final delay = direction == CallDirection.kIncoming ? 500 : 2000;
         if (_candidateSendTries == 0) {
           Timer(Duration(milliseconds: delay), () {
-            _sendCandidateQueue();
+            unawaited(_sendCandidateQueue());
           });
         }
       };
@@ -1424,7 +1424,7 @@ class CallSession {
 
       final delay = 500 * pow(2, _candidateSendTries);
       Timer(Duration(milliseconds: delay as int), () {
-        _sendCandidateQueue();
+        unawaited(_sendCandidateQueue());
       });
     }
   }
diff --git a/lib/src/voip/utils/conn_tester.dart b/lib/src/voip/utils/conn_tester.dart
index b72a5c2d..6e060e04 100644
--- a/lib/src/voip/utils/conn_tester.dart
+++ b/lib/src/voip/utils/conn_tester.dart
@@ -24,12 +24,12 @@ class ConnectionTester {
 
     pc1!.onIceCandidate = (candidate) {
       if (candidate.candidate!.contains('relay')) {
-        pc2!.addCandidate(candidate);
+        unawaited(pc2!.addCandidate(candidate));
       }
     };
     pc2!.onIceCandidate = (candidate) {
       if (candidate.candidate!.contains('relay')) {
-        pc1!.addCandidate(candidate);
+        unawaited(pc1!.addCandidate(candidate));
       }
     };
 
diff --git a/lib/src/voip/voip.dart b/lib/src/voip/voip.dart
index d4d1a747..24c07787 100644
--- a/lib/src/voip/voip.dart
+++ b/lib/src/voip/voip.dart
@@ -783,7 +783,7 @@ class VoIP {
 
     currentCID = VoipId(roomId: roomId, callId: callId);
     await newCall.initOutboundCall(type).then((_) {
-      delegate.handleNewCall(newCall);
+      unawaited(delegate.handleNewCall(newCall));
     });
     return newCall;
   }
diff --git a/test_driver/test_config.dart b/test_driver/test_config.dart
index 8af999e9..21ace727 100644
--- a/test_driver/test_config.dart
+++ b/test_driver/test_config.dart
@@ -30,7 +30,9 @@ class User {
   const User(this.name, this.password);
 }
 
-const homeserver = 'http://${const String.fromEnvironment(
+const _homeserverFromEnv = String.fromEnvironment(
   'HOMESERVER',
   defaultValue: 'localhost',
-)}';
+);
+
+const homeserver = 'http://$_homeserverFromEnv';