Commit f123f483 authored by JC Brand's avatar JC Brand

Fixes #1406

parent ce2ae87d
...@@ -4,6 +4,7 @@ ...@@ -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)
......
...@@ -55844,7 +55844,7 @@ function parseBundle(bundle_el) { ...@@ -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() { ...@@ -62991,8 +62991,8 @@ function setUpXMLLogging() {
} }
function finishInitialization() { function finishInitialization() {
initPlugins();
initClientConfig(); initClientConfig();
initPlugins();
_converse.initConnection(); _converse.initConnection();
...@@ -67,7 +67,7 @@ function parseBundle (bundle_el) { ...@@ -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"],
......
...@@ -416,8 +416,8 @@ function setUpXMLLogging () { ...@@ -416,8 +416,8 @@ function setUpXMLLogging () {
function finishInitialization () { function finishInitialization () {
initPlugins();
initClientConfig(); initClientConfig();
initPlugins();
_converse.initConnection(); _converse.initConnection();
setUpXMLLogging(); setUpXMLLogging();
_converse.logIn(); _converse.logIn();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment