Provide for doing a full poll/sync of a folder whenever the IMAP IDLE

connection is established.  Turned off for now, but just get rid of
the false && on line 2641 in order to enable it.

src/com/fsck/k9/MessagingControllerPushReceiver.java

@@ -14,6 +14,7 @@ import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.service.SleepService;
 
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 public class MessagingControllerPushReceiver implements PushReceiver
 {
@@ -75,6 +76,37 @@ public class MessagingControllerPushReceiver implements PushReceiver
         controller.messagesArrived(account, folder, messages, false);
     }
     
+    public void syncFolder(Folder folder)
+    {
+        Log.i(K9.LOG_TAG, "syncFolder(" + folder.getName() + ")");
+        final CountDownLatch latch = new CountDownLatch(1);
+        controller.synchronizeMailbox(account, folder.getName(), new MessagingListener()
+        {
+            public void synchronizeMailboxFinished(Account account, String folder,
+                    int totalMessagesInMailbox, int numNewMessages)
+            {
+                latch.countDown();
+            }
+            
+            public void synchronizeMailboxFailed(Account account, String folder,
+                              String message)
+            {
+                latch.countDown();
+            }
+        });
+
+        Log.i(K9.LOG_TAG, "syncFolder(" + folder.getName() + ") about to await latch release");
+        try
+        {
+            latch.await();
+            Log.i(K9.LOG_TAG, "syncFolder(" + folder.getName() + ") got latch release");
+        }
+        catch (Exception e)
+        {
+            Log.e(K9.LOG_TAG, "Interrupted while awaiting latch release", e);
+        }
+    }
+
     public void sleep(long millis)
     {
         SleepService.sleep(mApplication, millis, threadWakeLock.get(), K9.PUSH_WAKE_LOCK_TIMEOUT);

src/com/fsck/k9/mail/PushReceiver.java

@@ -6,6 +6,7 @@ public interface PushReceiver
 {
     public void acquireWakeLock();
     public void releaseWakeLock();
+    public void syncFolder(Folder folder);
     public void messagesArrived(Folder folder, List<Message> mess);
     public void messagesFlagsChanged(Folder folder, List<Message> mess);
     public String getPushState(String folderName);

src/com/fsck/k9/mail/store/ImapStore.java

@@ -1094,7 +1094,10 @@ public class ImapStore extends Store
                 if (o != null && o instanceof Part)
                 {
                     Part part = (Part) o;
-                    String partId = part.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA)[0];
+                    String[] parts = part.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA);
+                    if (parts != null)
+                    {
+                        String partId = parts[0];
                         if ("TEXT".equals(partId))
                         {
                             fetchFields.add(String.format("BODY.PEEK[TEXT]<0.%d>", FETCH_BODY_SANE_SUGGESTED_SIZE));
@@ -1105,6 +1108,7 @@ public class ImapStore extends Store
                         }
                     }
                 }
+            }
 
             try
             {
@@ -2615,7 +2619,7 @@ public class ImapStore extends Store
                             {
                                 Log.e(K9.LOG_TAG, "Unable to get oldUidNext for " + getLogId(), e);
                             }
-
+                            ImapConnection oldConnection = mConnection;
                             List<ImapResponse> responses = internalOpen(OpenMode.READ_ONLY);
                             if (mConnection == null)
                             {
@@ -2634,6 +2638,10 @@ public class ImapStore extends Store
                             {
                                 handleUntaggedResponses(responses);
                             }
+                            if (false && mConnection != oldConnection)
+                            {
+                                receiver.syncFolder(ImapFolderPusher.this);
+                            }
                             int startUid = oldUidNext;
                             if (startUid < uidNext - mAccount.getDisplayCount())
                             {