Skip to content

Commit

Permalink
Remove unused option for disabling IndexedDB
Browse files Browse the repository at this point in the history
`createMatrixClient` and surrounding paths support an argument to disable
IndexedDB, but it is never actually used. This removes the option to simplify
the code.
  • Loading branch information
jryans committed Mar 25, 2019
1 parent 7b972e4 commit 716970e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/MatrixClientPeg.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class MatrixClientPeg {
return matches[1];
}

_createClient(creds: MatrixClientCreds, useIndexedDb) {
_createClient(creds: MatrixClientCreds) {
const opts = {
baseUrl: creds.homeserverUrl,
idBaseUrl: creds.identityServerUrl,
Expand All @@ -183,7 +183,7 @@ class MatrixClientPeg {
verificationMethods: [verificationMethods.SAS]
};

this.matrixClient = createMatrixClient(opts, useIndexedDb);
this.matrixClient = createMatrixClient(opts);

// we're going to add eventlisteners for each matrix event tile, so the
// potential number of event listeners is quite high.
Expand Down
11 changes: 3 additions & 8 deletions src/utils/createMatrixClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,18 @@ try {
* @param {Object} opts options to pass to Matrix.createClient. This will be
* extended with `sessionStore` and `store` members.
*
* @param {bool} useIndexedDb True to attempt to use indexeddb, or false to force
* use of the memory store. Default: true.
*
* @property {string} indexedDbWorkerScript Optional URL for a web worker script
* for IndexedDB store operations. By default, indexeddb ops are done on
* the main thread.
*
* @returns {MatrixClient} the newly-created MatrixClient
*/
export default function createMatrixClient(opts, useIndexedDb) {
if (useIndexedDb === undefined) useIndexedDb = true;

export default function createMatrixClient(opts) {
const storeOpts = {
useAuthorizationHeader: true,
};

if (indexedDB && localStorage && useIndexedDb) {
if (indexedDB && localStorage) {
storeOpts.store = new Matrix.IndexedDBStore({
indexedDB: indexedDB,
dbName: "riot-web-sync",
Expand All @@ -61,7 +56,7 @@ export default function createMatrixClient(opts, useIndexedDb) {
storeOpts.sessionStore = new Matrix.WebStorageSessionStore(localStorage);
}

if (indexedDB && useIndexedDb) {
if (indexedDB) {
storeOpts.cryptoStore = new Matrix.IndexedDBCryptoStore(
indexedDB, "matrix-js-sdk:crypto",
);
Expand Down

0 comments on commit 716970e

Please sign in to comment.