From 9335dacd463b4452fcc79d6cb1c191821d87ae42 Mon Sep 17 00:00:00 2001
From: Apoorv Khatreja <apoorvkhatreja@gmail.com>
Date: Tue, 2 Aug 2011 02:19:12 +0530
Subject: [PATCH] Added a separate handler for status responses to parse the
 resp-text tokens contained in these responses.

---
 .../k9/mail/store/ImapResponseParser.java     | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java
index 02f029f30..c4ef06fd4 100644
--- a/src/com/fsck/k9/mail/store/ImapResponseParser.java
+++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java
@@ -1,5 +1,9 @@
 package com.fsck.k9.mail.store;
 
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.fsck.k9.K9;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.filter.FixedLengthInputStream;
 import com.fsck.k9.mail.filter.PeekableInputStream;
@@ -68,9 +72,21 @@ public class ImapResponseParser {
     private void readTokens(ImapResponse response) throws IOException {
         response.clear();
         Object token;
-        while ((token = readToken(response)) != null) {
-            if (!(token instanceof ImapList)) {
-                response.add(token);
+        String firstString = parseAtom();
+
+        response.add(firstString);
+
+        if (mIn.peek() == ' ') {
+            mIn.read(); //Skip space if parseAtom() didn't do it.
+        }
+
+        if (isStatusResponse(firstString)) {
+            parseStatusResponse(response);
+        } else {
+            while ((token = readToken(response)) != null) {
+                if (!(token instanceof ImapList)) {
+                    response.add(token);
+                }
             }
 
             /*
@@ -85,6 +101,26 @@ public class ImapResponseParser {
         response.mCompleted = true;
     }
 
+    void parseStatusResponse(ImapResponse parent) throws IOException {
+
+        int next = mIn.peek();
+        if (next == '[') {
+            parseSequence(parent);
+            if (mIn.peek() == ' ') { // Skip following space
+                mIn.read();
+            }
+        }
+
+        String rest = readStringUntil('\r');
+        expect('\n');
+
+        if (!TextUtils.isEmpty(rest)) {
+            // The rest is free-form text.
+            parent.add(rest);
+        }
+
+    }
+
     /**
      * Reads the next token of the response. The token can be one of: String -
      * for NIL, QUOTED, NUMBER, ATOM. Object - for LITERAL.
@@ -488,7 +524,7 @@ public class ImapResponseParser {
         }
     }
 
-    public static boolean isStatusResponse(String symbol) {
+    public boolean isStatusResponse(String symbol) {
         return symbol.equalsIgnoreCase("OK") ||
                symbol.equalsIgnoreCase("NO") ||
                symbol.equalsIgnoreCase("BAD") ||