Modified the search the private keys backups algorithm. | #105.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.java

@@ -6,8 +6,14 @@
 
 package com.flowcrypt.email.api.email;
 
+import com.sun.mail.imap.IMAPFolder;
+
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
+import javax.mail.MessagingException;
+
 /**
  * @author Denis Bondarenko
  *         Date: 29.09.2017
@@ -16,7 +22,26 @@
  */
 
 public class EmailUtil {
+    /**
+     * Generate an unique content id.
+     *
+     * @return
+     */
     public static String generateContentId() {
         return "<" + UUID.randomUUID().toString() + "@flowcrypt" + ">";
     }
+
+    /**
+     * Check if current folder has {@link JavaEmailConstants#FOLDER_ATTRIBUTE_NO_SELECT}. If the
+     * folder contains it attribute we will not show this folder in the list.
+     *
+     * @param imapFolder The {@link IMAPFolder} object.
+     * @return true if current folder contains attribute
+     * {@link JavaEmailConstants#FOLDER_ATTRIBUTE_NO_SELECT}, false otherwise.
+     * @throws MessagingException
+     */
+    public static boolean isFolderHasNoSelectAttribute(IMAPFolder imapFolder) throws MessagingException {
+        List<String> attributes = Arrays.asList(imapFolder.getAttributes());
+        return attributes.contains(JavaEmailConstants.FOLDER_ATTRIBUTE_NO_SELECT);
+    }
 }

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/FoldersManager.java

@@ -13,7 +13,6 @@
 import com.flowcrypt.email.database.dao.source.imap.ImapLabelsDaoSource;
 import com.sun.mail.imap.IMAPFolder;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -183,7 +182,7 @@ public void clear() {
      */
     public void addFolder(IMAPFolder imapFolder, String folderAlias) throws MessagingException {
         if (imapFolder != null
-                && !isFolderHasNoSelectAttribute(imapFolder)
+                && !EmailUtil.isFolderHasNoSelectAttribute(imapFolder)
                 && !TextUtils.isEmpty(imapFolder.getFullName())
                 && !folders.containsKey(imapFolder.getFullName())) {
             this.folders.put(prepareFolderKey(imapFolder), generateFolder(imapFolder, folderAlias));
@@ -285,20 +284,6 @@ private String prepareFolderKey(Folder folder) {
         }
     }
 
-    /**
-     * Check if current folder has {@link JavaEmailConstants#FOLDER_ATTRIBUTE_NO_SELECT}. If the
-     * folder contains it attribute we will not show this folder in the list.
-     *
-     * @param imapFolder The {@link IMAPFolder} object.
-     * @return true if current folder contains attribute
-     * {@link JavaEmailConstants#FOLDER_ATTRIBUTE_NO_SELECT}, false otherwise.
-     * @throws MessagingException
-     */
-    private boolean isFolderHasNoSelectAttribute(IMAPFolder imapFolder) throws MessagingException {
-        List<String> attributes = Arrays.asList(imapFolder.getAttributes());
-        return attributes.contains(JavaEmailConstants.FOLDER_ATTRIBUTE_NO_SELECT);
-    }
-
     /**
      * This class contains information about all servers folders types.
      */

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

@@ -269,12 +269,10 @@ public void sendMessage(String ownerKey, int requestCode, OutgoingMessageInfo ou
      *
      * @param ownerKey         The name of the reply to {@link android.os.Messenger}.
      * @param requestCode      The unique request code for identify the current action.
-     * @param searchTermString The search phrase.
      */
-    public void loadPrivateKeys(String ownerKey, int requestCode, String searchTermString) {
+    public void loadPrivateKeys(String ownerKey, int requestCode) {
         try {
-            syncTaskBlockingQueue.put(new LoadPrivateKeysFromEmailBackupSyncTask(searchTermString,
-                    ownerKey, requestCode));
+            syncTaskBlockingQueue.put(new LoadPrivateKeysFromEmailBackupSyncTask(ownerKey, requestCode));
         } catch (InterruptedException e) {
             e.printStackTrace();
         }

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

@@ -9,6 +9,7 @@
 import android.os.Messenger;
 import android.text.TextUtils;
 
+import com.flowcrypt.email.api.email.EmailUtil;
 import com.flowcrypt.email.api.email.JavaEmailConstants;
 import com.flowcrypt.email.api.email.SearchBackupsUtil;
 import com.flowcrypt.email.api.email.sync.SyncListener;
@@ -42,44 +43,43 @@
  */
 
 public class LoadPrivateKeysFromEmailBackupSyncTask extends BaseSyncTask {
-    private String searchTermString;
-
     /**
      * The base constructor.
      *
-     * @param searchTermString The search phrase.
-     * @param ownerKey         The name of the reply to {@link Messenger}.
-     * @param requestCode      The unique request code for the reply to {@link Messenger}.
+     * @param ownerKey    The name of the reply to {@link Messenger}.
+     * @param requestCode The unique request code for the reply to {@link Messenger}.
      */
-    public LoadPrivateKeysFromEmailBackupSyncTask(String searchTermString,
-                                                  String ownerKey, int requestCode) {
+    public LoadPrivateKeysFromEmailBackupSyncTask(String ownerKey, int requestCode) {
         super(ownerKey, requestCode);
-        this.searchTermString = searchTermString;
     }
 
     @Override
     public void runIMAPAction(AccountDao accountDao, Store store, SyncListener syncListener) throws Exception {
         super.runIMAPAction(accountDao, store, syncListener);
 
         if (syncListener != null) {
-            IMAPFolder imapFolder = (IMAPFolder) store.getFolder(JavaEmailConstants.FOLDER_INBOX);
-            imapFolder.open(Folder.READ_ONLY);
-
+            Folder[] folders = store.getDefaultFolder().list("*");
             List<String> keys = new ArrayList<>();
 
-            SearchTerm searchTerm = SearchBackupsUtil.generateSearchTerms(accountDao.getEmail());
-            Message[] foundMessages = imapFolder.search(searchTerm);
+            for (Folder folder : folders) {
+                if (!EmailUtil.isFolderHasNoSelectAttribute((IMAPFolder) folder)) {
+                    folder.open(Folder.READ_ONLY);
+
+                    SearchTerm searchTerm = SearchBackupsUtil.generateSearchTerms(accountDao.getEmail());
+                    Message[] foundMessages = folder.search(searchTerm);
 
-            for (Message message : foundMessages) {
-                String key = getKeyFromMessageIfItExists(message);
-                if (!TextUtils.isEmpty(key) && !keys.contains(key)) {
-                    keys.add(key);
+                    for (Message message : foundMessages) {
+                        String key = getKeyFromMessageIfItExists(message);
+                        if (!TextUtils.isEmpty(key) && !keys.contains(key)) {
+                            keys.add(key);
+                        }
+                    }
+
+                    folder.close(false);
                 }
             }
 
             syncListener.onPrivateKeyFound(accountDao, keys, ownerKey, requestCode);
-
-            imapFolder.close(false);
         }
     }
 

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

@@ -615,10 +615,7 @@ public void handleMessage(Message message) {
 
                     case MESSAGE_LOAD_PRIVATE_KEYS:
                         if (emailSyncManager != null && action != null) {
-                            String searchTermString = (String) action.getObject();
-
-                            emailSyncManager.loadPrivateKeys(action.getOwnerKey(), action.getRequestCode(),
-                                    searchTermString);
+                            emailSyncManager.loadPrivateKeys(action.getOwnerKey(), action.getRequestCode());
                         }
                         break;
 

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

@@ -24,10 +24,8 @@
 import com.flowcrypt.email.api.email.Folder;
 import com.flowcrypt.email.api.email.model.OutgoingMessageInfo;
 import com.flowcrypt.email.api.email.sync.SyncErrorTypes;
-import com.flowcrypt.email.js.Js;
 import com.flowcrypt.email.service.EmailSyncService;
 
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 
 /**
@@ -162,22 +160,18 @@ public void requestActiveAccount(int requestCode) {
      * Load the user private keys.
      *
      * @param requestCode The unique request code for identify the current action.
-     * @param accountName The account name.
      */
-    public void loadPrivateKeys(int requestCode, String accountName) {
+    public void loadPrivateKeys(int requestCode) {
         if (checkBound()) return;
         try {
-            String searchTermString = new Js(this, null).api_gmail_query_backups(accountName);
-
-            EmailSyncService.Action action = new EmailSyncService.Action(getReplyMessengerName(),
-                    requestCode, searchTermString);
+            EmailSyncService.Action action = new EmailSyncService.Action(getReplyMessengerName(), requestCode, null);
 
             Message message = Message.obtain(null, EmailSyncService.MESSAGE_LOAD_PRIVATE_KEYS,
                     action);
             message.replyTo = replyMessenger;
 
             syncServiceMessenger.send(message);
-        } catch (RemoteException | IOException e) {
+        } catch (RemoteException e) {
             e.printStackTrace();
         }
     }

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/BackupSettingsActivity.java

@@ -78,7 +78,7 @@ public void onReplyFromSyncServiceReceived(int requestCode, int resultCode, Obje
         switch (requestCode) {
             case R.id.syns_get_active_account:
                 account = (String) obj;
-                loadPrivateKeys(R.id.syns_load_private_keys, account);
+                loadPrivateKeys(R.id.syns_load_private_keys);
                 break;
 
             case R.id.syns_load_private_keys:
@@ -124,7 +124,7 @@ public void onClick(View v) {
                                 UIUtil.exchangeViewVisibility(
                                         BackupSettingsActivity.this, true,
                                         progressBar, layoutContent);
-                                loadPrivateKeys(R.id.syns_load_private_keys, account);
+                                loadPrivateKeys(R.id.syns_load_private_keys);
                             }
                         });
                 break;

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

@@ -11,15 +11,15 @@
 import android.support.v4.content.AsyncTaskLoader;
 import android.text.TextUtils;
 
+import com.flowcrypt.email.api.email.EmailUtil;
 import com.flowcrypt.email.api.email.JavaEmailConstants;
 import com.flowcrypt.email.api.email.SearchBackupsUtil;
 import com.flowcrypt.email.api.email.gmail.GmailConstants;
 import com.flowcrypt.email.api.email.protocol.OpenStoreHelper;
 import com.flowcrypt.email.model.KeyDetails;
 import com.flowcrypt.email.model.results.LoaderResult;
 import com.google.android.gms.auth.GoogleAuthUtil;
-import com.sun.mail.gimap.GmailFolder;
-import com.sun.mail.gimap.GmailSSLStore;
+import com.sun.mail.imap.IMAPFolder;
 
 import org.apache.commons.io.IOUtils;
 
@@ -33,6 +33,7 @@
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
 import javax.mail.Part;
+import javax.mail.Store;
 import javax.mail.internet.MimeBodyPart;
 
 /**
@@ -69,24 +70,29 @@ public LoaderResult loadInBackground() {
         try {
             String token = GoogleAuthUtil.getToken(getContext(), account,
                     JavaEmailConstants.OAUTH2 + GmailConstants.SCOPE_MAIL_GOOGLE_COM);
-            GmailSSLStore gmailSSLStore = OpenStoreHelper.openAndConnectToGimapsStore(token, account.name);
-            GmailFolder gmailFolder = (GmailFolder) gmailSSLStore.getFolder(
-                    JavaEmailConstants.FOLDER_INBOX);
-            gmailFolder.open(Folder.READ_ONLY);
-
-            Message[] foundMessages = gmailFolder.search(SearchBackupsUtil.generateSearchTerms(account.name));
-
-            for (Message message : foundMessages) {
-                String key = getKeyFromMessageIfItExists(message);
-                if (!TextUtils.isEmpty(key) && privateKeyNotExistsInList(privateKeyDetailsList,
-                        key)) {
-                    privateKeyDetailsList.add(new KeyDetails(key,
-                            KeyDetails.Type.EMAIL));
+
+            Store store = OpenStoreHelper.openAndConnectToGimapsStore(token, account.name);
+            Folder[] folders = store.getDefaultFolder().list("*");
+
+            for (Folder folder : folders) {
+                if (!EmailUtil.isFolderHasNoSelectAttribute((IMAPFolder) folder)) {
+                    folder.open(Folder.READ_ONLY);
+
+                    Message[] foundMessages = folder.search(SearchBackupsUtil.generateSearchTerms(account.name));
+
+                    for (Message message : foundMessages) {
+                        String key = getKeyFromMessageIfItExists(message);
+                        if (!TextUtils.isEmpty(key) && privateKeyNotExistsInList(privateKeyDetailsList, key)) {
+                            privateKeyDetailsList.add(new KeyDetails(key,
+                                    KeyDetails.Type.EMAIL));
+                        }
+                    }
+
+                    folder.close(false);
                 }
             }
 
-            gmailFolder.close(false);
-            gmailSSLStore.close();
+            store.close();
             return new LoaderResult(privateKeyDetailsList, null);
         } catch (Exception e) {
             e.printStackTrace();