Added request the attachments details when loading the message details. | #55.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/model/AttachmentInfo.java

@@ -0,0 +1,74 @@
+/*
+ * Business Source License 1.0 © 2017 FlowCrypt Limited ([email protected]).
+ * Use limitations apply. See https://github.com/FlowCrypt/flowcrypt-android/blob/master/LICENSE
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.api.email.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Simple POJO which defines an information about email attachments.
+ *
+ * @author Denis Bondarenko
+ *         Date: 07.08.2017
+ *         Time: 18:38
+ *         E-mail: [email protected]
+ */
+
+public class AttachmentInfo implements Parcelable {
+    public static final Parcelable.Creator<AttachmentInfo> CREATOR = new Parcelable
+            .Creator<AttachmentInfo>() {
+        @Override
+        public AttachmentInfo createFromParcel(Parcel source) {
+            return new AttachmentInfo(source);
+        }
+
+        @Override
+        public AttachmentInfo[] newArray(int size) {
+            return new AttachmentInfo[size];
+        }
+    };
+
+    private String name;
+    private int encodedSize;
+    private String type;
+
+    public AttachmentInfo(String name, int encodedSize, String type) {
+        this.name = name;
+        this.encodedSize = encodedSize;
+        this.type = type;
+    }
+
+    protected AttachmentInfo(Parcel in) {
+        this.name = in.readString();
+        this.encodedSize = in.readInt();
+        this.type = in.readString();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.name);
+        dest.writeInt(this.encodedSize);
+        dest.writeString(this.type);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getEncodedSize() {
+        return encodedSize;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/sync/SyncListener.java

@@ -8,6 +8,7 @@
 
 import android.content.Context;
 
+import com.flowcrypt.email.api.email.model.AttachmentInfo;
 import com.google.android.gms.auth.GoogleAuthException;
 import com.sun.mail.imap.IMAPFolder;
 
@@ -84,12 +85,15 @@ void onMessagesMoved(IMAPFolder sourceImapFolder, IMAPFolder destinationImapFold
      * @param imapFolder                   The folder where the new messages exist.
      * @param uid                          The UID of the message.
      * @param rawMessageWithOutAttachments The raw message without attachments.
+     * @param attachmentInfoList           The list of attachments info.
      * @param ownerKey                     The name of the reply to {@link android.os.Messenger}.
      * @param requestCode                  The unique request code for the reply to
      *                                     {@link android.os.Messenger}.
      */
-    void onMessageDetailsReceived(IMAPFolder imapFolder, long uid, String
-            rawMessageWithOutAttachments, String ownerKey, int requestCode);
+    void onMessageDetailsReceived(IMAPFolder imapFolder, long uid,
+                                  String rawMessageWithOutAttachments,
+                                  List<AttachmentInfo> attachmentInfoList,
+                                  String ownerKey, int requestCode);
 
     /**
      * This method called when a new messages received from the some folder.

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/sync/tasks/LoadMessageDetailsSyncTask.java

@@ -8,19 +8,25 @@
 
 import android.os.Messenger;
 
+import com.flowcrypt.email.api.email.model.AttachmentInfo;
 import com.flowcrypt.email.api.email.sync.SyncListener;
 import com.sun.mail.gimap.GmailSSLStore;
 import com.sun.mail.iap.Argument;
 import com.sun.mail.iap.ProtocolException;
 import com.sun.mail.iap.Response;
 import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.protocol.BODY;
+import com.sun.mail.imap.protocol.BODYSTRUCTURE;
 import com.sun.mail.imap.protocol.FetchResponse;
 import com.sun.mail.imap.protocol.IMAPProtocol;
 import com.sun.mail.util.ASCIIUtility;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.mail.Folder;
 import javax.mail.Message;
+import javax.mail.Part;
 
 /**
  * This task load a detail information of the some message. At now this task creates and executes
@@ -54,18 +60,21 @@ public LoadMessageDetailsSyncTask(String ownerKey, int requestCode, String folde
     }
 
     @Override
-    public void run(GmailSSLStore gmailSSLStore, SyncListener syncListener) throws Exception {
+    public void run(GmailSSLStore gmailSSLStore, final SyncListener syncListener) throws Exception {
         IMAPFolder imapFolder = (IMAPFolder) gmailSSLStore.getFolder(folderName);
         imapFolder.open(Folder.READ_WRITE);
 
         if (syncListener != null) {
-            String rawMessage = (String) imapFolder.doCommand(new IMAPFolder.ProtocolCommand() {
+            MessageDetails messageDetails = (MessageDetails) imapFolder.doCommand(new IMAPFolder
+                    .ProtocolCommand() {
                 public Object doCommand(IMAPProtocol imapProtocol)
                         throws ProtocolException {
                     String rawMessage = null;
+                    List<AttachmentInfo> attachmentInfoList = new ArrayList<>();
 
                     Argument args = new Argument();
                     Argument list = new Argument();
+                    list.writeString("BODYSTRUCTURE");
                     list.writeString("RFC822.SIZE");
                     list.writeString("BODY[]<0.204800>");
                     args.writeArgument(list);
@@ -84,20 +93,58 @@ public Object doCommand(IMAPProtocol imapProtocol)
                             if (body != null && body.getByteArrayInputStream() != null) {
                                 rawMessage = ASCIIUtility.toString(body.getByteArrayInputStream());
                             }
+
+                            getInformationAboutAttachments(attachmentInfoList,
+                                    fetchResponse.getItem(BODYSTRUCTURE.class));
                         }
                     }
 
                     imapProtocol.notifyResponseHandlers(responses);
                     imapProtocol.handleResult(serverStatusResponse);
 
-                    return rawMessage;
+                    return new MessageDetails(rawMessage, attachmentInfoList);
                 }
             });
 
-            syncListener.onMessageDetailsReceived(imapFolder, uid, rawMessage, ownerKey,
-                    requestCode);
+            syncListener.onMessageDetailsReceived(imapFolder, uid, messageDetails.rawMessage,
+                    messageDetails.attachmentInfoList, ownerKey, requestCode);
         }
 
         imapFolder.close(false);
     }
+
+    /**
+     * Get an information about the email attachments if they exist.
+     *
+     * @param attachmentInfoList  The attachments info list where we will add a new found attachment
+     *                            info.
+     * @param parentBodyStructure The parent {@link BODYSTRUCTURE}.
+     */
+    private void getInformationAboutAttachments(List<AttachmentInfo> attachmentInfoList,
+                                                BODYSTRUCTURE parentBodyStructure) {
+        if (parentBodyStructure != null) {
+            BODYSTRUCTURE[] bodyStructureArray = parentBodyStructure.bodies;
+
+            for (BODYSTRUCTURE bodystructure : bodyStructureArray) {
+                if (bodystructure.bodies == null) {
+                    if (Part.ATTACHMENT.equalsIgnoreCase(bodystructure.disposition)) {
+                        attachmentInfoList.add(new AttachmentInfo(bodystructure.dParams.get
+                                ("FILENAME"), bodystructure.size, bodystructure.type));
+                    }
+                } else {
+                    getInformationAboutAttachments(attachmentInfoList, bodystructure);
+                }
+            }
+        }
+    }
+
+    private class MessageDetails {
+        String rawMessage;
+        List<AttachmentInfo> attachmentInfoList;
+
+        MessageDetails(String rawMessage, List<AttachmentInfo> attachmentInfoList) {
+            this.rawMessage = rawMessage;
+            this.attachmentInfoList = attachmentInfoList;
+        }
+    }
 }

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

@@ -22,6 +22,7 @@
 import com.flowcrypt.email.api.email.FoldersManager;
 import com.flowcrypt.email.api.email.JavaEmailConstants;
 import com.flowcrypt.email.api.email.gmail.GmailConstants;
+import com.flowcrypt.email.api.email.model.AttachmentInfo;
 import com.flowcrypt.email.api.email.sync.GmailSynsManager;
 import com.flowcrypt.email.api.email.sync.SyncListener;
 import com.flowcrypt.email.database.dao.source.imap.ImapLabelsDaoSource;
@@ -222,8 +223,10 @@ public void onMessagesMoved(IMAPFolder sourceImapFolder, IMAPFolder destinationI
     }
 
     @Override
-    public void onMessageDetailsReceived(IMAPFolder imapFolder, long uid, String
-            rawMessageWithOutAttachments, String ownerKey, int requestCode) {
+    public void onMessageDetailsReceived(IMAPFolder imapFolder, long uid,
+                                         String rawMessageWithOutAttachments,
+                                         List<AttachmentInfo> attachmentInfoList,
+                                         String ownerKey, int requestCode) {
         try {
             MessageDaoSource messageDaoSource = new MessageDaoSource();
             com.flowcrypt.email.api.email.Folder folder = FoldersManager.generateFolder(imapFolder,