Added using ".pgp" in the original file name when we are forwarding attachments to maintain a base logic (Encrypted mode).| Close #350

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/Constants.java

@@ -94,4 +94,6 @@ public class Constants {
     public static final String PASSWORD_QUALITY_REASONABLE = "reasonable";
     public static final String PASSWORD_QUALITY_WEAK = "weak";
     public static final String PASSWORD_QUALITY_POOR = "poor";
+
+    public static final String PGP_FILE_EXT = ".pgp";
 }

FlowCrypt/src/main/java/com/flowcrypt/email/jobscheduler/ForwardedAttachmentsDownloaderJobService.java

@@ -39,6 +39,7 @@
 import com.sun.mail.imap.IMAPFolder;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;
@@ -277,7 +278,8 @@ private void downloadForwardedAttachments(Context context, Js js, AccountDao acc
                                 if (inputStream != null) {
                                     if (generalMessageDetails.isEncrypted()) {
                                         byte[] encryptedBytes = this.js.crypto_message_encrypt(pubKeys, IOUtils
-                                                .toByteArray(inputStream), attachmentInfo.getName());
+                                                .toByteArray(inputStream), FilenameUtils.removeExtension(attachmentInfo
+                                                .getName()));
                                         FileUtils.writeByteArrayToFile(tempFile, encryptedBytes);
                                     } else {
                                         FileUtils.copyInputStreamToFile(inputStream, tempFile);
@@ -303,14 +305,10 @@ private void downloadForwardedAttachments(Context context, Js js, AccountDao acc
                             }
                         }
 
-                        if (attachmentInfo.getUri() != null || generalMessageDetails.isEncrypted()) { // need db update
+                        if (attachmentInfo.getUri() != null) {
                             ContentValues contentValues = new ContentValues();
-                            if(attachmentInfo.getUri() != null) { // update new uri
-                                contentValues.put(AttachmentDaoSource.COL_FILE_URI, attachmentInfo.getUri().toString());
-                            }
-                            if(generalMessageDetails.isEncrypted()) { // update filename with .pgp
-                                contentValues.put(AttachmentDaoSource.COL_NAME, attachmentInfo.getName() + ".pgp");
-                            }
+                            contentValues.put(AttachmentDaoSource.COL_FILE_URI, attachmentInfo.getUri().toString());
+
                             attachmentDaoSource.update(context, attachmentInfo.getEmail(), attachmentInfo.getFolder(),
                                     attachmentInfo.getUid(), attachmentInfo.getId(), contentValues);
                         }

FlowCrypt/src/main/java/com/flowcrypt/email/service/PrepareOutgoingMessagesJobIntentService.java

@@ -231,7 +231,7 @@ private void addAttachmentsToCache(OutgoingMessageInfo outgoingMessageInfo, long
                         InputStream inputStream = getContentResolver().openInputStream(uriOfOriginalFile);
                         if (inputStream != null) {
                             File encryptedTempFile = new File(messageAttachmentCacheDirectory,
-                                    attachmentInfo.getName() + ".pgp");
+                                    attachmentInfo.getName() + Constants.PGP_FILE_EXT);
                             byte[] encryptedBytes = js.crypto_message_encrypt(pubKeys, IOUtils.toByteArray
                                     (inputStream), attachmentInfo.getName());
                             FileUtils.writeByteArrayToFile(encryptedTempFile, encryptedBytes);
@@ -274,8 +274,17 @@ private void addAttachmentsToCache(OutgoingMessageInfo outgoingMessageInfo, long
         }
 
         if (!CollectionUtils.isEmpty(outgoingMessageInfo.getForwardedAttachmentInfoList())) {
-            for (AttachmentInfo attachmentInfo : outgoingMessageInfo.getForwardedAttachmentInfoList()) {
-                cachedAttachments.add(new AttachmentInfo(JavaEmailConstants.FOLDER_OUTBOX, attachmentInfo));
+            if (outgoingMessageInfo.getMessageEncryptionType() == MessageEncryptionType.ENCRYPTED) {
+                for (AttachmentInfo attachmentInfo : outgoingMessageInfo.getForwardedAttachmentInfoList()) {
+                    AttachmentInfo attachmentInfoEncrypted =
+                            new AttachmentInfo(JavaEmailConstants.FOLDER_OUTBOX, attachmentInfo);
+                    attachmentInfoEncrypted.setName(attachmentInfoEncrypted.getName() + Constants.PGP_FILE_EXT);
+                    cachedAttachments.add(attachmentInfoEncrypted);
+                }
+            } else {
+                for (AttachmentInfo attachmentInfo : outgoingMessageInfo.getForwardedAttachmentInfoList()) {
+                    cachedAttachments.add(new AttachmentInfo(JavaEmailConstants.FOLDER_OUTBOX, attachmentInfo));
+                }
             }
         }
 

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java

@@ -34,6 +34,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.flowcrypt.email.Constants;
 import com.flowcrypt.email.R;
 import com.flowcrypt.email.api.email.EmailUtil;
 import com.flowcrypt.email.api.email.Folder;
@@ -620,7 +621,7 @@ public void onClick(View v) {
                     layoutAttachment.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
-                            if (attachmentInfo.getUri().getLastPathSegment().endsWith(".pgp")) {
+                            if (attachmentInfo.getUri().getLastPathSegment().endsWith(Constants.PGP_FILE_EXT)) {
                                 imageButtonDownloadAttachment.performClick();
                             } else {
                                 Intent intentOpenFile = new Intent(Intent.ACTION_VIEW, attachmentInfo.getUri());