OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2814 from jryans/storage-edge-cases 

Explicitly create `cryptoStore` in React SDK
pull/21833/head
J. Ryan Stinnett 2019-03-22 17:26:45 +00:00 committed by GitHub
parent ed72352636 2ac7dd4ca3
commit 140e0d6a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/createMatrixClient.js
View File

@ -48,10 +48,6 @@ export default function createMatrixClient(opts, useIndexedDb) {
useAuthorizationHeader: true, useAuthorizationHeader: true,
}; };
if (localStorage) {
storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
}
if (indexedDB && localStorage && useIndexedDb) { if (indexedDB && localStorage && useIndexedDb) {
storeOpts.store = new Matrix.IndexedDBStore({ storeOpts.store = new Matrix.IndexedDBStore({
indexedDB: indexedDB, indexedDB: indexedDB,
@ -61,6 +57,16 @@ export default function createMatrixClient(opts, useIndexedDb) {
}); });
} }
if (localStorage) {
storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
}
if (indexedDB && useIndexedDb) {
storeOpts.cryptoStore = new Matrix.IndexedDBCryptoStore(
indexedDB, "matrix-js-sdk:crypto",
);
}
opts = Object.assign(storeOpts, opts); opts = Object.assign(storeOpts, opts);
return Matrix.createClient(opts); return Matrix.createClient(opts);