Fixed a bug in AttachmentDownloadManagerService.| #372

FlowCrypt · May 25, 2021 · 2401ad6 · 2401ad6
1 parent 4dedb27
commit 2401ad6
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.../src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt b/.../src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.kt
@@ -659,8 +659,6 @@ class AttachmentDownloadManagerService : Service() {
 
       FileInputStream(file).use { inputStream ->
         val decryptedFile = File.createTempFile("tmp", null, context.externalCacheDir)
-        att.name = FilenameUtils.getBaseName(att.name)
-
         val pgpSecretKeyRings = KeysStorageImpl.getInstance(context).getPGPSecretKeyRings()
         val pgpSecretKeyRingCollection = PGPSecretKeyRingCollection(pgpSecretKeyRings)
         val protector = KeysStorageImpl.getInstance(context).getSecretKeyRingProtector()
@@ -673,6 +671,7 @@ class AttachmentDownloadManagerService : Service() {
             protector = protector
           )
 
+          att.name = FilenameUtils.getBaseName(att.name)
           result.fileInfo?.fileName?.let { fileName ->
             if (att.name == null) {
               att.name = fileName