Changeset 564

Timestamp:

12/28/09 17:27:58 (2 years ago)

Author:

octorian

Message:

Cache progress fixes

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailConnectionHandler.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/mail/IncomingMailConnectionHandler.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/pop/PopClient.java (modified) (4 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/AccountNode.java (modified) (5 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/MailFileManager.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/MessageNodeCallback.java (added)
• LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java (modified) (1 diff)

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

@@ -657 +657 @@
                         }
                         else if(type == MailProgressHandler.TYPE_PROCESSING && max > 0){
-                                if(count > 0) { count = count / max; }
+                                if(count > 0) { count = (count * 100) / max; }
                                 showStatus(messageStart + count + processingMessageEnd);
                         }

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

@@ -271 +271 @@
             }
 
-            if(resultMessages != null && listener != null) {
-                if(param == null) {
-                    listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages });
+            if(listener != null) {
+                if(resultMessages != null) {
+                    if(param == null) {
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages });
+                    }
+                    else {
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages, param });
+                    }
                 }
-                else {
-                    listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages, param });
+                
+                // If this is the last update of the sequence, make sure we notify
+                // the listener with a null array so it knows we are done.
+                if(folderMessage == null) {
+                    if(param == null) {
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null });
+                    }
+                    else {
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null, param });
+                    }
                 }
             }

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

@@ -624 +624 @@
                 callback.folderMessageUpdate(result[i]);
             }
+            callback.folderMessageUpdate(null);
         }
         else {
@@ -644 +645 @@
                 uids[i] = ((ImapMessageToken)messageTokens[i]).getImapMessageUid();
         }
+        
         imapProtocol.executeFetchEnvelopeUid(uids, new ImapFetchEnvelopeCallback(callback), progressHandler);
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/pop/PopClient.java

@@ -36 +36 @@
 import java.util.Hashtable;
 
+import net.rim.device.api.util.Arrays;
+
 import org.logicprobe.LogicMail.conf.AccountConfig;
 import org.logicprobe.LogicMail.conf.ConnectionConfig;
@@ -389 +391 @@
                         indices[i] = ((PopMessageToken)messageTokens[i]).getMessageIndex();
                 }
+                Arrays.sort(indices, 0, indices.length);
+                
+                if(!globalConfig.getDispOrder()) {
+                    int[] reverseIndices = new int[indices.length];
+                    for(int i=0; i<indices.length; i++) {
+                        reverseIndices[indices.length - i - 1] = indices[i];
+                    }
+                    indices = reverseIndices;
+                }
                 
                 getFolderMessagesImpl(indices, false, callback, progressHandler);
@@ -398 +409 @@
         String uid;
         MessageEnvelope env;
-        int preCount;
-        int postCount = connection.getBytesReceived();
         for(int i=0; i<indices.length; i++) {
-            preCount = postCount;
             if(!flagsOnly) {
                 headerText = popProtocol.executeTop(indices[i], 0);
@@ -413 +421 @@
                     new PopMessageToken(indices[i], uid),
                     env, indices[i], uid.hashCode());
-            postCount = connection.getBytesReceived();
-            if(progressHandler != null) { progressHandler.mailProgress(MailProgressHandler.TYPE_NETWORK, (postCount - preCount), -1); }
+            if(progressHandler != null) { progressHandler.mailProgress(MailProgressHandler.TYPE_PROCESSING, i + 1, indices.length); }
 
             callback.folderMessageUpdate(folderMessage);

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

@@ -81 +81 @@
     private boolean shutdown = false;
     private DataStore accountDataStore;
+    
+    /** Map of folders to message to fetch for them. */
+    private Hashtable folderMessagesToFetch;
+    
     private MailSenderListener mailSenderListener = new MailSenderListener() {
             public void messageSent(MessageSentEvent e) {
@@ -106 +110 @@
         this.rootMailbox = null;
         this.pathMailboxMap = new Hashtable();
+        this.folderMessagesToFetch = new Hashtable();
 
         this.mailStore = mailStore;
@@ -578 +583 @@
                 // be checked and additional actions requested accordingly.
                 //TODO: Implement flags-only logic
-                Vector messagesToFetch = null;
                     for (int i = 0; i < folderMessages.length; i++) {
                         MessageNode messageNode =
@@ -591 +595 @@
                         }
                         else {
-                                if(messagesToFetch == null) { messagesToFetch = new Vector(); }
-                                messagesToFetch.addElement(folderMessages[i].getMessageToken());
+                            synchronized(folderMessagesToFetch) {
+                                Vector messagesToFetch = (Vector)folderMessagesToFetch.get(e.getFolder());
+                                if(messagesToFetch == null) {
+                                    messagesToFetch = new Vector();
+                                    folderMessagesToFetch.put(e.getFolder(), messagesToFetch);
+                                }
+                                messagesToFetch.addElement(folderMessages[i].getMessageToken());
+                            }
                         }
-                    }
-                    if(messagesToFetch != null) {
-                        MessageToken[] fetchArray = new MessageToken[messagesToFetch.size()];
-                        messagesToFetch.copyInto(fetchArray);
-                        mailStore.requestFolderMessagesSet(e.getFolder(), fetchArray);
                     }
             }
@@ -612 +617 @@
                     addedMessages.copyInto(addedMessagesArray);
                     mailboxNode.addMessages(addedMessagesArray);
+            }
+        }
+        else {
+            synchronized(folderMessagesToFetch) {
+                Vector messagesToFetch = (Vector)folderMessagesToFetch.remove(e.getFolder());
+                if(messagesToFetch != null) {
+                    MessageToken[] fetchArray = new MessageToken[messagesToFetch.size()];
+                    messagesToFetch.copyInto(fetchArray);
+                    mailStore.requestFolderMessagesSet(e.getFolder(), fetchArray);
+                }
             }
         }

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

@@ -216 +216 @@
         }
         
+    public void readMessageNodes(MailboxNode mailboxNode, MessageNodeCallback callback) throws IOException {
+        if(cacheUrl == null) { callback.messageNodeUpdated(null); }
+
+        FileConnection fileConnection = getMailboxFileConnection(mailboxNode);
+        String mailboxUrl = fileConnection.getURL();
+        Enumeration e = fileConnection.list(MSG_FILTER, false);
+        while(e.hasMoreElements()) {
+            String fileUrl = mailboxUrl + e.nextElement();
+            MessageNode messageNode = readMessageNode(fileUrl);
+            if(messageNode != null) {
+                callback.messageNodeUpdated(messageNode);
+            }
+        }
+        fileConnection.close();
+        callback.messageNodeUpdated(null);
+    }
+        
         public MessageNode readMessageNode(MailboxNode mailboxNode, MessageToken messageToken, boolean loadContent) throws IOException {
                 if(cacheUrl == null) { return null; }

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

@@ -72 +72 @@
         private boolean hasAppend;
         
+        private Object fetchLock = new Object();
+        private RefreshMessagesThread fetchThread;
+        
         public final static int TYPE_NORMAL = 0;
         public final static int TYPE_INBOX  = 1;
@@ -701 +704 @@
     public void refreshMessages() {
         // Fetch messages stored in the cache
-        if(parentAccount.getAccountConfig() != null) {
-                //TODO: Make this thread-safe and prevent redundant calls
-                Thread fetchThread = new Thread() {
-                        public void run() {
-                                try {
-                                        MessageNode[] messages =
-                                                MailFileManager.getInstance().readMessageNodes(MailboxNode.this);
-                                        MailboxNode.this.addMessages(messages);
-                                } catch (IOException e) {
-                                        EventLogger.logEvent(AppInfo.GUID,
-                                        ("Unable to read messages from cache\r\n"
-                                                + e.getMessage()).getBytes(),
-                                        EventLogger.ERROR);
-                                }
-                                
-                        // Request flags and tokens for recent messages from the mail store
-                        parentAccount.getMailStore().requestFolderMessagesRecent(folderTreeItem, true);
-                        }
-                };
-                fetchThread.start();
-        }
-        else {
-                parentAccount.getMailStore().requestFolderMessagesRecent(this.folderTreeItem);
-        }
+        synchronized(fetchLock) {
+            if(parentAccount.getAccountConfig() != null) {
+                if(fetchThread == null || !fetchThread.isAlive()) {
+                    fetchThread = new RefreshMessagesThread();
+                    fetchThread.run();
+                }
+            }
+            else {
+                parentAccount.getMailStore().requestFolderMessagesRecent(this.folderTreeItem);
+            }
+        }
+    }
+    
+    private class RefreshMessagesThread extends Thread implements MessageNodeCallback {
+
+        public RefreshMessagesThread() {
+            
+        }
+        
+        public void run() {
+            try {
+                MailFileManager.getInstance().readMessageNodes(MailboxNode.this, this);
+            } catch (IOException e) {
+                EventLogger.logEvent(AppInfo.GUID,
+                        ("Unable to read messages from cache\r\n"
+                                + e.getMessage()).getBytes(),
+                                EventLogger.ERROR);
+            }
+        }
+
+        public void messageNodeUpdated(MessageNode messageNode) {
+            if(messageNode != null) {
+                MailboxNode.this.addMessage(messageNode);
+            }
+            else {
+                // Request flags and tokens for recent messages from the mail store
+                parentAccount.getMailStore().requestFolderMessagesRecent(folderTreeItem, true);
+            }
+        }        
     }
     

trunk/LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java

@@ -213 +213 @@
             assertNotNull(event);
             assertEquals("INBOX", event.getFolder().getName());
-            assertNotNull(event.getMessages());
             
-            // Collect folder messages within the event
             FolderMessage[] messages = event.getMessages();
-            for(int j=0; j<messages.length; j++) {
-                folderMessagesAvailable.addElement(messages[j]);
+            if(i < eventCount - 1) {
+                assertNotNull(messages);
+
+                // Collect folder messages within the event
+                for(int j=0; j<messages.length; j++) {
+                    folderMessagesAvailable.addElement(messages[j]);
+                }
             }
         }