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

Fixes rebase/lint

Browse source
This commit is contained in:
Josh Perez 2020-11-23 15:00:40 -05:00
parent 6fe4365d3c
commit c54df8be87
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/models/conversations.ts
View file

@ -278,21 +278,16 @@ export class ConversationModel extends window.Backbone.Model<
const groupVersion = this.get('groupVersion') || 0; const groupVersion = this.get('groupVersion') || 0;
<<<<<<< HEAD
return (
groupVersion === 2 &&
base64ToArrayBuffer(groupId).byteLength === window.Signal.Groups.ID_LENGTH
);
=======
try { try {
return ( return (
groupVersion === 2 && base64ToArrayBuffer(groupId).byteLength === 32 groupVersion === 2 &&
base64ToArrayBuffer(groupId).byteLength ===
window.Signal.Groups.ID_LENGTH
); );
} catch (error) { } catch (error) {
window.log.error('isGroupV2: Failed to process groupId in base64!'); window.log.error('isGroupV2: Failed to process groupId in base64!');
return false; return false;
} }
>>>>>>> Support for GV1 -> GV2 migration
} }
isMemberPending(conversationId: string): boolean { isMemberPending(conversationId: string): boolean {