mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Conversation: Prevent getProps errors on initial link

Browse source 
Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
This commit is contained in:
Scott Nonnenberg 2021-06-08 14:31:35 -07:00 • committed by GitHub
parent e4a632f601
commit f226822dff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ts/models/conversations.ts
View file

@ -21,6 +21,7 @@ import {
AvatarColors,
ConversationColorType,
CustomColorType,
DEFAULT_CONVERSATION_COLOR,
} from '../types/Colors';
import { MessageModel } from './messages';
import { isMuted } from '../util/isMuted';
@ -1358,23 +1359,26 @@ export class ConversationModel extends window.Backbone
// We don't want to crash or have an infinite loop if we loop back into this function
// again. We'll log a warning and returned old cached props or throw an error.
this.format = () => {
const { stack } = new Error('for stack');
window.log.warn(
`Conversation.format()/${this.idForLogging()} reentrant call! ${stack}`
);
if (!this.oldCachedProps) {
throw new Error(
`Conversation.format()/${this.idForLogging()} reentrant call, no old cached props!`
);
}
const { stack } = new Error('for stack');
window.log.warn(
`Conversation.format()/${this.idForLogging()} reentrant call! ${stack}`
);
return this.oldCachedProps;
};
this.cachedProps = this.getProps();
this.format = oldFormat;
return this.cachedProps;
try {
this.cachedProps = this.getProps();
return this.cachedProps;
} finally {
this.format = oldFormat;
}
}
// Note: this should never be called directly. Use conversation.format() instead, which
@ -4866,7 +4870,8 @@ export class ConversationModel extends window.Backbone
getConversationColor(): ConversationColorType {
const defaultConversationColor = window.storage.get(
'defaultConversationColor'
'defaultConversationColor',
DEFAULT_CONVERSATION_COLOR
);
return this.get('conversationColor') || defaultConversationColor.color;
@ -4877,7 +4882,8 @@ export class ConversationModel extends window.Backbone
customColorId?: string;
} {
const defaultConversationColor = window.storage.get(
'defaultConversationColor'
'defaultConversationColor',
DEFAULT_CONVERSATION_COLOR
);
if (this.getConversationColor() !== 'custom') {