Changeset 579

Timestamp:

12/30/09 11:45:34 (2 years ago)

Author:

octorian

Message:

Minor local-folder fixes, still more to come

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/LocalMailStore.java (modified) (4 diffs)
• model/MessageNode.java (modified) (3 diffs)
• ui/NodeIcons.java (modified) (1 diff)

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

@@ -41 +41 @@
 import net.rim.device.api.system.UnsupportedOperationException;
 
+import org.logicprobe.LogicMail.conf.GlobalConfig;
 import org.logicprobe.LogicMail.conf.MailSettings;
 import org.logicprobe.LogicMail.message.FolderMessage;
@@ -57 +58 @@
  */
 public class LocalMailStore extends AbstractMailStore {
+    private GlobalConfig globalConfig;
     private FolderTreeItem rootFolder;
     private ThreadQueue threadQueue;
@@ -63 +65 @@
     public LocalMailStore() {
         super();
-
+        globalConfig = MailSettings.getInstance().getGlobalConfig();
         threadQueue = new ThreadQueue();
         folderMaildirMap = new Hashtable();
@@ -312 +314 @@
                 }
                 else {
-                        String folderUrl = MailSettings.getInstance().getGlobalConfig().getLocalDataLocation();
+                        String folderUrl = globalConfig.getLocalDataLocation() + "local/";
                         try {
                                 FileConnection fileConnection = (FileConnection)Connector.open(folderUrl);

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

@@ -267 +267 @@
          * @return true, if the message is associated with a mailbox from a non-local account
          */
-        boolean isCachable() {
+        public boolean isCachable() {
                 if(parent != null
                                 && parent.getParentAccount() != null
@@ -1128 +1128 @@
                 public void run() {
                         boolean messageLoaded = false;
-                        try {
-                                MessageNode tempNode = MailFileManager.getInstance().readMessageNode(parent, messageToken, true);
-                                if(tempNode != null) {
-                                    MimeMessagePart messageStructure = tempNode.getMessageStructure();
-                                    MimeMessageContent[] messageContent = tempNode.getAllMessageContent();
-                                    
-                                    if(messageStructure != null && messageContent != null && messageContent.length > 0) {
-                                        setMessageStructure(messageStructure);
-                                        setMessageSource(tempNode.getMessageSource());
-                                        putMessageContent(messageContent);
-                                        messageLoaded = true;
-                                    }
-                                }
-                        } catch (IOException e) {
-                                EventLogger.logEvent(AppInfo.GUID,
-                                ("Unable to read message from cache\r\n"
-                                        + e.getMessage()).getBytes(),
-                                EventLogger.ERROR);
-                        }
-                        
+                        if(parent.getParentAccount().getStatus() != AccountNode.STATUS_LOCAL) {
+                        try {
+                                MessageNode tempNode = MailFileManager.getInstance().readMessageNode(parent, messageToken, true);
+                                if(tempNode != null) {
+                                    MimeMessagePart messageStructure = tempNode.getMessageStructure();
+                                    MimeMessageContent[] messageContent = tempNode.getAllMessageContent();
+                                    
+                                    if(messageStructure != null && messageContent != null && messageContent.length > 0) {
+                                                setMessageStructure(messageStructure);
+                                                setMessageSource(tempNode.getMessageSource());
+                                                putMessageContent(messageContent);
+                                                messageLoaded = true;
+                                    }
+                                }
+                        } catch (IOException e) {
+                                EventLogger.logEvent(AppInfo.GUID,
+                                ("Unable to read message from cache\r\n"
+                                        + e.getMessage()).getBytes(),
+                                EventLogger.ERROR);
+                        }
+                        }
                         if(!messageLoaded) {
                                 AbstractMailStore mailStore = parent.getParentAccount().getMailStore();
@@ -1166 +1167 @@
                         }
                         
-                        try {
-                                MimeMessageContent[] content = MailFileManager.getInstance().readMessageContent(parent, messageToken);
-                                if(content != null && content.length > 0) {
-                                        putMessageContent(content);
-                                        for(int i=0; i<content.length; i++) {
-                                                contentToLoad.removeElement(content[i].getMessagePart());
-                                        }
-                                }
-                        } catch (IOException e) {
-                                EventLogger.logEvent(AppInfo.GUID,
-                                ("Unable to read message from cache\r\n"
-                                        + e.getMessage()).getBytes(),
-                                EventLogger.ERROR);
+                        if(parent.getParentAccount().getStatus() != AccountNode.STATUS_LOCAL) {
+                        try {
+                                MimeMessageContent[] content = MailFileManager.getInstance().readMessageContent(parent, messageToken);
+                                if(content != null && content.length > 0) {
+                                        putMessageContent(content);
+                                        for(int i=0; i<content.length; i++) {
+                                                contentToLoad.removeElement(content[i].getMessagePart());
+                                        }
+                                }
+                        } catch (IOException e) {
+                                EventLogger.logEvent(AppInfo.GUID,
+                                ("Unable to read message from cache\r\n"
+                                        + e.getMessage()).getBytes(),
+                                EventLogger.ERROR);
+                        }
                         }
                         

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/NodeIcons.java

@@ -200 +200 @@
 
                 public void visit(MessageNode node) {
-                    boolean unloaded = !node.hasCachedContent() && !node.hasMessageContent();
+                    boolean unloaded = !node.hasCachedContent() && !node.hasMessageContent() && node.isCachable();
                         int flags = node.getFlags();
                 if((flags & MessageNode.Flag.DELETED) != 0)