Fixed a reply for sent messages. | Close #73.

Author: DenBond7

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

@@ -8,6 +8,7 @@
 
 import android.os.Parcel;
 
+import com.flowcrypt.email.api.email.Folder;
 import com.flowcrypt.email.model.messages.MessagePart;
 
 import java.util.ArrayList;
@@ -38,20 +39,36 @@ public IncomingMessageInfo[] newArray(int size) {
     };
 
     private ArrayList<String> from;
+    private ArrayList<String> to;
     private Date receiveDate;
     private String originalRawMessageWithoutAttachments;
     private List<MessagePart> messageParts;
+    private Folder folder;
 
     public IncomingMessageInfo() {
     }
 
-    protected IncomingMessageInfo(Parcel in) {
+    public IncomingMessageInfo(Parcel in) {
         super(in);
         this.from = in.createStringArrayList();
+        this.to = in.createStringArrayList();
         long tmpReceiveDate = in.readLong();
         this.receiveDate = tmpReceiveDate == -1 ? null : new Date(tmpReceiveDate);
         this.originalRawMessageWithoutAttachments = in.readString();
         this.messageParts = in.createTypedArrayList(MessagePart.CREATOR);
+        this.folder = in.readParcelable(Folder.class.getClassLoader());
+    }
+
+    @Override
+    public String toString() {
+        return "IncomingMessageInfo{" +
+                "from=" + from +
+                "to=" + to +
+                ", receiveDate=" + receiveDate +
+                ", originalRawMessageWithoutAttachments='" + originalRawMessageWithoutAttachments + '\'' +
+                ", messageParts=" + messageParts +
+                ", folder=" + folder +
+                "} " + super.toString();
     }
 
     @Override
@@ -63,20 +80,11 @@ public int describeContents() {
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
         dest.writeStringList(this.from);
+        dest.writeStringList(this.to);
         dest.writeLong(this.receiveDate != null ? this.receiveDate.getTime() : -1);
         dest.writeString(this.originalRawMessageWithoutAttachments);
         dest.writeTypedList(this.messageParts);
-    }
-
-    @Override
-    public String toString() {
-        return "IncomingMessageInfo{" +
-                "from=" + from +
-                ", receiveDate=" + receiveDate +
-                ", originalRawMessageWithoutAttachments='" + originalRawMessageWithoutAttachments
-                + '\'' +
-                ", messageParts=" + messageParts +
-                "} " + super.toString();
+        dest.writeParcelable(this.folder, flags);
     }
 
     /**
@@ -116,4 +124,20 @@ public List<MessagePart> getMessageParts() {
     public void setMessageParts(List<MessagePart> messageParts) {
         this.messageParts = messageParts;
     }
+
+    public Folder getFolder() {
+        return folder;
+    }
+
+    public void setFolder(Folder folder) {
+        this.folder = folder;
+    }
+
+    public ArrayList<String> getTo() {
+        return to;
+    }
+
+    public void setTo(ArrayList<String> to) {
+        this.to = to;
+    }
 }

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

@@ -78,6 +78,7 @@ public class MessageDetailsFragment extends BaseGmailFragment implements View.On
     private IncomingMessageInfo incomingMessageInfo;
     private GeneralMessageDetails generalMessageDetails;
     private Folder folder;
+    private FoldersManager.FolderType folderType;
 
     private boolean isAdditionalActionEnable;
     private boolean isDeleteActionEnable;
@@ -199,7 +200,8 @@ public void handleSuccessLoaderResult(int loaderId, Object result) {
                 imageButtonReplyAll.setVisibility(View.VISIBLE);
                 isAdditionalActionEnable = true;
                 getActivity().invalidateOptionsMenu();
-                this.incomingMessageInfo = (IncomingMessageInfo) result;
+                incomingMessageInfo = (IncomingMessageInfo) result;
+                incomingMessageInfo.setFolder(folder);
                 updateMessageBody();
                 UIUtil.exchangeViewVisibility(getContext(), false, progressView, layoutMessageParts);
                 break;
@@ -289,8 +291,7 @@ protected void updateMessageBody() {
      * @param folder The folder where current message exists.
      */
     private void updateActionsVisibility(Folder folder) {
-        FoldersManager.FolderType folderType = FoldersManager.getFolderTypeForImapFodler(folder
-                .getAttributes());
+        folderType = FoldersManager.getFolderTypeForImapFodler(folder.getAttributes());
 
         if (folderType != null) {
             switch (folderType) {
@@ -403,7 +404,11 @@ private void updateViews() {
             String subject = TextUtils.isEmpty(generalMessageDetails.getSubject()) ? getString(R.string.no_subject) :
                     generalMessageDetails.getSubject();
 
-            textViewSenderAddress.setText(generalMessageDetails.getFrom()[0]);
+            if (folderType == FoldersManager.FolderType.SENT) {
+                textViewSenderAddress.setText(generalMessageDetails.getTo()[0]);
+            } else {
+                textViewSenderAddress.setText(generalMessageDetails.getFrom()[0]);
+            }
             textViewSubject.setText(subject);
             textViewDate.setText(dateFormat.format(generalMessageDetails.getReceivedDateInMillisecond()));
         }

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

@@ -20,6 +20,7 @@
 import android.widget.TextView;
 
 import com.flowcrypt.email.R;
+import com.flowcrypt.email.api.email.FoldersManager;
 import com.flowcrypt.email.api.email.model.IncomingMessageInfo;
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo;
 import com.flowcrypt.email.database.dao.source.ContactsDaoSource;
@@ -55,6 +56,7 @@ public class SecureReplyFragment extends BaseSendSecurityMessageFragment {
     private View layoutContent;
     private View progressBarCheckContactsDetails;
     private TextInputLayout textInputLayoutReplyEmailMessage;
+    private FoldersManager.FolderType folderType;
 
     public SecureReplyFragment() {
     }
@@ -80,6 +82,10 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if (getActivity().getIntent() != null) {
             this.incomingMessageInfo = getActivity().getIntent().getParcelableExtra
                     (SecureReplyActivity.EXTRA_KEY_INCOMING_MESSAGE_INFO);
+            if (incomingMessageInfo != null && incomingMessageInfo.getFolder() != null) {
+                this.folderType = FoldersManager.getFolderTypeForImapFodler(incomingMessageInfo.getFolder()
+                        .getAttributes());
+            }
         }
     }
 
@@ -122,7 +128,8 @@ public OutgoingMessageInfo getOutgoingMessageInfo() {
         outgoingMessageInfo.setRawReplyMessage(
                 incomingMessageInfo.getOriginalRawMessageWithoutAttachments());
         List<PgpContact> pgpContacts = new ContactsDaoSource().getPgpContactsListFromDatabase
-                (getContext(), incomingMessageInfo.getFrom());
+                (getContext(), FoldersManager.FolderType.SENT == folderType ? incomingMessageInfo.getTo() :
+                        incomingMessageInfo.getFrom());
 
         outgoingMessageInfo.setToPgpContacts(pgpContacts.toArray(new PgpContact[0]));
 
@@ -143,7 +150,11 @@ public View getUpdateInfoAboutContactsProgressBar() {
 
     @Override
     public List<String> getContactsEmails() {
-        return incomingMessageInfo.getFrom();
+        if (FoldersManager.FolderType.SENT == folderType) {
+            return incomingMessageInfo.getTo();
+        } else {
+            return incomingMessageInfo.getFrom();
+        }
     }
 
     @Override
@@ -185,21 +196,17 @@ public void onClick(View v) {
         return false;
     }
 
-    /**
-     * Update an incoming message info and views on the current screen.
-     */
-    public void setIncomingMessageInfo(IncomingMessageInfo incomingMessageInfo) {
-        this.incomingMessageInfo = incomingMessageInfo;
-        updateViews();
-    }
-
     /**
      * Update views on the screen. This method can be called when we need to update the current
      * screen.
      */
     private void updateViews() {
         if (incomingMessageInfo != null) {
-            textViewReplyRecipient.setText(incomingMessageInfo.getFrom().get(0));
+            if (FoldersManager.FolderType.SENT == folderType) {
+                textViewReplyRecipient.setText(incomingMessageInfo.getTo().get(0));
+            } else {
+                textViewReplyRecipient.setText(incomingMessageInfo.getFrom().get(0));
+            }
         }
     }
 

FlowCrypt/src/main/java/com/flowcrypt/email/ui/loader/DecryptMessageAsyncTaskLoader.java

@@ -85,13 +85,19 @@ private IncomingMessageInfo parseRawMessage(String rawMessage) throws Exception
         if (rawMessage != null) {
             Js js = new Js(getContext(), new SecurityStorageConnector(getContext()));
             ProcessedMime processedMime = js.mime_process(rawMessage);
-            ArrayList<String> addresses = new ArrayList<>();
+            ArrayList<String> addressesFrom = new ArrayList<>();
+            ArrayList<String> addressesTo = new ArrayList<>();
 
             for (MimeAddress mimeAddress : processedMime.getAddressHeader("from")) {
-                addresses.add(mimeAddress.getAddress());
+                addressesFrom.add(mimeAddress.getAddress());
             }
 
-            incomingMessageInfo.setFrom(addresses);
+            for (MimeAddress mimeAddress : processedMime.getAddressHeader("to")) {
+                addressesTo.add(mimeAddress.getAddress());
+            }
+
+            incomingMessageInfo.setFrom(addressesFrom);
+            incomingMessageInfo.setTo(addressesTo);
             incomingMessageInfo.setSubject(processedMime.getStringHeader("subject"));
             incomingMessageInfo.setReceiveDate(new Date(processedMime.getTimeHeader("date")));
             incomingMessageInfo.setOriginalRawMessageWithoutAttachments(rawMessage);