remove archivedRoom map, it's unused and just complicating for now

This commit is contained in:
Bruno Windels 2021-05-11 16:09:01 +02:00
parent 82a1b37363
commit 965700272b

View file

@ -56,7 +56,6 @@ export class Session {
this._sessionInfo = sessionInfo; this._sessionInfo = sessionInfo;
this._rooms = new ObservableMap(); this._rooms = new ObservableMap();
this._roomUpdateCallback = (room, params) => this._rooms.update(room.id, params); this._roomUpdateCallback = (room, params) => this._rooms.update(room.id, params);
this._archivedRooms = null;
this._invites = new ObservableMap(); this._invites = new ObservableMap();
this._inviteUpdateCallback = (invite, params) => this._invites.update(invite.id, params); this._inviteUpdateCallback = (invite, params) => this._invites.update(invite.id, params);
this._user = new User(sessionInfo.userId); this._user = new User(sessionInfo.userId);
@ -511,15 +510,6 @@ export class Session {
applyRoomCollectionChangesAfterSync(inviteStates, roomStates, archivedRoomStates) { applyRoomCollectionChangesAfterSync(inviteStates, roomStates, archivedRoomStates) {
// update the collections after sync // update the collections after sync
if (this._archivedRooms) {
for (const ars of archivedRoomStates) {
if (ars.shouldAdd) {
this._archivedRooms.add(ars.id, ars.archivedRoom);
} else if (ars.shouldRemove) {
this._archivedRooms.remove(ars.id);
}
}
}
for (const rs of roomStates) { for (const rs of roomStates) {
if (rs.shouldAdd) { if (rs.shouldAdd) {
this._rooms.add(rs.id, rs.room); this._rooms.add(rs.id, rs.room);
@ -651,13 +641,6 @@ export class Session {
return RoomStatus.joined; return RoomStatus.joined;
} else { } else {
const isInvited = !!this._invites.get(roomId); const isInvited = !!this._invites.get(roomId);
let isArchived;
if (this._archivedRooms) {
isArchived = !!this._archivedRooms.get(roomId);
} else {
const txn = await this._storage.readTxn([this._storage.storeNames.archivedRoomSummary]);
isArchived = await txn.archivedRoomSummary.has(roomId);
}
if (isInvited && isArchived) { if (isInvited && isArchived) {
return RoomStatus.invitedAndArchived; return RoomStatus.invitedAndArchived;
} else if (isInvited) { } else if (isInvited) {