Changeset 272

Timestamp:

08/10/08 12:54:59 PM (5 months ago)

Author:

octorian

Message:

Merge of fixes

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap

Files:

• ImapClient.java (modified) (1 diff)
• ImapProtocol.java (modified) (4 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java

@@ -325 +325 @@
             FolderTreeItem childItem = getFolderItem(baseFolder, resp.name, resp.canSelect);
                 baseFolder.addChild(childItem);
-                if(resp.hasChildren || !childrenExtension) {
+                if(resp.hasChildren || (!resp.noInferiors && !childrenExtension)) {
                     // The folder has children, so lets go and list them
                     if(depth+1 < globalConfig.getImapMaxFolderDepth()) {

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

@@ -659 +659 @@
         }
         
+        // Workaround for mail servers that sometimes append untagged
+        // replies to the end of this response
+        int lastLineIndex = rawList.length - 1;
+        while(lastLineIndex > 0 && rawList[lastLineIndex].startsWith("* ")) {
+            lastLineIndex--;
+        }
+        
         StringBuffer msgBuf = new StringBuffer();
-        for(int i=1;i<rawList.length-1;i++) {
+        for(int i=1;i<lastLineIndex;i++) {
             msgBuf.append(rawList[i] + "\n");
         }
-        String lastLine = rawList[rawList.length-1];
+        String lastLine = rawList[lastLineIndex];
         msgBuf.append(lastLine.substring(0, lastLine.lastIndexOf(')')));
         return msgBuf.toString();
@@ -759 +766 @@
     public static class ListResponse {
         public boolean hasChildren;
+        public boolean noInferiors;
         public boolean canSelect;
         public boolean marked;
@@ -829 +837 @@
             response.canSelect = !(flagStr.indexOf("\\Noselect") != -1);
             response.hasChildren = (flagStr.indexOf("\\HasChildren") != -1);
+            response.noInferiors = (flagStr.indexOf("\\Noinferiors") != -1);
             response.marked = (flagStr.indexOf("\\Marked") != -1);
 
@@ -1062 +1071 @@
         
         if(connection.available() > 0) {
-                System.err.println("-->connection.available() == " + connection.available());
                 result = connection.receive();
-                System.err.println("-->Read in "+result.length());
-                System.err.println("-->connection.available() == " + connection.available());
         }
         else {