Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-09-18 09:27:43 +01:00
parent 54ea85f235
commit e502558f7d
8 changed files with 46 additions and 52 deletions

View file

@ -16,9 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
'use strict';
import Matrix from 'matrix-js-sdk';
import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
import utils from 'matrix-js-sdk/lib/utils';
import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline';
@ -27,7 +25,6 @@ import sdk from './index';
import createMatrixClient from './utils/createMatrixClient';
import SettingsStore from './settings/SettingsStore';
import MatrixActionCreators from './actions/MatrixActionCreators';
import {phasedRollOutExpiredForUser} from "./PhasedRollOut";
import Modal from './Modal';
import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientBackedSettingsHandler";
@ -87,7 +84,7 @@ class MatrixClientPeg {
MatrixActionCreators.stop();
}
/*
/**
* If we've registered a user ID we set this to the ID of the
* user we've just registered. If they then go & log in, we
* can send them to the welcome user (obviously this doesn't
@ -99,7 +96,7 @@ class MatrixClientPeg {
this._justRegisteredUserId = uid;
}
/*
/**
* Returns true if the current user has just been registered by this
* client as determined by setJustRegisteredUserId()
*
@ -112,7 +109,7 @@ class MatrixClientPeg {
);
}
/**
/*
* Replace this MatrixClientPeg's client with a client instance that has
* homeserver / identity server URLs and active credentials
*/
@ -131,7 +128,7 @@ class MatrixClientPeg {
} catch (err) {
if (dbType === 'indexeddb') {
console.error('Error starting matrixclient store - falling back to memory store', err);
this.matrixClient.store = new Matrix.MemoryStore({
this.matrixClient.store = new MemoryStore({
localStorage: global.localStorage,
});
} else {
@ -195,7 +192,7 @@ class MatrixClientPeg {
};
}
/**
/*
* Return the server name of the user's homeserver
* Throws an error if unable to deduce the homeserver name
* (eg. if the user is not logged in)