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

Changing storageID shouldn't cause rerender

This commit is contained in:
Fedor Indutny 2021-10-28 15:38:37 -07:00 committed by GitHub
parent 09250abb1e
commit 71ee0568c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/background.ts
View File

@ -1056,7 +1056,7 @@ export async function startApp(): Promise<void> {
maxSize: Infinity,
});
convoCollection.on('change', conversation => {
convoCollection.on('props-change', conversation => {
if (!conversation) {
return;
}

17
ts/models/conversations.ts
View File

@ -101,6 +101,7 @@ import { SEALED_SENDER } from '../types/SealedSender';
import { getAvatarData } from '../util/getAvatarData';
import { createIdenticon } from '../util/createIdenticon';
import * as log from '../logging/log';
import * as Errors from '../types/errors';
/* eslint-disable more/no-then */
window.Whisper = window.Whisper || {};
@ -126,6 +127,9 @@ const SEND_REPORTING_THRESHOLD_MS = 25;
const ATTRIBUTES_THAT_DONT_INVALIDATE_PROPS_CACHE = new Set([
'profileLastFetchedAt',
'needsStorageServiceSync',
'storageID',
'storageUnknownFields',
]);
type CachedIdenticon = {
@ -315,6 +319,7 @@ export class ConversationModel extends window.Backbone
this.oldCachedProps = this.cachedProps;
}
this.cachedProps = null;
this.trigger('props-change', this);
}
);
@ -3054,8 +3059,16 @@ export class ConversationModel extends window.Backbone
}
getUuid(): UUID | undefined {
const value = this.get('uuid');
return value && new UUID(value);
try {
const value = this.get('uuid');
return value && new UUID(value);
} catch (err) {
log.warn(
`getUuid(): failed to obtain conversation(${this.id}) uuid due to`,
Errors.toLogFormat(err)
);
return undefined;
}
}
getCheckedUuid(reason: string): UUID {