From 7b5fe0cdbf4521ffb2a136a996cc05d780dd7927 Mon Sep 17 00:00:00 2001
From: Nat Talbot <nathanieltalbot@users.noreply.github.com>
Date: Wed, 10 Jun 2020 17:48:41 -0400
Subject: [PATCH] Harmonized filenames with Android version (#4324)

The Android app saves files with the filename format
'signal-YYYY-MM-DD-hhmmss.extension' but the desktop version
saves them with format 'signal-attachment-YYYY-MM-DD-hhmmss.extension'.
The attachment changes the suggested filename in Attachment.ts
to have the prefix 'signal' rather than 'signal-attachment'.
Tests were changed as necessary.

Resolves #4321
---
 ts/test/types/Attachment_test.ts | 4 ++--
 ts/types/Attachment.ts           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/test/types/Attachment_test.ts b/ts/test/types/Attachment_test.ts
index 3e219c2695..211023c2c7 100644
--- a/ts/test/types/Attachment_test.ts
+++ b/ts/test/types/Attachment_test.ts
@@ -49,7 +49,7 @@ describe('Attachment', () => {
           attachment,
           timestamp,
         });
-        const expected = 'signal-attachment-1970-01-01-000000.mov';
+        const expected = 'signal-1970-01-01-000000.mov';
         assert.strictEqual(actual, expected);
       });
     });
@@ -65,7 +65,7 @@ describe('Attachment', () => {
           timestamp,
           index: 3,
         });
-        const expected = 'signal-attachment-1970-01-01-000000_003.mov';
+        const expected = 'signal-1970-01-01-000000_003.mov';
         assert.strictEqual(actual, expected);
       });
     });
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 9ffe8d6087..3a557ea2f9 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -374,7 +374,7 @@ export const getSuggestedFilename = ({
     return attachment.fileName;
   }
 
-  const prefix = 'signal-attachment';
+  const prefix = 'signal';
   const suffix = timestamp
     ? moment(timestamp).format('-YYYY-MM-DD-HHmmss')
     : '';