Ensure non-visual attachments can be manually downloaded

Co-authored-by: Scott Nonnenberg <scott@signal.org>
signalapp · Aug 31, 2022 · 87998f1 · 87998f1
1 parent 89a7cab
commit 87998f1
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
@@ -974,7 +974,10 @@ export class Message extends React.PureComponent<Props, State> {
 
       if (
         isImage(attachments) ||
-        (isVideo(attachments) && hasVideoScreenshot(attachments))
+        (isVideo(attachments) &&
+          (!isDownloaded(attachments[0]) ||
+            !attachments?.[0].pending ||
+            hasVideoScreenshot(attachments)))
       ) {
         const bottomOverlay = !isSticker && !collapseMetadata;
         // We only want users to tab into this if there's more than one
@@ -1081,7 +1084,16 @@ export class Message extends React.PureComponent<Props, State> {
         )}
         // There's only ever one of these, so we don't want users to tab into it
         tabIndex={-1}
-        onClick={this.openGenericAttachment}
+        onClick={() => {
+          if (!isDownloaded(firstAttachment)) {
+            kickOffAttachmentDownload({
+              attachment: firstAttachment,
+              messageId: id,
+            });
+          } else {
+            this.openGenericAttachment();
+          }
+        }}
       >
         {pending ? (
           <div className="module-message__generic-attachment__spinner-container">
@@ -2735,7 +2747,6 @@ export class Message extends React.PureComponent<Props, State> {
       attachments &&
       attachments.length > 0 &&
       !isAttachmentPending &&
-      (isImage(attachments) || isVideo(attachments)) &&
       !isDownloaded(attachments[0])
     ) {
       event.preventDefault();