refactor: extract listening for key verification requests

Author: matthiasn

integration_test/matrix_service_test.dart

@@ -107,7 +107,7 @@ void main() {
         );
 
         await aliceDevice.login();
-        await aliceDevice.listen();
+        await aliceDevice.startKeyVerificationListener();
         debugPrint('AliceDevice - deviceId: ${aliceDevice.client.deviceID}');
 
         final roomId = await aliceDevice.createRoom();
@@ -126,7 +126,7 @@ void main() {
         );
 
         await bobDevice.login();
-        await bobDevice.listen();
+        await bobDevice.startKeyVerificationListener();
         debugPrint('BobDevice - deviceId: ${bobDevice.client.deviceID}');
 
         final joinRes2 = await bobDevice.joinRoom(roomId);

lib/sync/matrix/key_verification_runner.dart

@@ -1,6 +1,9 @@
 import 'dart:async';
 
 import 'package:flutter/foundation.dart';
+import 'package:lotti/database/logging_db.dart';
+import 'package:lotti/get_it.dart';
+import 'package:lotti/sync/matrix/matrix_service.dart';
 import 'package:matrix/encryption/utils/key_verification.dart';
 import 'package:matrix/matrix.dart';
 
@@ -73,3 +76,32 @@ class KeyVerificationRunner {
     stopTimer();
   }
 }
+
+Future<void> listenForKeyVerificationRequests({
+  required MatrixService service,
+}) async {
+  final loggingDb = getIt<LoggingDb>();
+
+  try {
+    service.client.onKeyVerificationRequest.stream.listen((
+      KeyVerification keyVerification,
+    ) {
+      service.incomingKeyVerificationRunner = KeyVerificationRunner(
+        keyVerification,
+        controller: service.incomingKeyVerificationRunnerController,
+        name: 'Incoming KeyVerificationRunner',
+      );
+
+      debugPrint('Key Verification Request from ${keyVerification.deviceId}');
+      service.incomingKeyVerificationController.add(keyVerification);
+    });
+  } catch (e, stackTrace) {
+    debugPrint('$e');
+    loggingDb.captureException(
+      e,
+      domain: 'MATRIX_SERVICE',
+      subDomain: 'listen',
+      stackTrace: stackTrace,
+    );
+  }
+}

lib/sync/matrix/matrix_service.dart

@@ -29,14 +29,14 @@ class MatrixService {
   }) : _keyVerificationController =
             StreamController<KeyVerificationRunner>.broadcast() {
     _client = createMatrixClient(hiveDbName: hiveDbName);
-    _incomingKeyVerificationRunnerController =
+    incomingKeyVerificationRunnerController =
         StreamController<KeyVerificationRunner>.broadcast(
       onListen: publishIncomingRunnerState,
     );
 
     keyVerificationStream = _keyVerificationController.stream;
     incomingKeyVerificationRunnerStream =
-        _incomingKeyVerificationRunnerController.stream;
+        incomingKeyVerificationRunnerController.stream;
   }
 
   void publishIncomingRunnerState() {
@@ -60,11 +60,11 @@ class MatrixService {
   KeyVerificationRunner? incomingKeyVerificationRunner;
   final StreamController<KeyVerificationRunner> _keyVerificationController;
   late final StreamController<KeyVerificationRunner>
-      _incomingKeyVerificationRunnerController;
+      incomingKeyVerificationRunnerController;
   late final Stream<KeyVerificationRunner> keyVerificationStream;
   late final Stream<KeyVerificationRunner> incomingKeyVerificationRunnerStream;
 
-  final _incomingKeyVerificationController =
+  final incomingKeyVerificationController =
       StreamController<KeyVerification>.broadcast();
 
   Future<void> loginAndListen() async {
@@ -173,11 +173,6 @@ class MatrixService {
     return roomId;
   }
 
-  Room? getRoom(String roomId) {
-    final room = _client.getRoomById(roomId);
-    return room;
-  }
-
   List<DeviceKeys> getUnverified() {
     final unverified = _client.unverifiedDevices;
     return unverified;
@@ -199,37 +194,22 @@ class MatrixService {
     }
   }
 
-  String? get deviceId {
-    return _client.deviceID;
-  }
-
-  String? get deviceName {
-    return _client.deviceName;
-  }
+  String? get deviceId => _client.deviceID;
+  String? get deviceName => _client.deviceName;
 
   Stream<KeyVerification> getIncomingKeyVerificationStream() {
-    return _incomingKeyVerificationController.stream;
+    return incomingKeyVerificationController.stream;
   }
 
+  Future<void> startKeyVerificationListener() async =>
+      listenForKeyVerificationRequests(service: this);
+
   Future<void> listen() async {
     try {
       _client.onLoginStateChanged.stream.listen((LoginState loginState) {
         debugPrint('LoginState: $loginState');
       });
 
-      _client.onKeyVerificationRequest.stream.listen((
-        KeyVerification keyVerification,
-      ) {
-        incomingKeyVerificationRunner = KeyVerificationRunner(
-          keyVerification,
-          controller: _incomingKeyVerificationRunnerController,
-          name: 'Incoming KeyVerificationRunner',
-        );
-
-        debugPrint('Key Verification Request from ${keyVerification.deviceId}');
-        _incomingKeyVerificationController.add(keyVerification);
-      });
-
       if (syncRoomId == null) {
         _loggingDb.captureEvent(
           configNotFound,