mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-24 12:04:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #844 from vector-im/bug/openTimeline-race

Browse Source 
Fix undetectable race condition in open timeline
This commit is contained in:
Robert Long 2022-08-14 10:39:01 -07:00 committed by GitHub
commit 4dd42ce164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/matrix/room/BaseRoom.js
View File

@ -47,6 +47,7 @@ export class BaseRoom extends EventEmitter {
this._fragmentIdComparer = new FragmentIdComparer([]); this._fragmentIdComparer = new FragmentIdComparer([]);
this._emitCollectionChange = emitCollectionChange; this._emitCollectionChange = emitCollectionChange;
this._timeline = null; this._timeline = null;
this._openTimelinePromise = null;
this._user = user; this._user = user;
this._changedMembersDuringSync = null; this._changedMembersDuringSync = null;
this._memberList = null; this._memberList = null;
@ -542,7 +543,8 @@ export class BaseRoom extends EventEmitter {
/** @public */ /** @public */
openTimeline(log = null) { openTimeline(log = null) {
return this._platform.logger.wrapOrRun(log, "open timeline", async log => { if (this._openTimelinePromise) return this._openTimelinePromise;
this._openTimelinePromise = this._platform.logger.wrapOrRun(log, "open timeline", async log => {
log.set("id", this.id); log.set("id", this.id);
if (this._timeline) { if (this._timeline) {
throw new Error("not dealing with load race here for now"); throw new Error("not dealing with load race here for now");
@ -554,6 +556,7 @@ export class BaseRoom extends EventEmitter {
pendingEvents: this._getPendingEvents(), pendingEvents: this._getPendingEvents(),
closeCallback: () => { closeCallback: () => {
this._timeline = null; this._timeline = null;
this._openTimelinePromise = null;
if (this._roomEncryption) { if (this._roomEncryption) {
this._roomEncryption.notifyTimelineClosed(); this._roomEncryption.notifyTimelineClosed();
} }
@ -575,6 +578,7 @@ export class BaseRoom extends EventEmitter {
} }
return this._timeline; return this._timeline;
}); });
return this._openTimelinePromise;
} }
/* allow subclasses to provide an observable list with pending events when opening the timeline */ /* allow subclasses to provide an observable list with pending events when opening the timeline */