colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix flashing MR after restoring contact

Browse Source
This commit is contained in:
Fedor Indutny
2023-09-12 18:52:38 +02:00
committed by GitHub
parent be6331d75f
commit d2f1431a66
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ts/models/conversations.ts
View File

@@ -3724,7 +3724,6 @@ export class ConversationModel extends window.Backbone
if (!storyId || isDirectConversation(this.attributes)) { if (!storyId || isDirectConversation(this.attributes)) {
await this.maybeApplyUniversalTimer(); await this.maybeApplyUniversalTimer();
expireTimer = this.get('expireTimer'); expireTimer = this.get('expireTimer');
await this.restoreContact();
} }
const recipientMaybeConversations = map( const recipientMaybeConversations = map(
@@ -3860,6 +3859,12 @@ export class ConversationModel extends window.Backbone
extraReduxActions, extraReduxActions,
}); });
// The call above enables profile sharing so we have to restore contact
// afterwards, otherwise Message Request state will flash.
if (!storyId || isDirectConversation(this.attributes)) {
await this.restoreContact();
}
const renderDuration = Date.now() - renderStart; const renderDuration = Date.now() - renderStart;
if (renderDuration > SEND_REPORTING_THRESHOLD_MS) { if (renderDuration > SEND_REPORTING_THRESHOLD_MS) {