fix(e2ee): destroys olm session on disabling e2ee

modules/e2ee/Context.js

@@ -250,8 +250,6 @@ export class Context {
 
             encodedFrame.data = newData;
         } catch (error) {
-            console.error(error);
-
             if (ratchetCount < RATCHET_WINDOW_SIZE) {
                 material = await importKey(await ratchet(material));
 
@@ -266,16 +264,6 @@ export class Context {
             }
 
             // TODO: notify the application about error status.
-
-            // TODO: For video we need a better strategy since we do not want to based any
-            // non-error frames on a garbage keyframe.
-            if (encodedFrame.type === undefined) { // audio, replace with silence.
-                const newData = new ArrayBuffer(3);
-                const newUint8 = new Uint8Array(newData);
-
-                newUint8.set([ 0xd8, 0xff, 0xfe ]); // opus silence frame.
-                encodedFrame.data = newData;
-            }
         }
 
         return encodedFrame;

modules/e2ee/E2EEncryption.js

@@ -31,7 +31,6 @@ export class E2EEncryption {
 
         this._conferenceJoined = false;
         this._enabled = false;
-        this._initialized = false;
         this._key = undefined;
         this._enabling = undefined;
 
@@ -130,19 +129,16 @@ export class E2EEncryption {
 
         if (enabled) {
             await this._olmAdapter.initSessions();
+        } else {
+            for (const participant of this.conference.getParticipants()) {
+                this._e2eeCtx.cleanup(participant.getId());
+            }
+            this._olmAdapter.clearAllParticipantsSessions();
         }
 
         this.conference.setLocalParticipantProperty('e2ee.enabled', enabled);
 
-        if (!this._initialized && enabled) {
-            // Need to re-create the peerconnections in order to apply the insertable streams constraint.
-            // TODO: this was necessary due to some audio issues when indertable streams are used
-            // even though encryption is not performed. This should be fixed in the browser eventually.
-            // https://bugs.chromium.org/p/chromium/issues/detail?id=1103280
-            this.conference._restartMediaSessions();
-
-            this._initialized = true;
-        }
+        this.conference._restartMediaSessions();
 
         // Generate a random key in case we are enabling.
         this._key = enabled ? this._generateKey() : false;

modules/e2ee/OlmAdapter.js

@@ -82,7 +82,7 @@ export class OlmAdapter extends Listenable {
      */
     async initSessions() {
         if (this._sessionInitialization) {
-            throw new Error('OlmAdapte initSessions called multiple times');
+            throw new Error('OlmAdapter initSessions called multiple times');
         } else {
             this._sessionInitialization = new Deferred();
 
@@ -198,6 +198,17 @@ export class OlmAdapter extends Listenable {
         }
     }
 
+
+    /**
+     * Frees the olmData sessions for all participants.
+     *
+     */
+    clearAllParticipantsSessions() {
+        for (const participant of this._conf.getParticipants()) {
+            this.clearParticipantSession(participant);
+        }
+    }
+
     /**
      * Internal helper to bootstrap the olm library.
      *