JC Brand 6 年之前
父節點
當前提交
f123f483ae
共有 4 個文件被更改,包括 5 次插入4 次删除
  1. 1 0
      CHANGES.md
  2. 2 2
      dist/converse.js
  3. 1 1
      src/converse-omemo.js
  4. 1 1
      src/headless/converse-core.js

+ 1 - 0
CHANGES.md

@@ -4,6 +4,7 @@
 
 
 - Bugfix. Prevent duplicate messages by comparing MAM archive id to XEP-0359 stanza ids.
 - Bugfix. Prevent duplicate messages by comparing MAM archive id to XEP-0359 stanza ids.
 - Bugfix. Open groupchats not shown when logging in after disconnection.
 - Bugfix. Open groupchats not shown when logging in after disconnection.
+- #1406: `TypeError: e.devicelists is undefined` when unchecking the "trusted device" checkbox
 
 
 ## 4.1.1 (2019-02-18)
 ## 4.1.1 (2019-02-18)
 
 

+ 2 - 2
dist/converse.js

@@ -55844,7 +55844,7 @@ function parseBundle(bundle_el) {
 
 
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-omemo', {
 _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-omemo', {
   enabled(_converse) {
   enabled(_converse) {
-    return !_.isNil(window.libsignal) && !f.includes('converse-omemo', _converse.blacklisted_plugins);
+    return !_.isNil(window.libsignal) && !f.includes('converse-omemo', _converse.blacklisted_plugins) && _converse.config.get('trusted');
   },
   },
 
 
   dependencies: ["converse-chatview", "converse-pubsub"],
   dependencies: ["converse-chatview", "converse-pubsub"],
@@ -62991,8 +62991,8 @@ function setUpXMLLogging() {
 }
 }
 
 
 function finishInitialization() {
 function finishInitialization() {
-  initPlugins();
   initClientConfig();
   initClientConfig();
+  initPlugins();
 
 
   _converse.initConnection();
   _converse.initConnection();
 
 

+ 1 - 1
src/converse-omemo.js

@@ -67,7 +67,7 @@ function parseBundle (bundle_el) {
 converse.plugins.add('converse-omemo', {
 converse.plugins.add('converse-omemo', {
 
 
     enabled (_converse) {
     enabled (_converse) {
-        return !_.isNil(window.libsignal) && !f.includes('converse-omemo', _converse.blacklisted_plugins);
+        return !_.isNil(window.libsignal) && !f.includes('converse-omemo', _converse.blacklisted_plugins) && _converse.config.get('trusted');
     },
     },
 
 
     dependencies: ["converse-chatview", "converse-pubsub"],
     dependencies: ["converse-chatview", "converse-pubsub"],

+ 1 - 1
src/headless/converse-core.js

@@ -416,8 +416,8 @@ function setUpXMLLogging () {
 
 
 
 
 function finishInitialization () {
 function finishInitialization () {
-    initPlugins();
     initClientConfig();
     initClientConfig();
+    initPlugins();
     _converse.initConnection();
     _converse.initConnection();
     setUpXMLLogging();
     setUpXMLLogging();
     _converse.logIn();
     _converse.logIn();