From df93c97b484de1e5d842af3b749092ee754b8127 Mon Sep 17 00:00:00 2001 From: Beaudan Date: Thu, 7 Mar 2019 12:14:44 +1100 Subject: [PATCH] Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact --- _locales/en/messages.json | 10 +++ js/background.js | 6 ++ js/conversation_controller.js | 42 ++++++++++- js/models/conversations.js | 2 + js/views/app_view.js | 9 +++ js/views/conversation_list_item_view.js | 24 +++++- js/views/conversation_list_view.js | 12 ++- js/views/conversation_view.js | 14 ++++ ts/components/ConversationListItem.tsx | 74 ++++++++++++++----- .../conversation/ConversationHeader.md | 3 + .../conversation/ConversationHeader.tsx | 3 + 11 files changed, 175 insertions(+), 24 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 8a1669767..74d2b9700 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -953,6 +953,16 @@ "description": "Confirmation dialog text that asks the user if they really wish to delete the conversation. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone." }, + "deleteContact": { + "message": "Delete contact", + "description": + "Confirmation dialog title that asks the user if they really wish to delete the contact. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone." + }, + "deleteContactConfirmation": { + "message": "Permanently delete this contact and destroy all sessions?", + "description": + "Confirmation dialog text that tells the user what will happen if they delete the contact." + }, "sessionResetFailed": { "message": "Secure session reset failed", "description": diff --git a/js/background.js b/js/background.js index 92fa0988b..4e6c88c84 100644 --- a/js/background.js +++ b/js/background.js @@ -623,6 +623,12 @@ } }); + Whisper.events.on('showConfirmationDialog', options => { + if (appView) { + appView.showConfirmationDialog(options); + } + }); + Whisper.events.on('showNicknameDialog', options => { if (appView) { appView.showNicknameDialog(options); diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 5c55d4308..d53b4d4f5 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -1,4 +1,4 @@ -/* global _, Whisper, Backbone, storage, lokiP2pAPI */ +/* global _, Whisper, Backbone, storage, lokiP2pAPI, textsecure, libsignal */ /* eslint-disable more/no-then */ @@ -15,6 +15,7 @@ this.listenTo(conversations, 'add change:active_at', this.addActive); this.listenTo(conversations, 'reset', () => this.reset([])); + this.listenTo(conversations, 'remove', this.remove); this.on( 'add remove change:unreadCount', @@ -90,6 +91,7 @@ 'add change:active_at change:friendRequestStatus', this.addActive ); + this.listenTo(conversations, 'remove', this.remove); this.listenTo(conversations, 'reset', () => this.reset([])); this.collator = new Intl.Collator(); @@ -207,6 +209,44 @@ return conversation; }, + async deleteContact(id, type) { + if (typeof id !== 'string') { + throw new TypeError("'id' must be a string"); + } + + if (type !== 'private' && type !== 'group') { + throw new TypeError( + `'type' must be 'private' or 'group'; got: '${type}'` + ); + } + + if (!this._initialFetchComplete) { + throw new Error( + 'ConversationController.get() needs complete initial fetch' + ); + } + + const conversation = conversations.get(id); + if (!conversation) { + return; + } + conversations.remove(conversation); + await conversation.destroyMessages(); + const deviceIds = await textsecure.storage.protocol.getDeviceIds(id); + await Promise.all( + deviceIds.map(deviceId => { + const address = new libsignal.SignalProtocolAddress(id, deviceId); + const sessionCipher = new libsignal.SessionCipher( + textsecure.storage.protocol, + address + ); + return sessionCipher.deleteAllSessionsForDevice(); + }) + ); + await window.Signal.Data.removeConversation(id, { + Conversation: Whisper.Conversation, + }); + }, getOrCreateAndWait(id, type) { return this._initialPromise.then(() => { const conversation = this.getOrCreate(id, type); diff --git a/js/models/conversations.js b/js/models/conversations.js index 9762c6ff5..6c09c78de 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -417,6 +417,8 @@ isOnline: this.isOnline(), onClick: () => this.trigger('select', this), + onBlockContact: () => this.block(), + onUnblockContact: () => this.unblock(), }; return result; diff --git a/js/views/app_view.js b/js/views/app_view.js index 5156ac5a8..bf9584b73 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -176,6 +176,15 @@ }); } }, + showConfirmationDialog({ title, message, onOk, onCancel }) { + const dialog = new Whisper.ConfirmationDialogView({ + title, + message, + resolve: onOk, + reject: onCancel, + }); + this.el.append(dialog.el); + }, showNicknameDialog({ pubKey, title, message, nickname, onOk, onCancel }) { const _title = title || `Change nickname for ${pubKey}`; const dialog = new Whisper.NicknameDialogView({ diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js index 06459a19e..713b41dcc 100644 --- a/js/views/conversation_list_item_view.js +++ b/js/views/conversation_list_item_view.js @@ -1,4 +1,4 @@ -/* global Whisper, Signal, Backbone */ +/* global Whisper, Signal, Backbone, ConversationController, i18n */ // eslint-disable-next-line func-names (function() { @@ -26,7 +26,27 @@ }, getProps() { - return this.model.getPropsForListItem(); + const modelProps = this.model.getPropsForListItem(); + const props = { + ...modelProps, + onDeleteContact: () => { + Whisper.events.trigger('showConfirmationDialog', { + message: i18n('deleteContactConfirmation'), + onOk: () => + ConversationController.deleteContact( + this.model.id, + this.model.get('type') + ), + }); + }, + onDeleteMessages: () => { + Whisper.events.trigger('showConfirmationDialog', { + message: i18n('deleteConversationConfirmation'), + onOk: () => this.model.destroyMessages(), + }); + }, + }; + return props; }, render() { diff --git a/js/views/conversation_list_view.js b/js/views/conversation_list_view.js index b5e6d5aa1..0a69c78bf 100644 --- a/js/views/conversation_list_view.js +++ b/js/views/conversation_list_view.js @@ -1,4 +1,4 @@ -/* global Whisper, getInboxCollection, $ */ +/* global Whisper, getInboxCollection, getContactCollection, $ */ // eslint-disable-next-line func-names (function() { @@ -9,6 +9,9 @@ Whisper.ConversationListView = Whisper.ListView.extend({ tagName: 'div', itemView: Whisper.ConversationListItemView, + getCollection() { + return getInboxCollection(); + }, updateLocation(conversation) { const $el = this.$(`.${conversation.cid}`); @@ -28,7 +31,7 @@ } const $allConversations = this.$('.conversation-list-item'); - const inboxCollection = getInboxCollection(); + const inboxCollection = this.getCollection(); const index = inboxCollection.indexOf(conversation); const elIndex = $allConversations.index($el); @@ -66,7 +69,10 @@ }, }); - Whisper.ConversationContactListView = Whisper.ListView.extend({ + Whisper.ConversationContactListView = Whisper.ConversationListView.extend({ itemView: Whisper.ConversationContactListItemView, + getCollection() { + return getContactCollection(); + }, }); })(); diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 54b5d5dce..13d22f0d4 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -208,6 +208,7 @@ onSetDisappearingMessages: seconds => this.setDisappearingMessages(seconds), onDeleteMessages: () => this.destroyMessages(), + onDeleteContact: () => this.deleteContact(), onResetSession: () => this.endSession(), // These are view only and don't update the Conversation model, so they @@ -1447,6 +1448,19 @@ } }, + async deleteContact() { + Whisper.events.trigger('showConfirmationDialog', { + message: i18n('deleteContactConfirmation'), + onOk: () => { + ConversationController.deleteContact( + this.model.id, + this.model.get('type') + ); + this.remove(); + }, + }); + }, + async destroyMessages() { try { await this.confirm(i18n('deleteConversationConfirmation')); diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index d472f80ab..4f4eb0fe7 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -8,6 +8,7 @@ import { ContactName } from './conversation/ContactName'; import { TypingAnimation } from './conversation/TypingAnimation'; import { Colors, Localizer } from '../types/Util'; +import { ContextMenu, ContextMenuTrigger, MenuItem } from 'react-contextmenu'; interface Props { phoneNumber: string; @@ -32,6 +33,10 @@ interface Props { i18n: Localizer; onClick?: () => void; + onDeleteMessages?: () => void; + onDeleteContact?: () => void; + onBlockContact?: () => void; + onUnblockContact?: () => void; } export class ConversationListItem extends React.Component { @@ -127,6 +132,29 @@ export class ConversationListItem extends React.Component { ); } + public renderContextMenu(triggerId: string) { + const { + i18n, + isBlocked, + onDeleteContact, + onDeleteMessages, + onBlockContact, + onUnblockContact, + } = this.props; + + return ( + + {isBlocked ? ( + {i18n('unblockUser')} + ) : ( + {i18n('blockUser')} + )} + {i18n('deleteMessages')} + {i18n('deleteContact')} + + ); + } + public renderMessage() { const { lastMessage, isTyping, unreadCount, i18n } = this.props; @@ -171,6 +199,7 @@ export class ConversationListItem extends React.Component { public render() { const { + phoneNumber, unreadCount, onClick, isSelected, @@ -178,25 +207,34 @@ export class ConversationListItem extends React.Component { isBlocked, } = this.props; + const triggerId = `${phoneNumber}-ctxmenu-${Date.now()}`; + return ( -
0 ? 'module-conversation-list-item--has-unread' : null, - isSelected ? 'module-conversation-list-item--is-selected' : null, - showFriendRequestIndicator - ? 'module-conversation-list-item--has-friend-request' - : null, - isBlocked ? 'module-conversation-list-item--is-blocked' : null - )} - > - {this.renderAvatar()} -
- {this.renderHeader()} - {this.renderMessage()} -
+
+ +
0 + ? 'module-conversation-list-item--has-unread' + : null, + isSelected ? 'module-conversation-list-item--is-selected' : null, + showFriendRequestIndicator + ? 'module-conversation-list-item--has-friend-request' + : null, + isBlocked ? 'module-conversation-list-item--is-blocked' : null + )} + > + {this.renderAvatar()} +
+ {this.renderHeader()} + {this.renderMessage()} +
+
+ + {this.renderContextMenu(triggerId)}
); } diff --git a/ts/components/conversation/ConversationHeader.md b/ts/components/conversation/ConversationHeader.md index 7d1bc187f..bc0a88258 100644 --- a/ts/components/conversation/ConversationHeader.md +++ b/ts/components/conversation/ConversationHeader.md @@ -18,6 +18,7 @@ Note the five items in gear menu, and the second-level menu with disappearing me console.log('onSetDisappearingMessages', seconds) } onDeleteMessages={() => console.log('onDeleteMessages')} + onDeleteContact={() => console.log('onDeleteContact')} onResetSession={() => console.log('onResetSession')} onShowSafetyNumber={() => console.log('onShowSafetyNumber')} onShowAllMedia={() => console.log('onShowAllMedia')} @@ -93,6 +94,7 @@ Note the five items in gear menu, and the second-level menu with disappearing me console.log('onSetDisappearingMessages', seconds) } onDeleteMessages={() => console.log('onDeleteMessages')} + onDeleteContact={() => console.log('onDeleteContact')} onResetSession={() => console.log('onResetSession')} onShowSafetyNumber={() => console.log('onShowSafetyNumber')} onShowAllMedia={() => console.log('onShowAllMedia')} @@ -116,6 +118,7 @@ Note that the menu should includes 'Show Members' instead of 'Show Safety Number console.log('onSetDisappearingMessages', seconds) } onDeleteMessages={() => console.log('onDeleteMessages')} + onDeleteContact={() => console.log('onDeleteContact')} onResetSession={() => console.log('onResetSession')} onShowSafetyNumber={() => console.log('onShowSafetyNumber')} onShowAllMedia={() => console.log('onShowAllMedia')} diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index e0b9813ab..147e2b188 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -41,6 +41,7 @@ interface Props { onSetDisappearingMessages: (seconds: number) => void; onDeleteMessages: () => void; + onDeleteContact: () => void; onResetSession: () => void; onShowSafetyNumber: () => void; @@ -185,6 +186,7 @@ export class ConversationHeader extends React.Component { isMe, isGroup, onDeleteMessages, + onDeleteContact, onResetSession, onSetDisappearingMessages, onShowAllMedia, @@ -246,6 +248,7 @@ export class ConversationHeader extends React.Component { ) : null} {i18n('copyPublicKey')} {i18n('deleteMessages')} + {i18n('deleteContact')} ); }