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

Fix tests by updating private field names and spies

pull/21833/head
Michael Telatynski 2021-06-17 15:18:52 +01:00
parent 3e38d92fa4
commit 2e73647a85
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Searching.js
View File

@ -468,7 +468,7 @@ function restoreEncryptionInfo(searchResultSlice = []) {
ev.event.curve25519Key, ev.event.curve25519Key,
ev.event.ed25519Key, ev.event.ed25519Key,
); );
ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain; ev.forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
delete ev.event.curve25519Key; delete ev.event.curve25519Key;
delete ev.event.ed25519Key; delete ev.event.ed25519Key;

5
src/utils/DMRoomMap.ts
View File

@ -16,7 +16,6 @@ limitations under the License.
import { uniq } from "lodash"; import { uniq } from "lodash";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { MatrixClient } from "matrix-js-sdk/src/client"; import { MatrixClient } from "matrix-js-sdk/src/client";
import { MatrixClientPeg } from '../MatrixClientPeg'; import { MatrixClientPeg } from '../MatrixClientPeg';
@ -31,15 +30,13 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
export default class DMRoomMap { export default class DMRoomMap {
private static sharedInstance: DMRoomMap; private static sharedInstance: DMRoomMap;
private matrixClient: MatrixClient;
// TODO: convert these to maps // TODO: convert these to maps
private roomToUser: {[key: string]: string} = null; private roomToUser: {[key: string]: string} = null;
private userToRooms: {[key: string]: string[]} = null; private userToRooms: {[key: string]: string[]} = null;
private hasSentOutPatchDirectAccountDataPatch: boolean; private hasSentOutPatchDirectAccountDataPatch: boolean;
private mDirectEvent: object; private mDirectEvent: object;
constructor(matrixClient) { constructor(private readonly matrixClient: MatrixClient) {
this.matrixClient = matrixClient;
// see onAccountData // see onAccountData
this.hasSentOutPatchDirectAccountDataPatch = false; this.hasSentOutPatchDirectAccountDataPatch = false;