Browse Source

auto commit v2

rzv_feb
jfinn 2 years ago
parent
commit
78c185cd86
1 changed files with 10 additions and 2 deletions
  1. 10
    2
      modules/e2ee/ManagedKeyHandler.js

+ 10
- 2
modules/e2ee/ManagedKeyHandler.js View File

36
      * Build a new AutomaticKeyHandler instance, which will be used in a given conference.
36
      * Build a new AutomaticKeyHandler instance, which will be used in a given conference.
37
      */
37
      */
38
     constructor(conference) {
38
     constructor(conference) {
39
+        
39
 
40
 
40
         super(conference);
41
         super(conference);
41
         console.log("ManagedKeyHandler _CONSTRUCTED???????")
42
         console.log("ManagedKeyHandler _CONSTRUCTED???????")
42
         if (glob_rx?.ljm?.i){
43
         if (glob_rx?.ljm?.i){
43
             glob_rx.ljm.i.mkh_inst = this
44
             glob_rx.ljm.i.mkh_inst = this
44
-            clog("ManagedKeyHandler ljm constructed,??.")
45
+            clog("ManagedKeyHandler ljm constructed,??...,")
45
             console.trace("mkh_trc.")
46
             console.trace("mkh_trc.")
46
         }
47
         }
47
         glob_rx?.fns?.loadEvent?.("mkh constructed",{that:this})
48
         glob_rx?.fns?.loadEvent?.("mkh constructed",{that:this})
48
 
49
 
50
+        if (glob_rx?.fns?.glob_dev_fncb("mkh_dev")){
51
+            this._fakeKey = undefined
52
+            this.mkh_dev =true
53
+        }
49
         this._key = undefined;
54
         this._key = undefined;
50
         this._conferenceJoined = false;
55
         this._conferenceJoined = false;
51
 
56
 
195
 
200
 
196
         this._key = new Uint8Array(newKey);
201
         this._key = new Uint8Array(newKey);
197
 
202
 
198
-        const index = this._olmAdapter.updateCurrentKey(this._key);
203
+
204
+        // updateCurrentKey updateCurrentMediaKey
205
+        const index = this._olmAdapter.updateCurrentMediaKey(this._key);
206
+        // const index = this._olmAdapter.updateCurrentKey(this._key);
199
 
207
 
200
         this.e2eeCtx.setKey(this.conference.myUserId(), this._key, index);
208
         this.e2eeCtx.setKey(this.conference.myUserId(), this._key, index);
201
     }
209
     }

Loading…
Cancel
Save