matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Consistent values between various account data interfaces

Browse Source
This commit is contained in:
David Baker
2021-07-07 21:18:14 +01:00
parent fd2d106f2a
commit 5fbce3b928
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/crypto/EncryptionSetup.ts
View File

@@ -246,7 +246,7 @@ export class EncryptionSetupOperation {
* implementing the methods related to account data in MatrixClient * implementing the methods related to account data in MatrixClient
*/ */
class AccountDataClientAdapter extends EventEmitter { class AccountDataClientAdapter extends EventEmitter {
public readonly values = new Map<string, object>(); public readonly values = new Map<string, MatrixEvent>();
/** /**
* @param {Object.<String, MatrixEvent>} existingValues existing account data * @param {Object.<String, MatrixEvent>} existingValues existing account data
@@ -259,7 +259,7 @@ class AccountDataClientAdapter extends EventEmitter {
* @param {String} type * @param {String} type
* @return {Promise<Object>} the content of the account data * @return {Promise<Object>} the content of the account data
*/ */
public getAccountDataFromServer(type: string): Promise<object> { public getAccountDataFromServer(type: string): Promise<any> {
return Promise.resolve(this.getAccountData(type)); return Promise.resolve(this.getAccountData(type));
} }
@@ -267,7 +267,7 @@ class AccountDataClientAdapter extends EventEmitter {
* @param {String} type * @param {String} type
* @return {Object} the content of the account data * @return {Object} the content of the account data
*/ */
public getAccountData(type: string): object { public getAccountData(type: string): MatrixEvent {
const modifiedValue = this.values.get(type); const modifiedValue = this.values.get(type);
if (modifiedValue) { if (modifiedValue) {
return modifiedValue; return modifiedValue;
@@ -284,7 +284,7 @@ class AccountDataClientAdapter extends EventEmitter {
* @param {Object} content * @param {Object} content
* @return {Promise} * @return {Promise}
*/ */
public setAccountData(type: string, content: object): Promise<void> { public setAccountData(type: string, content: any): Promise<void> {
const lastEvent = this.values.get(type); const lastEvent = this.values.get(type);
this.values.set(type, content); this.values.set(type, content);
// ensure accountData is emitted on the next tick, // ensure accountData is emitted on the next tick,