From 400e1ee0a8487d23e08a1d7acdaf1ab96e904604 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 13 May 2020 14:21:16 +1000
Subject: [PATCH] rm forced leave

---
 js/conversation_controller.js                 | 14 ----------
 .../conversation/ConversationHeader.tsx       | 27 -------------------
 2 files changed, 41 deletions(-)

diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 7def4358f..171703716 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -165,20 +165,6 @@
       // Close group leaving
       if (conversation.isClosedGroup()) {
         await conversation.leaveGroup();
-
-        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();
-          })
-        );
       } else if (conversation.isPublic()) {
         const channelAPI = await conversation.getPublicSendData();
         if (channelAPI === null) {
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 77e44a897..159a8e658 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -441,22 +441,15 @@ export class ConversationHeader extends React.Component<Props> {
       isGroup,
       isFriend,
       isKickedFromGroup,
-      // isArchived,
       isPublic,
       isRss,
       onResetSession,
       onSetDisappearingMessages,
-      // onShowAllMedia,
       onShowGroupMembers,
       onShowSafetyNumber,
-      // onArchive,
-      // onMoveToInbox,
       timerOptions,
       onBlockUser,
       onUnblockUser,
-      // hasNickname,
-      // onClearNickname,
-      // onChangeNickname,
     } = this.props;
 
     if (isPublic || isRss) {
@@ -499,34 +492,14 @@ export class ConversationHeader extends React.Component<Props> {
     const blockHandlerMenuItem = !isMe &&
       !isGroup &&
       !isRss && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
-    // const changeNicknameMenuItem = !isMe &&
-    //   !isGroup && (
-    //     <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
-    //   );
-    // const clearNicknameMenuItem = !isMe &&
-    //   !isGroup &&
-    //   hasNickname && (
-    //     <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
-    //   );
-    // const archiveConversationMenuItem = isArchived ? (
-    //   <MenuItem onClick={onMoveToInbox}>
-    //     {i18n('moveConversationToInbox')}
-    //   </MenuItem>
-    // ) : (
-    //   <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
-    // );
 
     return (
       <React.Fragment>
-        {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
         {disappearingMessagesMenuItem}
         {showMembersMenuItem}
         {showSafetyNumberMenuItem}
         {resetSessionMenuItem}
         {blockHandlerMenuItem}
-        {/* {changeNicknameMenuItem}
-        {clearNicknameMenuItem} */}
-        {/* {archiveConversationMenuItem} */}
       </React.Fragment>
     );
   }