diff --git a/_locales/en/messages.json b/_locales/en/messages.json index ddb556e02..72d1fce70 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1735,11 +1735,19 @@ "androidKey": "conversation__menu_leave_group", "ignoreCase": true }, + "leaveAndRemoveForEveryone": { + "message": "Leave Group and remove for everyone", + "description": "Button action confirmation that the user can click to leave the group as an admin" + }, "leaveGroupConfirmation": { "message": "Are you sure you want to leave this group?", "description": "Confirmation dialog text that tells the user what will happen if they leave the group.", "androidKey": "activity_home_leave_group_dialog_message" }, + "leaveGroupConfirmationAdmin": { + "message": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?", + "description": "Confirmation dialog text that tells the user what will happen if they leave the group as admin." + }, "noContactsForGroup": { "message": "You don't have any contacts yet", "androidKey": "activity_create_closed_group_empty_state_message" diff --git a/background.html b/background.html index 9aaef3a3a..e0fee4351 100644 --- a/background.html +++ b/background.html @@ -167,6 +167,8 @@ + + diff --git a/background_test.html b/background_test.html index aed481621..64654052f 100644 --- a/background_test.html +++ b/background_test.html @@ -171,6 +171,8 @@ + + diff --git a/js/background.js b/js/background.js index e0891043b..409f81787 100644 --- a/js/background.js +++ b/js/background.js @@ -1172,7 +1172,6 @@ 'sent', window.DataMessageReceiver.handleMessageEvent ); - messageReceiver.addEventListener('empty', onEmpty); messageReceiver.addEventListener('reconnect', onReconnect); messageReceiver.addEventListener('configuration', onConfiguration); // messageReceiver.addEventListener('typing', onTyping); @@ -1250,15 +1249,6 @@ window.readyForUpdates(); - // let interval = setInterval(() => { - // const view = window.owsDesktopApp.appView; - // if (view) { - // clearInterval(interval); - // interval = null; - // view.onEmpty(); - // } - // }, 500); - Whisper.Notifications.enable(); } function onReconnect() { diff --git a/js/models/conversations.js b/js/models/conversations.js index 2e59b7503..15744dbd7 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -523,6 +523,9 @@ onUnblockContact: () => this.unblock(), onCopyPublicKey: () => this.copyPublicKey(), onDeleteContact: () => this.deleteContact(), + onLeaveGroup: () => { + window.Whisper.events.trigger('leaveGroup', this); + }, onDeleteMessages: () => this.deleteMessages(), onInviteContacts: () => { window.Whisper.events.trigger('inviteContacts', this); diff --git a/js/modules/signal.js b/js/modules/signal.js index f8c947a16..37077fe55 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -69,6 +69,9 @@ const { const { InviteContactsDialog, } = require('../../ts/components/conversation/InviteContactsDialog'); +const { + AdminLeaveClosedGroupDialog, +} = require('../../ts/components/conversation/AdminLeaveClosedGroupDialog'); const { AddModeratorsDialog, @@ -237,6 +240,7 @@ exports.setup = (options = {}) => { UpdateGroupNameDialog, UpdateGroupMembersDialog, InviteContactsDialog, + AdminLeaveClosedGroupDialog, AddModeratorsDialog, RemoveModeratorsDialog, GroupInvitation, diff --git a/js/views/admin_leave_closed_group_dialog_view.js b/js/views/admin_leave_closed_group_dialog_view.js new file mode 100644 index 000000000..00f9a14e5 --- /dev/null +++ b/js/views/admin_leave_closed_group_dialog_view.js @@ -0,0 +1,43 @@ +/* global Whisper */ + +// eslint-disable-next-line func-names +(function() { + 'use strict'; + + window.Whisper = window.Whisper || {}; + + Whisper.AdminLeaveClosedGroupDialog = Whisper.View.extend({ + className: 'loki-dialog modal', + initialize(convo) { + this.close = this.close.bind(this); + this.submit = this.submit.bind(this); + this.theme = convo.theme; + this.groupName = convo.get('name'); + this.convo = convo; + + this.$el.focus(); + this.render(); + }, + render() { + const view = new Whisper.ReactWrapperView({ + className: 'admin-leave-closed-group', + Component: window.Signal.Components.AdminLeaveClosedGroupDialog, + props: { + onSubmit: this.submit, + onClose: this.close, + groupName: this.groupName, + theme: this.theme, + }, + }); + + this.$el.append(view.el); + return this; + }, + close() { + this.remove(); + }, + submit() { + this.convo.leaveGroup(); + }, + }); +})(); diff --git a/js/views/app_view.js b/js/views/app_view.js index b092c3f13..11c143b02 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -90,18 +90,6 @@ this.closeStandalone(); }, openInbox(options = {}) { - // The inbox can be created before the 'empty' event fires or afterwards. If - // before, it's straightforward: the onEmpty() handler below updates the - // view directly, and we're in good shape. If we create the inbox late, we - // need to be sure that the current value of initialLoadComplete is provided - // so its loading screen doesn't stick around forever. - - // Two primary techniques at play for this situation: - // - background.js has X number of openInbox() calls, - // and passes initalLoadComplete directly via the options parameter. - // - in other situations openInbox() will be called with no options. So this - // view keeps track of whether onEmpty() has ever been called with - // this.initialLoadComplete. An example of this: on a phone-pairing setup. _.defaults(options, { initialLoadComplete: this.initialLoadComplete }); if (!this.inboxView) { @@ -125,7 +113,6 @@ window.focus(); // FIXME return Promise.resolve(); }, - onEmpty() {}, showEditProfileDialog(options) { // eslint-disable-next-line no-param-reassign options.theme = this.getThemeObject(); @@ -211,14 +198,23 @@ const title = i18n('leaveGroup'); const message = i18n('leaveGroupConfirmation'); - - window.confirmationDialog({ - title, - message, - resolve: () => - window.getConversationController().deleteContact(groupConvo.id), - theme: this.getThemeObject(), - }); + const ourPK = window.textsecure.storage.user.getNumber(); + const isAdmin = (groupConvo.get('groupAdmins') || []).includes(ourPK); + const isClosedGroup = groupConvo.get('is_medium_group') || false; + + // if this is not a closed group, or we are not admin, we can just show a confirmation dialog + if (!isClosedGroup || (isClosedGroup && !isAdmin)) { + window.confirmationDialog({ + title, + message, + resolve: () => + window.getConversationController().deleteContact(groupConvo.id), + theme: this.getThemeObject(), + }); + } else { + // we are the admin on a closed group. We have to warn the user about the group Deletion + this.showAdminLeaveClosedGroupDialog(groupConvo); + } }, showInviteContactsDialog(groupConvo) { // eslint-disable-next-line no-param-reassign @@ -226,6 +222,13 @@ const dialog = new Whisper.InviteContactsDialogView(groupConvo); this.el.append(dialog.el); }, + + showAdminLeaveClosedGroupDialog(groupConvo) { + // eslint-disable-next-line no-param-reassign + groupConvo.theme = this.getThemeObject(); + const dialog = new Whisper.AdminLeaveClosedGroupDialog(groupConvo); + this.el.append(dialog.el); + }, showAddModeratorsDialog(groupConvo) { // eslint-disable-next-line no-param-reassign groupConvo.theme = this.getThemeObject(); diff --git a/test/index.html b/test/index.html index 4955474b1..aa90e2af5 100644 --- a/test/index.html +++ b/test/index.html @@ -209,6 +209,8 @@ + + diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index dd35688a1..e78862d8e 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -64,6 +64,7 @@ type PropsHousekeeping = { onClick?: (id: string) => void; onDeleteMessages?: () => void; onDeleteContact?: () => void; + onLeaveGroup?: () => void; onBlockContact?: () => void; onCopyPublicKey?: () => void; onUnblockContact?: () => void; diff --git a/ts/components/conversation/AdminLeaveClosedGroupDialog.tsx b/ts/components/conversation/AdminLeaveClosedGroupDialog.tsx new file mode 100644 index 000000000..f47a49005 --- /dev/null +++ b/ts/components/conversation/AdminLeaveClosedGroupDialog.tsx @@ -0,0 +1,58 @@ +import React from 'react'; + +import { SessionModal } from '../session/SessionModal'; +import { SessionButton, SessionButtonColor } from '../session/SessionButton'; +import { DefaultTheme } from 'styled-components'; + +interface Props { + groupName: string; + onSubmit: any; + onClose: any; + theme: DefaultTheme; +} + +class AdminLeaveClosedGroupDialogInner extends React.Component { + constructor(props: any) { + super(props); + + this.closeDialog = this.closeDialog.bind(this); + this.onClickOK = this.onClickOK.bind(this); + } + + public render() { + const titleText = `${window.i18n('leaveGroup')} ${this.props.groupName}`; + const warningAsAdmin = `${window.i18n('leaveGroupConfirmationAdmin')}`; + const okText = window.i18n('leaveAndRemoveForEveryone'); + + return ( + null} + onClose={this.closeDialog} + theme={this.props.theme} + > +
+

{warningAsAdmin}

+ +
+ +
+ + ); + } + + private onClickOK() { + this.props.onSubmit(); + this.closeDialog(); + } + + private closeDialog() { + this.props.onClose(); + } +} + +export const AdminLeaveClosedGroupDialog = AdminLeaveClosedGroupDialogInner; diff --git a/ts/components/session/SessionIDResetDialog.tsx b/ts/components/session/SessionIDResetDialog.tsx index daf72d1bf..ba34c0df3 100644 --- a/ts/components/session/SessionIDResetDialog.tsx +++ b/ts/components/session/SessionIDResetDialog.tsx @@ -1,14 +1,9 @@ -import React, { useState } from 'react'; +import React from 'react'; import { SessionModal } from './SessionModal'; import { SessionButton, SessionButtonColor } from './SessionButton'; import { DefaultTheme, withTheme } from 'styled-components'; -import { - SessionIcon, - SessionIconButton, - SessionIconSize, - SessionIconType, -} from './icon'; +import { SessionIcon, SessionIconSize, SessionIconType } from './icon'; type Props = { onClose: any; diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx index 0166d6324..5c5659f92 100644 --- a/ts/components/session/conversation/SessionRightPanel.tsx +++ b/ts/components/session/conversation/SessionRightPanel.tsx @@ -309,10 +309,6 @@ class SessionRightPanel extends React.Component { {window.i18n('groupMembers')}
)} - {/*
- {window.i18n('notifications')} -
- */} {hasDisappearingMessages && ( { diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx index 87bbca8d8..bcf2c620a 100644 --- a/ts/components/session/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx @@ -24,6 +24,7 @@ export type PropsContextConversationItem = { onDeleteMessages?: () => void; onDeleteContact?: () => void; + onLeaveGroup?: () => void; onBlockContact?: () => void; onCopyPublicKey?: () => void; onUnblockContact?: () => void; @@ -51,6 +52,7 @@ export const ConversationListItemContextMenu = ( onCopyPublicKey, onUnblockContact, onInviteContacts, + onLeaveGroup, } = props; return ( @@ -104,7 +106,7 @@ export const ConversationListItemContextMenu = ( type === 'group', isPublic, isRss, - onDeleteContact, + onLeaveGroup, window.i18n )} diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 7acdcac72..61b850a67 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -85,8 +85,7 @@ async function decryptForClosedGroupV2( keyIndex++; } catch (e) { window.log.info( - `Failed to decrypt closed group v2 with key index ${keyIndex}`, - e + `Failed to decrypt closed group v2 with key index ${keyIndex}. We have ${encryptionKeyPairs.length} keys to try left.` ); } } while (encryptionKeyPairs.length > 0); diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index cd2d408bc..390819048 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -486,7 +486,7 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel { messageGroupId && messageGroupId.length > 0 ? messageGroupId : null; if (groupId) { - groupId = groupId.replace(PubKey.PREFIX_GROUP_TEXTSECURE, ''); + groupId = PubKey.removeTextSecurePrefixIfNeeded(groupId); } const messageData: any = { @@ -658,10 +658,8 @@ export async function handleMessageEvent(event: MessageEvent): Promise { // - group.id if it is a group message if (isGroupMessage) { // remove the prefix from the source object so this is correct for all other - message.group.id = message.group.id.replace( - PubKey.PREFIX_GROUP_TEXTSECURE, - '' - ); + message.group.id = PubKey.removeTextSecurePrefixIfNeeded(message.group.id); + conversationId = message.group.id; } diff --git a/ts/session/messages/outgoing/content/ContentMessage.ts b/ts/session/messages/outgoing/content/ContentMessage.ts index d7cbf4677..4c7be2134 100644 --- a/ts/session/messages/outgoing/content/ContentMessage.ts +++ b/ts/session/messages/outgoing/content/ContentMessage.ts @@ -8,5 +8,5 @@ export abstract class ContentMessage extends Message { } public abstract ttl(): number; - protected abstract contentProto(): SignalService.Content; + public abstract contentProto(): SignalService.Content; } diff --git a/ts/session/messages/outgoing/content/EndSessionMessage.ts b/ts/session/messages/outgoing/content/EndSessionMessage.ts index 79461b775..9ce4091fd 100644 --- a/ts/session/messages/outgoing/content/EndSessionMessage.ts +++ b/ts/session/messages/outgoing/content/EndSessionMessage.ts @@ -7,7 +7,7 @@ export class EndSessionMessage extends SessionRequestMessage { return Constants.TTL_DEFAULT.END_SESSION_MESSAGE; } - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { const dataMessage = new SignalService.DataMessage({ body: 'TERMINATE', flags: SignalService.DataMessage.Flags.END_SESSION, diff --git a/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts b/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts index 35a4bfacb..66d97e040 100644 --- a/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts +++ b/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts @@ -22,7 +22,7 @@ export class SessionEstablishedMessage extends ContentMessage { return Constants.TTL_DEFAULT.SESSION_ESTABLISHED; } - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { const nullMessage = new SignalService.NullMessage({}); nullMessage.padding = this.padding; diff --git a/ts/session/messages/outgoing/content/SessionRequestMessage.ts b/ts/session/messages/outgoing/content/SessionRequestMessage.ts index 575fd323d..53c63b325 100644 --- a/ts/session/messages/outgoing/content/SessionRequestMessage.ts +++ b/ts/session/messages/outgoing/content/SessionRequestMessage.ts @@ -39,11 +39,7 @@ export class SessionRequestMessage extends ContentMessage { return Constants.TTL_DEFAULT.SESSION_REQUEST; } - protected getPreKeyBundleMessage(): SignalService.PreKeyBundleMessage { - return new SignalService.PreKeyBundleMessage(this.preKeyBundle); - } - - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { const nullMessage = new SignalService.NullMessage({}); const preKeyBundleMessage = this.getPreKeyBundleMessage(); nullMessage.padding = this.padding; @@ -52,4 +48,8 @@ export class SessionRequestMessage extends ContentMessage { preKeyBundleMessage, }); } + + protected getPreKeyBundleMessage(): SignalService.PreKeyBundleMessage { + return new SignalService.PreKeyBundleMessage(this.preKeyBundle); + } } diff --git a/ts/session/messages/outgoing/content/TypingMessage.ts b/ts/session/messages/outgoing/content/TypingMessage.ts index 37e91dc77..8ed4cce34 100644 --- a/ts/session/messages/outgoing/content/TypingMessage.ts +++ b/ts/session/messages/outgoing/content/TypingMessage.ts @@ -29,7 +29,7 @@ export class TypingMessage extends ContentMessage { return Constants.TTL_DEFAULT.TYPING_MESSAGE; } - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { return new SignalService.Content({ typingMessage: this.typingProto(), }); diff --git a/ts/session/messages/outgoing/content/data/DataMessage.ts b/ts/session/messages/outgoing/content/data/DataMessage.ts index e65f35763..9dc418540 100644 --- a/ts/session/messages/outgoing/content/data/DataMessage.ts +++ b/ts/session/messages/outgoing/content/data/DataMessage.ts @@ -4,7 +4,7 @@ import { SignalService } from '../../../../../protobuf'; export abstract class DataMessage extends ContentMessage { public abstract dataProto(): SignalService.DataMessage; - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { return new SignalService.Content({ dataMessage: this.dataProto(), }); diff --git a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts index 88eb245f4..998d07382 100644 --- a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts +++ b/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts @@ -35,12 +35,13 @@ export class ExpirationTimerUpdateMessage extends DataMessage { data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE; + // FIXME we shouldn't need this once android recieving refactor is done. + // the envelope stores the groupId for a closed group v2 already. if (this.groupId) { const groupMessage = new SignalService.GroupContext(); - let groupIdWithPrefix: string = this.groupId.key; - if (!this.groupId.key.startsWith(PubKey.PREFIX_GROUP_TEXTSECURE)) { - groupIdWithPrefix = PubKey.PREFIX_GROUP_TEXTSECURE + this.groupId.key; - } + const groupIdWithPrefix = PubKey.addTextSecurePrefixIfNeeded( + this.groupId.key + ); const encoded = StringUtils.encode(groupIdWithPrefix, 'utf8'); const id = new Uint8Array(encoded); groupMessage.id = id; diff --git a/ts/session/messages/outgoing/content/data/groupv2/ClosedGroupV2ChatMessage.ts b/ts/session/messages/outgoing/content/data/groupv2/ClosedGroupV2ChatMessage.ts index 5e7e655e3..a9f67e627 100644 --- a/ts/session/messages/outgoing/content/data/groupv2/ClosedGroupV2ChatMessage.ts +++ b/ts/session/messages/outgoing/content/data/groupv2/ClosedGroupV2ChatMessage.ts @@ -3,6 +3,7 @@ import { ChatMessage } from '../ChatMessage'; import { ClosedGroupV2Message } from './ClosedGroupV2Message'; import { PubKey } from '../../../../../types'; import { Constants } from '../../../../..'; +import { StringUtils } from '../../../../../utils'; interface ClosedGroupV2ChatMessageParams { identifier?: string; @@ -28,8 +29,21 @@ export class ClosedGroupV2ChatMessage extends ClosedGroupV2Message { } public dataProto(): SignalService.DataMessage { - const messageProto = this.chatMessage.dataProto(); + const dataProto = this.chatMessage.dataProto(); - return messageProto; + if (this.groupId) { + const groupMessage = new SignalService.GroupContext(); + const groupIdWithPrefix = PubKey.addTextSecurePrefixIfNeeded( + this.groupId.key + ); + const encoded = StringUtils.encode(groupIdWithPrefix, 'utf8'); + const id = new Uint8Array(encoded); + groupMessage.id = id; + groupMessage.type = SignalService.GroupContext.Type.DELIVER; + + dataProto.group = groupMessage; + } + + return dataProto; } } diff --git a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts index 86454c786..39b2b2737 100644 --- a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts +++ b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts @@ -34,6 +34,13 @@ export class DeviceLinkRequestMessage extends ContentMessage { return Constants.TTL_DEFAULT.PAIRING_REQUEST; } + public contentProto(): SignalService.Content { + return new SignalService.Content({ + pairingAuthorisation: this.getPairingAuthorisationMessage(), + dataMessage: this.getDataMessage(), + }); + } + protected getDataMessage(): SignalService.DataMessage | undefined { return undefined; } @@ -46,11 +53,4 @@ export class DeviceLinkRequestMessage extends ContentMessage { grantSignature: null, }); } - - protected contentProto(): SignalService.Content { - return new SignalService.Content({ - pairingAuthorisation: this.getPairingAuthorisationMessage(), - dataMessage: this.getDataMessage(), - }); - } } diff --git a/ts/session/messages/outgoing/content/receipt/ReceiptMessage.ts b/ts/session/messages/outgoing/content/receipt/ReceiptMessage.ts index 615989bcb..ddd82fa8e 100644 --- a/ts/session/messages/outgoing/content/receipt/ReceiptMessage.ts +++ b/ts/session/messages/outgoing/content/receipt/ReceiptMessage.ts @@ -20,7 +20,7 @@ export abstract class ReceiptMessage extends ContentMessage { public abstract getReceiptType(): SignalService.ReceiptMessage.Type; - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { return new SignalService.Content({ receiptMessage: this.receiptProto(), }); diff --git a/ts/session/messages/outgoing/content/sync/RequestSyncMessage.ts b/ts/session/messages/outgoing/content/sync/RequestSyncMessage.ts index 85d40de0c..716e26562 100644 --- a/ts/session/messages/outgoing/content/sync/RequestSyncMessage.ts +++ b/ts/session/messages/outgoing/content/sync/RequestSyncMessage.ts @@ -19,7 +19,7 @@ export abstract class RequestSyncMessage extends SyncMessage { return Constants.TTL_DEFAULT.REGULAR_MESSAGE; } - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { return new SignalService.Content({ syncMessage: this.syncProto(), }); diff --git a/ts/session/messages/outgoing/content/sync/SyncMessage.ts b/ts/session/messages/outgoing/content/sync/SyncMessage.ts index 063bf55d7..4eb5b9176 100644 --- a/ts/session/messages/outgoing/content/sync/SyncMessage.ts +++ b/ts/session/messages/outgoing/content/sync/SyncMessage.ts @@ -8,7 +8,7 @@ export abstract class SyncMessage extends ContentMessage { return Constants.TTL_DEFAULT.REGULAR_MESSAGE; } - protected contentProto(): SignalService.Content { + public contentProto(): SignalService.Content { return new SignalService.Content({ syncMessage: this.syncProto(), }); diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index d075c6e22..c8ea1c4f4 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -70,11 +70,49 @@ export class PubKey { return this.regex.test(pubkeyString); } - public static remove05PrefixIfNeeded(recipient: string): string { - if (recipient.length === 66 && recipient.startsWith('05')) { - return recipient.substr(2); + /** + * This removes the 05 prefix from a Pubkey which have it and have a length of 66 + * @param keyWithOrWithoutPrefix the key with or without the prefix + */ + public static remove05PrefixIfNeeded(keyWithOrWithoutPrefix: string): string { + if ( + keyWithOrWithoutPrefix.length === 66 && + keyWithOrWithoutPrefix.startsWith('05') + ) { + return keyWithOrWithoutPrefix.substr(2); } - return recipient; + return keyWithOrWithoutPrefix; + } + + /** + * This adds the `__textsecure_group__!` prefix to a pubkey if this pubkey does not already have it + * @param keyWithOrWithoutPrefix the key to use as base + */ + public static addTextSecurePrefixIfNeeded( + keyWithOrWithoutPrefix: string | PubKey + ): string { + const key = + keyWithOrWithoutPrefix instanceof PubKey + ? keyWithOrWithoutPrefix.key + : keyWithOrWithoutPrefix; + if (!key.startsWith(PubKey.PREFIX_GROUP_TEXTSECURE)) { + return PubKey.PREFIX_GROUP_TEXTSECURE + key; + } + return key; + } + + /** + * This removes the `__textsecure_group__!` prefix from a pubkey if this pubkey have one + * @param keyWithOrWithoutPrefix the key to use as base + */ + public static removeTextSecurePrefixIfNeeded( + keyWithOrWithoutPrefix: string | PubKey + ): string { + const key = + keyWithOrWithoutPrefix instanceof PubKey + ? keyWithOrWithoutPrefix.key + : keyWithOrWithoutPrefix; + return key.replace(PubKey.PREFIX_GROUP_TEXTSECURE, ''); } public isEqual(comparator: PubKey | string) {