From e285cde0b3b271d625bab773e391ffa5b0bf7d51 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 15 Oct 2018 05:28:27 +0000
Subject: [PATCH] Revert "Folder NOOP"

This reverts commit acf3cfadd47da518d095c611ec8300debace92f0.
---
 .idea/misc.xml                                |  2 +-
 .../eu/faircode/email/ServiceSynchronize.java | 22 ++++---------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68edd..99202cc2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 0817f7a9..c92b79c5 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -52,12 +52,10 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.sun.mail.iap.ConnectionException;
-import com.sun.mail.iap.ProtocolException;
 import com.sun.mail.imap.AppendUID;
 import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.IMAPMessage;
 import com.sun.mail.imap.IMAPStore;
-import com.sun.mail.imap.protocol.IMAPProtocol;
 import com.sun.mail.util.FolderClosedIOException;
 import com.sun.mail.util.MailConnectException;
 
@@ -1026,24 +1024,12 @@ public class ServiceSynchronize extends LifecycleService {
                                 if (!istore.isConnected())
                                     throw new StoreClosedException(istore);
 
-                                for (final EntityFolder folder : folders.keySet()) {
-                                    IMAPFolder ifolder = folders.get(folder);
+                                for (EntityFolder folder : folders.keySet())
                                     if (capIdle) {
-                                        try {
-                                            ifolder.doCommand(new IMAPFolder.ProtocolCommand() {
-                                                public Object doCommand(IMAPProtocol p)
-                                                        throws ProtocolException {
-                                                    Log.i(Helper.TAG, folder.name + " do noop");
-                                                    p.simpleCommand("NOOP", null);
-                                                    return null;
-                                                }
-                                            });
-                                        } catch (MessagingException ex) {
-                                            throw new FolderClosedException(ifolder, "NOOP", ex);
-                                        }
+                                        if (!folders.get(folder).isOpen())
+                                            throw new FolderClosedException(folders.get(folder));
                                     } else
-                                        synchronizeMessages(account, folder, ifolder, state);
-                                }
+                                        synchronizeMessages(account, folder, folders.get(folder), state);
                             }
 
                         }