Added a logic of showing the first matched alias with a private key.| #378

Author: DenBond7

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

@@ -566,7 +566,11 @@ public void handleSuccessLoaderResult(int loaderId, Object result) {
               new UserIdEmailsKeysDaoSource().getLongIdsByEmail(getContext(), email)));
         }
 
-        prepareAliasForReplyIfNeed(aliases);
+        if (incomingMessageInfo != null) {
+          prepareAliasForReplyIfNeed(aliases);
+        } else if (onChangeMessageEncryptedTypeListener.getMessageEncryptionType() == MessageEncryptionType.ENCRYPTED) {
+          showFirstMatchedAliasWithPrvKey(aliases);
+        }
 
         if (fromAddressesArrayAdapter.getCount() == 1) {
           if (imageButtonAliases.getVisibility() == View.VISIBLE) {
@@ -885,39 +889,62 @@ private List<PgpContact> runUpdatePgpContactsAction(List<PgpContact> pgpContacts
    * @param aliases A list of Gmail aliases.
    */
   private void prepareAliasForReplyIfNeed(List<String> aliases) {
-    if (incomingMessageInfo != null) {
-      ArrayList<String> toAddresses;
-      if (folderType == FoldersManager.FolderType.SENT) {
-        toAddresses = incomingMessageInfo.getFrom();
-      } else {
-        toAddresses = incomingMessageInfo.getTo();
-      }
+    MessageEncryptionType messageEncryptionType = onChangeMessageEncryptedTypeListener.getMessageEncryptionType();
 
-      if (toAddresses != null) {
-        String firstFoundedAlias = null;
-        for (String toAddress : toAddresses) {
-          if (firstFoundedAlias == null) {
-            for (String alias : aliases) {
-              if (alias.equalsIgnoreCase(toAddress)) {
+    ArrayList<String> toAddresses;
+    if (folderType == FoldersManager.FolderType.SENT) {
+      toAddresses = incomingMessageInfo.getFrom();
+    } else {
+      toAddresses = incomingMessageInfo.getTo();
+    }
+
+    if (toAddresses != null) {
+      String firstFoundedAlias = null;
+      for (String toAddress : toAddresses) {
+        if (firstFoundedAlias == null) {
+          for (String alias : aliases) {
+            if (alias.equalsIgnoreCase(toAddress)) {
+              if (messageEncryptionType == MessageEncryptionType.ENCRYPTED) {
+                if (fromAddressesArrayAdapter.hasPrvKey(alias)) {
+                  firstFoundedAlias = alias;
+                }
+              } else {
                 firstFoundedAlias = alias;
-                break;
               }
+              break;
             }
-          } else {
-            break;
           }
+        } else {
+          break;
         }
+      }
 
-        if (firstFoundedAlias != null) {
-          int position = fromAddressesArrayAdapter.getPosition(firstFoundedAlias);
-          if (position != -1) {
-            spinnerFrom.setSelection(position);
-          }
+      if (firstFoundedAlias != null) {
+        int position = fromAddressesArrayAdapter.getPosition(firstFoundedAlias);
+        if (position != -1) {
+          spinnerFrom.setSelection(position);
         }
       }
     }
   }
 
+  private void showFirstMatchedAliasWithPrvKey(List<String> aliases) {
+    String firstFoundedAliasWithPrvKey = null;
+    for (String alias : aliases) {
+      if (fromAddressesArrayAdapter.hasPrvKey(alias)) {
+        firstFoundedAliasWithPrvKey = alias;
+        break;
+      }
+    }
+
+    if (firstFoundedAliasWithPrvKey != null) {
+      int position = fromAddressesArrayAdapter.getPosition(firstFoundedAliasWithPrvKey);
+      if (position != -1) {
+        spinnerFrom.setSelection(position);
+      }
+    }
+  }
+
   /**
    * Remove not valid emails from the recipients list.
    *

FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/FromAddressesAdapter.java

@@ -88,4 +88,14 @@ public void updateKeyAvailable(String emailAddress, boolean hasPgp) {
       infoAboutKeysAvailable.put(emailAddress, hasPgp);
     }
   }
+
+  /**
+   * Check is given email address has a private key.
+   *
+   * @param emailAddress The given email address
+   * @return true if the given email address has a private key, otherwise false.
+   */
+  public boolean hasPrvKey(String emailAddress) {
+    return infoAboutKeysAvailable.containsKey(emailAddress) && infoAboutKeysAvailable.get(emailAddress);
+  }
 }