From 20496c45d674e8667a57249fbdc07a9017feda71 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 25 Nov 2020 14:17:16 +1100
Subject: [PATCH] remove sendAnyWay and showSafetyNumber from props of
 MessageDetails

---
 js/models/messages.d.ts                       |  4 +--
 js/models/messages.js                         | 15 +++--------
 js/views/conversation_view.js                 | 26 -------------------
 .../conversation/SessionMessagesList.tsx      |  7 ++---
 4 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/js/models/messages.d.ts b/js/models/messages.d.ts
index 64f77a86f..6e4ad17b4 100644
--- a/js/models/messages.d.ts
+++ b/js/models/messages.d.ts
@@ -55,9 +55,7 @@ export interface MessageModel extends Backbone.Model<MessageAttributes> {
   sendSyncMessageOnly: (message: any) => void;
   isUnread: () => boolean;
   commit: () => Promise<number>;
-  getPropsForMessageDetail: (
-    onSendAnyway: any /*, onShowSafetyNumber: any*/
-  ) => any; // FIXME enable this back. Be sure to handle case where it comes from a medium group
+  getPropsForMessageDetail: () => any;
 
   propsForMessage?: any;
   propsForTimerNotification?: any;
diff --git a/js/models/messages.js b/js/models/messages.js
index 5580914ae..99156a520 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -803,7 +803,7 @@
 
       return Boolean(lookup[contactId]);
     },
-    async getPropsForMessageDetail(onSendAnyway, onShowSafetyNumber) {
+    async getPropsForMessageDetail() {
       const newIdentity = i18n('newIdentity');
       const OUTGOING_KEY_ERROR = 'OutgoingIdentityKeyError';
 
@@ -868,15 +868,6 @@
             isUnidentifiedDelivery,
             isPrimaryDevice,
             profileName,
-            onSendAnyway: () => {
-              onSendAnyway({
-                contact: this.findContact(id),
-                message: this,
-              });
-            },
-            onShowSafetyNumber: () => {
-              onShowSafetyNumber(this.findContact(id));
-            },
           };
         })
       );
@@ -1188,7 +1179,7 @@
         sentMessage.encryption === libsession.Types.EncryptionType.MediumGroup;
 
       const isOpenGroupMessage =
-        sentMessage.group &&
+        !!sentMessage.group &&
         sentMessage.group instanceof libsession.Types.OpenGroup;
 
       // We trigger a sync message only when the message is not to one of our devices, AND
@@ -1206,7 +1197,7 @@
 
       const isSessionOrClosedMessage = !isOpenGroupMessage;
 
-      if (!isOpenGroupMessage) {
+      if (isSessionOrClosedMessage) {
         const contentDecoded = textsecure.protobuf.Content.decode(
           sentMessage.plainTextBuffer
         );
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 96e846869..67ad81234 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -602,32 +602,6 @@
       });
     },
 
-    async showMessageDetail(message) {
-      const onClose = () => {
-        this.stopListening(message, 'change', update);
-        this.resetPanel();
-        this.updateHeader();
-      };
-
-      const props = await message.getPropsForMessageDetail();
-      const view = new Whisper.ReactWrapperView({
-        className: 'message-detail-wrapper',
-        Component: Signal.Components.MessageDetail,
-        props,
-        onClose,
-      });
-
-      const update = async () =>
-        view.update(await message.getPropsForMessageDetail());
-      this.listenTo(message, 'change', update);
-      this.listenTo(message, 'expired', onClose);
-      // We could listen to all involved contacts, but we'll call that overkill
-
-      this.listenBack(view);
-      this.updateHeader();
-      view.render();
-    },
-
     showContactDetail({ contact, hasSignalAccount }) {
       const regionCode = storage.get('regionCode');
       const { contactSelector } = Signal.Types.Contact;
diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx
index 681c37bf5..f7408ef0b 100644
--- a/ts/components/session/conversation/SessionMessagesList.tsx
+++ b/ts/components/session/conversation/SessionMessagesList.tsx
@@ -304,11 +304,8 @@ export class SessionMessagesList extends React.Component<Props, State> {
     messageProps.onDeleteMessage = this.props.deleteMessage;
     messageProps.onReply = this.props.replyToMessage;
     messageProps.onShowDetail = async () => {
-      void this.props.showMessageDetails(
-        await message.getPropsForMessageDetail(
-          this.onSendAnyway /*, this.props.onShowSafetyNumber*/
-        )
-      );
+      const messageDetailsProps = await message.getPropsForMessageDetail();
+      void this.props.showMessageDetails(messageDetailsProps);
     };
 
     messageProps.onClickAttachment = (attachment: any) => {