fix: dont run the MLSStateHandler without MLS enabled

src/script/conversation/ConversationRepository.ts

@@ -68,6 +68,7 @@ import {
 } from 'Util/StringUtil';
 import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 import {isBackendError} from 'Util/TypePredicateUtil';
+import {supportsMLS} from 'Util/util';
 import {createUuid} from 'Util/uuid';
 
 import {ACCESS_STATE} from './AccessState';
@@ -272,12 +273,15 @@ export class ConversationRepository {
       this.userState,
       this.conversationState,
     );
-    // we register a handler that will handle MLS conversations on its own
-    registerMLSConversationVerificationStateHandler(
-      this.onConversationVerificationStateChange,
-      this.conversationState,
-      this.core,
-    );
+
+    if (supportsMLS()) {
+      // we register a handler that will handle MLS conversations on its own
+      registerMLSConversationVerificationStateHandler(
+        this.onConversationVerificationStateChange,
+        this.conversationState,
+        this.core,
+      );
+    }
 
     this.isBlockingNotificationHandling = true;
     this.conversationsWithNewEvents = new Map();

src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.test.ts

@@ -21,32 +21,25 @@ import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConv
 
 import {Conversation} from 'src/script/entity/Conversation';
 import {Core} from 'src/script/service/CoreSingleton';
-import {getLogger, Logger} from 'Util/Logger';
 import {createUuid} from 'Util/uuid';
 
-import {MLSConversationVerificationStateHandler} from './MLSStateHandler';
+import {
+  MLSConversationVerificationStateHandler,
+  registerMLSConversationVerificationStateHandler,
+} from './MLSStateHandler';
 
 import {ConversationState} from '../../ConversationState';
 
-jest.mock('Util/Logger', () => ({
-  getLogger: jest.fn().mockReturnValue({
-    error: jest.fn(),
-    log: jest.fn(),
-  }),
-}));
-
 describe('MLSConversationVerificationStateHandler', () => {
   const uuid = createUuid();
   let handler: MLSConversationVerificationStateHandler;
   let mockOnConversationVerificationStateChange: jest.Mock;
   let mockConversationState: jest.Mocked<ConversationState>;
   let mockCore: jest.Mocked<Core>;
-  let logger: jest.Mocked<Logger>;
   const conversation: Conversation = new Conversation(uuid, '', ConversationProtocol.MLS);
   const groupId = 'groupIdXYZ';
 
   beforeEach(() => {
-    jest.clearAllMocks();
     conversation.groupId = groupId;
 
     mockOnConversationVerificationStateChange = jest.fn();
@@ -67,37 +60,38 @@ describe('MLSConversationVerificationStateHandler', () => {
       mockConversationState,
       mockCore,
     );
-    logger = getLogger('MLSConversationVerificationStateHandler') as jest.Mocked<Logger>;
+
+    jest.clearAllMocks();
   });
 
-  it('should log an error if MLS service is not available', () => {
+  it('should do nothing if MLS service is not available', () => {
     mockCore.service.mls = undefined;
 
-    new MLSConversationVerificationStateHandler(
-      mockOnConversationVerificationStateChange,
-      mockConversationState,
-      mockCore,
-    );
+    const t = () =>
+      registerMLSConversationVerificationStateHandler(
+        mockOnConversationVerificationStateChange,
+        mockConversationState,
+        mockCore,
+      );
 
-    // Assert
-    expect(logger.error).toHaveBeenCalledWith('MLS service not available');
+    expect(t).not.toThrow();
   });
 
-  it('should log an error if e2eIdentity service is not available', () => {
+  it('should do nothing if e2eIdentity service is not available', () => {
     mockCore.service.e2eIdentity = undefined;
 
-    new MLSConversationVerificationStateHandler(
+    registerMLSConversationVerificationStateHandler(
       mockOnConversationVerificationStateChange,
       mockConversationState,
       mockCore,
     );
 
     // Assert
-    expect(logger.error).toHaveBeenCalledWith('E2E identity service not available');
+    expect(mockCore.service?.mls?.on).not.toHaveBeenCalled();
   });
 
   it('should hook into the newEpoch event of the MLS service', () => {
-    new MLSConversationVerificationStateHandler(
+    registerMLSConversationVerificationStateHandler(
       mockOnConversationVerificationStateChange,
       mockConversationState,
       mockCore,

src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts

@@ -43,16 +43,11 @@ export class MLSConversationVerificationStateHandler {
     private readonly core = container.resolve(Core),
   ) {
     this.logger = getLogger('MLSConversationVerificationStateHandler');
-    // We need to check if the core service is available
-    if (!this.core.service?.mls) {
-      this.logger.error('MLS service not available');
-      return;
-    }
-    // We need to check if the e2eIdentity service is available
-    if (!this.core.service?.e2eIdentity) {
-      this.logger.error('E2E identity service not available');
+    // We need to check if the core service is available and if the e2eIdentity is available
+    if (!this.core.service?.mls || !this.core.service?.e2eIdentity) {
       return;
     }
+
     // We hook into the newEpoch event of the MLS service to check if the conversation needs to be verified or degraded
     this.core.service.mls.on('newEpoch', this.checkEpoch);
   }