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

getUUID: Return undefined if uuid is falsey

This commit is contained in:
Scott Nonnenberg 2022-06-27 17:37:56 -07:00 committed by GitHub
parent e0f479ca81
commit 101d53c4ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/models/conversations.ts
View File

@ -3497,7 +3497,7 @@ export class ConversationModel extends window.Backbone
getUuid(): UUID | undefined {
try {
const value = this.get('uuid');
return value && new UUID(value);
return value ? new UUID(value) : undefined;
} catch (err) {
log.warn(
`getUuid(): failed to obtain conversation(${this.id}) uuid due to`,

2
ts/textsecure/storage/User.ts
View File

@ -71,7 +71,7 @@ export class User {
`Unsupported uuid kind: ${uuidKind}`
);
const uuid = this.storage.get('uuid_id');
if (uuid === undefined) return undefined;
if (!uuid) return undefined;
return new UUID(Helpers.unencodeNumber(uuid.toLowerCase())[0]);
}