浏览代码

auto commit v2

rzv_feb
jfinn 2 年前
父节点
当前提交
7092529f74
共有 1 个文件被更改,包括 21 次插入2 次删除
  1. 21
    2
      modules/e2ee/OlmAdapter.js

+ 21
- 2
modules/e2ee/OlmAdapter.js 查看文件

78
         clog("ljm_dbg OlmAdapter constructor")
78
         clog("ljm_dbg OlmAdapter constructor")
79
         super();
79
         super();
80
 
80
 
81
+        if (glob_rx?.fns?.glob_dev_fncb("mkh_dev")){
82
+            this.mkh_dev =true
83
+        }
84
+
81
         this._conf = conference;
85
         this._conf = conference;
82
         this._init = new Deferred();
86
         this._init = new Deferred();
83
         this._mediaKey = undefined;
87
         this._mediaKey = undefined;
152
      * @param {Uint8Array|boolean} key - The new key.
156
      * @param {Uint8Array|boolean} key - The new key.
153
      * @retrns {Promise<Number>}
157
      * @retrns {Promise<Number>}
154
      */
158
      */
155
-    async updateKey(key) {
159
+    async updateKey(_key) {
160
+        var key 
161
+        if (this.mkh_dev){
162
+            key = glob_u.tvar.e2ee.key2
163
+        } else {
164
+            key = _key
165
+        }
156
         // Store it locally for new sessions.
166
         // Store it locally for new sessions.
157
         this._mediaKey = key;
167
         this._mediaKey = key;
158
         this._mediaKeyIndex++;
168
         this._mediaKeyIndex++;
207
      * @param {Uint8Array|boolean} key - The new key.
217
      * @param {Uint8Array|boolean} key - The new key.
208
      * @returns {number}
218
      * @returns {number}
209
     */
219
     */
210
-    updateCurrentMediaKey(key) {
220
+    updateCurrentMediaKey(_key) {
221
+
222
+        var key 
223
+        if (this.mkh_dev){
224
+            key = glob_u.tvar.e2ee.key2
225
+        } else {
226
+            key = _key
227
+        }
228
+
229
+
211
         this._mediaKey = key;
230
         this._mediaKey = key;
212
 
231
 
213
         return this._mediaKeyIndex;
232
         return this._mediaKeyIndex;

正在加载...
取消
保存