fix(e2ee) Clean up session state when it is disabled

Author: jallamsetty1

modules/e2ee/ManagedKeyHandler.js

@@ -84,21 +84,17 @@ export class ManagedKeyHandler extends KeyHandler {
         if (enabled) {
             // Initialize Olm sessions with all participants.
             await this._olmAdapter.initSessions();
-
             logger.debug('All Olm sessions established, proceeding with key distribution');
-        } else {
-            this._olmAdapter.clearAllParticipantsSessions();
         }
-
-        // Generate a random key in case we are enabling.
         this._key = enabled ? this._generateKey() : false;
-
-        // Send it to others using the E2EE olm channel.
-        // At this point, all sessions should be ready.
         const index = await this._olmAdapter.updateKey(this._key);
 
-        // Set our key so we begin encrypting.
         this.e2eeCtx.setKey(this.conference.myUserId(), this._key, index);
+
+        // Clear sessions after key distribution when disabling.
+        if (!enabled) {
+            this._olmAdapter.clearAllParticipantsSessions();
+        }
     }
 
     /**

modules/e2ee/OlmAdapter.js

@@ -240,7 +240,7 @@ export class OlmAdapter extends Listenable {
     }
 
     /**
-     * Frees the olmData session for the given participant.
+     * Frees the olmData session for the given participant and clears all session-related state.
      *
      */
     clearParticipantSession(participant) {
@@ -250,6 +250,16 @@ export class OlmAdapter extends Listenable {
             olmData.session.free();
             olmData.session = undefined;
         }
+
+        // Clear all session-related state to allow clean re-initialization
+        olmData.pendingSessionUuid = undefined;
+        olmData.lastKey = undefined;
+
+        // Clean up SAS verification if active
+        if (olmData.sasVerification?.sas) {
+            olmData.sasVerification.sas.free();
+        }
+        olmData.sasVerification = undefined;
     }
 
     /**
@@ -260,6 +270,8 @@ export class OlmAdapter extends Listenable {
         for (const participant of this._conf.getParticipants()) {
             this.clearParticipantSession(participant);
         }
+        this._reqs.clear();
+        this._sessionInitialization = undefined;
     }
 
     /**