Changeset 619

Timestamp:

01/20/10 18:19:59 (2 years ago)

Author:

octorian

Message:

Made a mailbox do a full (not flags-only) fetch on any refresh request other than the first one. This fixes the destination-folder issue with doing IMAP copy, and probably other issues as well.

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/FolderTreeItem.java (modified) (1 diff)
• model/MailboxNode.java (modified) (3 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/FolderTreeItem.java

@@ -245 +245 @@
         this.unseenCount = unseenCount;
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    public int hashCode() {
+        return 31 * 1 + (int) (uniqueId ^ (uniqueId >>> 32));
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        FolderTreeItem other = (FolderTreeItem) obj;
+        if (uniqueId != other.uniqueId) {
+            return false;
+        }
+        return true;
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java

@@ -75 +75 @@
         private int unseenMessageCount;
     private Vector pendingExpungeMessages = new Vector();
-        
+    
+    /**
+     * Flag to ensure that a flags-only fetch only happens on the first
+     * refresh of a network store backed mailbox.
+     */
+        private boolean fetchFlagsOnly = true;
+    
         protected Object fetchLock = new Object();
         protected Thread fetchThread;
@@ -936 +942 @@
     
     private class RefreshMessagesThread extends Thread implements MessageNodeCallback {
-
         public RefreshMessagesThread() {
             
@@ -959 +964 @@
             else {
                 // Request flags and tokens for recent messages from the mail store
-                parentAccount.getMailStore().requestFolderMessagesRecent(folderTreeItem, true);
+                parentAccount.getMailStore().requestFolderMessagesRecent(
+                        folderTreeItem,
+                        fetchFlagsOnly,
+                        new MailStoreRequestCallback() {
+                            public void mailStoreRequestComplete() {
+                                synchronized(fetchLock) {
+                                    fetchFlagsOnly = false;
+                                }
+                            }
+                            public void mailStoreRequestFailed(Throwable exception) { }
+                        });
             }
         }