Fixed download attachments. | #107.

DenBond7 · DenBond7 · commit e5da0ba5df5e · 2017-09-29T16:03:06.000+03:00
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/ImapProtocolUtil.java b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/ImapProtocolUtil.java
@@ -6,6 +6,7 @@
 
 package com.flowcrypt.email.api.email.protocol;
 
+import com.flowcrypt.email.database.dao.source.AccountDao;
 import com.sun.mail.iap.ProtocolException;
 import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.protocol.BODY;
@@ -29,20 +30,33 @@ public class ImapProtocolUtil {
     /**
      * Return the MIME format stream of headers for this body part.
      *
+     * @param accountDao    The object which contains information about an email account.
      * @param imapFolder    The {@link IMAPFolder} which contains the parent message;
      * @param messageNumber This number will be used for fetching {@link Part} details;
      * @param sectionId     The {@link Part} section id.
      * @return
      * @throws MessagingException
      */
-    public static InputStream getHeaderStream(IMAPFolder imapFolder, final int messageNumber, final int sectionId)
-            throws MessagingException {
+    public static InputStream getHeaderStream(AccountDao accountDao, IMAPFolder imapFolder, final int messageNumber,
+                                              int sectionId) throws MessagingException {
+
+        final String section;
+
+        switch (accountDao.getAccountType()) {
+            case AccountDao.ACCOUNT_TYPE_GOOGLE:
+                section = sectionId + ".MIME";
+                break;
+
+            default:
+                section = sectionId + ".HEADER";
+                break;
+        }
 
         return (InputStream) imapFolder.doCommand(new IMAPFolder.ProtocolCommand() {
             public Object doCommand(IMAPProtocol imapProtocol)
                     throws ProtocolException {
 
-                BODY body = imapProtocol.peekBody(messageNumber, sectionId + ".HEADER");
+                BODY body = imapProtocol.peekBody(messageNumber, section);
                 if (body != null) {
                     return body.getByteArrayInputStream();
                 } else return null;
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/EmailSyncService.java b/FlowCrypt/src/main/java/com/flowcrypt/email/service/EmailSyncService.java
@@ -326,7 +326,8 @@ private void updateAttachmentTable(AccountDao accountDao, com.flowcrypt.email.ap
             ArrayList<AttachmentInfo> attachmentInfoList = null;
 
             try {
-                attachmentInfoList = getAttachmentsInfoFromPart(imapFolder, message.getMessageNumber(), message);
+                attachmentInfoList = getAttachmentsInfoFromPart(accountDao, imapFolder, message.getMessageNumber(),
+                        message);
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -345,6 +346,7 @@ private void updateAttachmentTable(AccountDao accountDao, com.flowcrypt.email.ap
     /**
      * Find attachments in the {@link Part}.
      *
+     * @param accountDao    The object which contains information about an email account.
      * @param imapFolder    The {@link IMAPFolder} which contains the parent message;
      * @param messageNumber This number will be used for fetching {@link Part} details;
      * @param part          The parent part.
@@ -353,7 +355,8 @@ private void updateAttachmentTable(AccountDao accountDao, com.flowcrypt.email.ap
      * @throws IOException
      */
     @NonNull
-    private ArrayList<AttachmentInfo> getAttachmentsInfoFromPart(IMAPFolder imapFolder, int messageNumber, Part part)
+    private ArrayList<AttachmentInfo> getAttachmentsInfoFromPart(AccountDao accountDao, IMAPFolder imapFolder, int
+            messageNumber, Part part)
             throws MessagingException, IOException {
         ArrayList<AttachmentInfo> attachmentInfoList = new ArrayList<>();
 
@@ -364,13 +367,13 @@ private ArrayList<AttachmentInfo> getAttachmentsInfoFromPart(IMAPFolder imapFold
             for (int partCount = 0; partCount < numberOfParts; partCount++) {
                 BodyPart bodyPart = multiPart.getBodyPart(partCount);
                 if (bodyPart.isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
-                    ArrayList<AttachmentInfo> attachmentInfoLists = getAttachmentsInfoFromPart(imapFolder,
+                    ArrayList<AttachmentInfo> attachmentInfoLists = getAttachmentsInfoFromPart(accountDao, imapFolder,
                             messageNumber, bodyPart);
                     if (!attachmentInfoLists.isEmpty()) {
                         attachmentInfoList.addAll(attachmentInfoLists);
                     }
                 } else if (Part.ATTACHMENT.equalsIgnoreCase(bodyPart.getDisposition())) {
-                    InputStream inputStream = ImapProtocolUtil.getHeaderStream(imapFolder, messageNumber,
+                    InputStream inputStream = ImapProtocolUtil.getHeaderStream(accountDao, imapFolder, messageNumber,
                             partCount + 1);
 
                     if (inputStream == null) {
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.java b/FlowCrypt/src/main/java/com/flowcrypt/email/service/attachment/AttachmentDownloadManagerService.java
@@ -29,6 +29,7 @@
 import com.flowcrypt.email.R;
 import com.flowcrypt.email.api.email.JavaEmailConstants;
 import com.flowcrypt.email.api.email.model.AttachmentInfo;
+import com.flowcrypt.email.api.email.protocol.ImapProtocolUtil;
 import com.flowcrypt.email.api.email.protocol.OpenStoreHelper;
 import com.flowcrypt.email.database.dao.source.AccountDao;
 import com.flowcrypt.email.database.dao.source.AccountDaoSource;
@@ -56,6 +57,7 @@
 import javax.mail.Part;
 import javax.mail.Session;
 import javax.mail.Store;
+import javax.mail.internet.InternetHeaders;
 
 /**
  * This service will be use to download email attachments. To start load an attachment just run service via the intent
@@ -464,7 +466,8 @@ public void run() {
                 imapFolder.open(Folder.READ_ONLY);
 
                 javax.mail.Message message = imapFolder.getMessageByUID(attachmentInfo.getUid());
-                Part attachment = getAttachmentPart(message, attachmentInfo.getId());
+                Part attachment = getAttachmentPartById(accountDao, imapFolder, message.getMessageNumber(), message,
+                        attachmentInfo.getId());
 
                 if (attachment != null) {
                     InputStream input = attachment.getInputStream();
@@ -567,28 +570,48 @@ private File prepareAttachmentFile() {
         /**
          * Get {@link Part} which has an attachment with such attachment id.
          *
-         * @param part The parent part.
+         * @param accountDao    The object which contains information about an email account.
+         * @param imapFolder    The {@link IMAPFolder} which contains the parent message;
+         * @param messageNumber This number will be used for fetching {@link Part} details;
+         * @param part          The parent part.
          * @return {@link Part} which has attachment or null if message doesn't have such attachment.
          * @throws MessagingException
          * @throws IOException
          */
-        private Part getAttachmentPart(Part part, String attachmentId) throws MessagingException, IOException {
+        private Part getAttachmentPartById(AccountDao accountDao, IMAPFolder imapFolder, int messageNumber, Part
+                part, String attachmentId)
+                throws MessagingException, IOException {
             if (part != null && part.isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
                 Multipart multiPart = (Multipart) part.getContent();
                 int numberOfParts = multiPart.getCount();
                 String[] headers;
                 for (int partCount = 0; partCount < numberOfParts; partCount++) {
                     BodyPart bodyPart = multiPart.getBodyPart(partCount);
                     if (bodyPart.isMimeType(JavaEmailConstants.MIME_TYPE_MULTIPART)) {
-                        Part innerPart = getAttachmentPart(bodyPart, attachmentId);
+                        Part innerPart = getAttachmentPartById(accountDao, imapFolder, messageNumber, bodyPart,
+                                attachmentId);
                         if (innerPart != null) {
                             return innerPart;
                         }
-                    } else if (Part.ATTACHMENT.equalsIgnoreCase(bodyPart.getDisposition())
-                            && (headers = bodyPart.getHeader(JavaEmailConstants.HEADER_X_ATTACHMENT_ID)) != null
-                            && headers.length > 0
-                            && attachmentId.equals(headers[0])) {
-                        return bodyPart;
+                    } else if (Part.ATTACHMENT.equalsIgnoreCase(bodyPart.getDisposition())) {
+                        InputStream inputStream = ImapProtocolUtil.getHeaderStream(accountDao, imapFolder,
+                                messageNumber, partCount + 1);
+
+                        if (inputStream == null) {
+                            throw new MessagingException("Failed to fetch headers");
+                        }
+
+                        InternetHeaders internetHeaders = new InternetHeaders(inputStream);
+                        headers = internetHeaders.getHeader(JavaEmailConstants.HEADER_CONTENT_ID);
+
+                        if (headers == null) {
+                            //try to receive custom Gmail attachments header X-Attachment-Id
+                            headers = internetHeaders.getHeader(JavaEmailConstants.HEADER_X_ATTACHMENT_ID);
+                        }
+
+                        if (headers != null && attachmentId.equals(headers[0])) {
+                            return bodyPart;
+                        }
                     }
                 }
                 return null;
