1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-04 05:02:41 +03:00
This commit is contained in:
David Baker
2018-09-25 18:14:11 +01:00
parent c556ca40b1
commit 63cc3fd890
3 changed files with 4 additions and 2 deletions

View File

@@ -6,6 +6,7 @@ import expect from 'expect';
const sdk = require("../.."); const sdk = require("../..");
const Olm = global.Olm;
describe("Crypto", function() { describe("Crypto", function() {
if (!sdk.CRYPTO_ENABLED) { if (!sdk.CRYPTO_ENABLED) {

View File

@@ -21,6 +21,8 @@ const MegolmDecryption = algorithms.DECRYPTION_CLASSES['m.megolm.v1.aes-sha2'];
const ROOM_ID = '!ROOM:ID'; const ROOM_ID = '!ROOM:ID';
const Olm = global.Olm;
describe("MegolmDecryption", function() { describe("MegolmDecryption", function() {
if (!global.Olm) { if (!global.Olm) {
console.warn('Not running megolm unit tests: libolm not present'); console.warn('Not running megolm unit tests: libolm not present');

View File

@@ -60,7 +60,7 @@ const LAZY_LOADING_SYNC_FILTER = {
const SCROLLBACK_DELAY_MS = 3000; const SCROLLBACK_DELAY_MS = 3000;
let CRYPTO_ENABLED = isCryptoAvailable(); const CRYPTO_ENABLED = isCryptoAvailable();
/** /**
* Construct a Matrix Client. Only directly construct this if you want to use * Construct a Matrix Client. Only directly construct this if you want to use
@@ -383,7 +383,6 @@ MatrixClient.prototype.initCrypto = async function() {
`End-to-end encryption not supported in this js-sdk build: did ` + `End-to-end encryption not supported in this js-sdk build: did ` +
`you remember to load the olm library?`, `you remember to load the olm library?`,
); );
return;
} }
if (this._crypto) { if (this._crypto) {