From beb4cdbed8cc37d02ccd17e99f423c11049f1778 Mon Sep 17 00:00:00 2001 From: Mikunj Varsani Date: Mon, 10 Feb 2020 15:03:34 +1100 Subject: [PATCH] Closed group fixes. (#816) * Fix group updates not syning * Fix leaving closed groups * Fix incorrect members being shown on create group dialog * Linting * Fix create closed group showing our own conversation --- _locales/en/messages.json | 5 ++++ js/conversation_controller.js | 30 +++++++++++-------- js/models/conversations.js | 23 ++++++++++---- js/views/app_view.js | 15 ++++++---- libtextsecure/sendmessage.js | 10 ++++--- .../session/LeftPaneMessageSection.tsx | 3 +- .../session/SessionClosableOverlay.tsx | 18 ++++++----- 7 files changed, 67 insertions(+), 37 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 896892a4e..34a519aa4 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2162,6 +2162,11 @@ "message": "Leave Closed Group", "description": "Button action that the user can click to leave the group" }, + "leaveClosedGroupConfirmation": { + "message": "Leave this Closed Group?", + "description": + "Confirmation dialog text that tells the user what will happen if they leave the closed group." + }, "leaveGroupDialogTitle": { "message": "Are you sure you want to leave this group?", "description": diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 32b5e8e10..5e102420d 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -161,26 +161,32 @@ if (!conversation) { return; } - if (conversation.isPublic()) { + + // Close group leaving + if (conversation.isClosedGroup()) { + await conversation.leaveGroup(); + } else if (conversation.isPublic()) { const channelAPI = await conversation.getPublicSendData(); if (channelAPI === null) { log.warn(`Could not get API for public conversation ${id}`); } else { channelAPI.serverAPI.partChannel(channelAPI.channelId); } + } else if (conversation.isPrivate()) { + 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 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, }); diff --git a/js/models/conversations.js b/js/models/conversations.js index 29c9ab317..56ceea27f 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -205,6 +205,11 @@ isPublic() { return !!(this.id && this.id.match(/^publicChat:/)); }, + isClosedGroup() { + return ( + this.get('type') === Message.GROUP && !this.isPublic() && !this.isRss() + ); + }, isClosable() { return !this.isRss() || this.get('closable'); }, @@ -881,6 +886,9 @@ throw new Error('Invalid friend request state'); } }, + isOurConversation() { + return this.id === this.ourNumber; + }, isSecondaryDevice() { return !!this.get('secondaryStatus'); }, @@ -2712,13 +2720,16 @@ }, deleteContact() { - const title = this.isPublic() - ? i18n('deletePublicChannel') - : i18n('deleteContact'); + let title = i18n('deleteContact'); + let message = i18n('deleteContactConfirmation'); - const message = this.isPublic() - ? i18n('deletePublicChannelConfirmation') - : i18n('deleteContactConfirmation'); + if (this.isPublic()) { + title = i18n('deletePublicChannel'); + message = i18n('deletePublicChannelConfirmation'); + } else if (this.isClosedGroup()) { + title = i18n('leaveClosedGroup'); + message = i18n('leaveClosedGroupConfirmation'); + } window.confirmationDialog({ title, diff --git a/js/views/app_view.js b/js/views/app_view.js index 9b62d9a06..7fbf40b8a 100644 --- a/js/views/app_view.js +++ b/js/views/app_view.js @@ -238,13 +238,16 @@ this.el.append(dialog.el); }, showLeaveGroupDialog(groupConvo) { - const title = groupConvo.isPublic() - ? i18n('deletePublicChannel') - : i18n('deleteContact'); + let title = i18n('deleteContact'); + let message = i18n('deleteContactConfirmation'); - const message = groupConvo.isPublic() - ? i18n('deletePublicChannelConfirmation') - : i18n('deleteContactConfirmation'); + if (groupConvo.isPublic()) { + title = i18n('deletePublicChannel'); + message = i18n('deletePublicChannelConfirmation'); + } else if (groupConvo.isClosedGroup()) { + title = i18n('leaveClosedGroup'); + message = i18n('leaveClosedGroupConfirmation'); + } window.confirmationDialog({ title, diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js index cb1fea2ad..d59a06d0f 100644 --- a/libtextsecure/sendmessage.js +++ b/libtextsecure/sendmessage.js @@ -640,6 +640,10 @@ MessageSender.prototype = { }, async sendContactSyncMessage(contactConversation) { + if (!contactConversation.isPrivate()) { + return Promise.resolve(); + } + const primaryDeviceKey = window.storage.get('primaryDevicePubKey'); const allOurDevices = (await libloki.storage.getAllDevicePubKeysForPrimaryPubKey( primaryDeviceKey @@ -869,9 +873,7 @@ MessageSender.prototype = { }, sendGroupProto(providedNumbers, proto, timestamp = Date.now(), options = {}) { - const me = textsecure.storage.user.getNumber(); - const numbers = providedNumbers.filter(number => number !== me); - if (numbers.length === 0) { + if (providedNumbers.length === 0) { return Promise.resolve({ successfulNumbers: [], failoverNumbers: [], @@ -894,7 +896,7 @@ MessageSender.prototype = { this.sendMessageProto( timestamp, - numbers, + providedNumbers, proto, callback, silent, diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx index 418439a77..9841257ea 100644 --- a/ts/components/session/LeftPaneMessageSection.tsx +++ b/ts/components/session/LeftPaneMessageSection.tsx @@ -69,7 +69,8 @@ export class LeftPaneMessageSection extends React.Component { this.state = { showComposeView: false, pubKeyPasted: '', - shouldRenderMessageOnboarding: length === 0 && renderOnboardingSetting && false, + shouldRenderMessageOnboarding: + length === 0 && renderOnboardingSetting && false, connectSuccess: false, loading: false, }; diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index 53d7ef327..c9997e632 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -52,14 +52,16 @@ export class SessionClosableOverlay extends React.Component { } public getContacts() { - const conversations = window.getConversations(); - - let conversationList = conversations; - if (conversationList !== undefined) { - conversationList = conversationList.filter((conv: any) => { - return !conv.isRss() && !conv.isPublic() && conv.attributes.lastMessage; - }); - } + const conversations = window.getConversations() || []; + + const conversationList = conversations.filter((conversation: any) => { + return ( + !conversation.isOurConversation() && + conversation.isPrivate() && + !conversation.isSecondaryDevice() && + conversation.isFriend() + ); + }); return conversationList.map((d: any) => { const lokiProfile = d.getLokiProfile();