Changeset 581

Timestamp:

12/30/09 13:22:16 (2 years ago)

Author:

octorian

Message:

Added flags-changing support (delete/undelete/replied) to the local mail store

Location:

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

Files:

• LocalMailStore.java (modified) (4 diffs)
• MaildirFolder.java (modified) (4 diffs)

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

@@ -112 +112 @@
     
     public boolean hasUndelete() {
-        return false;
+        return true;
     }
 
@@ -182 +182 @@
     public void requestMessage(MessageToken messageToken) {
         LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
-        
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
         
-        if(requestFolder != null && requestFolder != null) {
+        if(requestFolder != null) {
                 threadQueue.invokeLater(new RequestMessageRunnable(requestFolder, localMessageToken));
         }
@@ -230 +229 @@
     
     public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) {
-        throw new UnsupportedOperationException("Not yet implemented");
+        LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
+        FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
+        
+        if(requestFolder != null && !messageFlags.isDeleted()) {
+            MessageFlags newFlags = copyMessageFlags(messageFlags);
+            newFlags.setDeleted(true);
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags));
+        }
     }
 
     public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) {
-        throw new UnsupportedOperationException("Not yet implemented");
+        LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
+        FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
+        
+        if(requestFolder != null && messageFlags.isDeleted()) {
+            MessageFlags newFlags = copyMessageFlags(messageFlags);
+            newFlags.setDeleted(false);
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags));
+        }
     }
 
     public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
+        LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
+        FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
+        
+        if(requestFolder != null && !messageFlags.isAnswered()) {
+            MessageFlags newFlags = copyMessageFlags(messageFlags);
+            newFlags.setAnswered(true);
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags));
+        }
+    }
+
+    private class UpdateMessageFlagsRunnable extends MaildirRunnable {
+        private LocalMessageToken localMessageToken;
+        private MessageFlags messageFlags;
+        
+        public UpdateMessageFlagsRunnable(
+                FolderTreeItem requestFolder,
+                LocalMessageToken localMessageToken,
+                MessageFlags messageFlags) {
+            super(requestFolder);
+            this.localMessageToken = localMessageToken;
+            this.messageFlags = messageFlags;
+        }
+
+        public void run() {
+            boolean flagsUpdated = false;
+            try {
+                maildirFolder.open();
+                flagsUpdated = maildirFolder.setMessageFlags(localMessageToken, messageFlags);
+                maildirFolder.close();
+            } catch (IOException e) {
+                System.err.println("Unable to read folder: " + e.toString());
+            }
+            
+            if(flagsUpdated) {
+                fireMessageFlagsChanged(localMessageToken, messageFlags);
+            }
+        }
+    }
+    
     public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) {
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(folder.getPath());
@@ -333 +382 @@
         }
     }
+    
+    private static MessageFlags copyMessageFlags(MessageFlags sourceFlags) {
+        return new MessageFlags(
+                sourceFlags.isSeen(),
+                sourceFlags.isAnswered(),
+                sourceFlags.isFlagged(),
+                sourceFlags.isDeleted(),
+                sourceFlags.isDraft(),
+                sourceFlags.isRecent(),
+                sourceFlags.isJunk());
+    }
 }

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

@@ -325 +325 @@
                 }
                 
-                // Get the filename unique id prefix, and shortcut out if not found
-                String uniqueId = localMessageToken.getMessageUid();
-                if(uniqueId == null) {
-                        return null;
-                }
-                
-                // Find the file matching the unique id, and shortcut out if not found
-                String matchingFile;
-                Enumeration e = fileConnection.list(uniqueId + '*', false);
-                if(e.hasMoreElements()) {
-                        matchingFile = (String)e.nextElement();
-                }
-                else {
-                        return null;
-                }
+                String matchingFile = getFileForToken(localMessageToken);
+                if(matchingFile == null) { return null; }
 
                 // Open the file, and read its contents
@@ -382 +369 @@
                 return buf.toString();
         }
-
+        
         /**
          * Appends a message to the maildir.
@@ -407 +394 @@
                 String uniqueId = buf.toString();
                 
-                buf.append("_2,");
-                if(initialFlags.isAnswered()) { buf.append('R'); }
-                if(initialFlags.isDeleted()) { buf.append('T'); }
-                if(initialFlags.isDraft()) { buf.append('D'); }
-                if(initialFlags.isFlagged()) { buf.append('F'); }
-                if(initialFlags.isSeen()) { buf.append('S'); }
+                appendFlagsToBuffer(buf, initialFlags);
 
                 if (EventLogger.getMinimumLevel() >= EventLogger.DEBUG_INFO) {
@@ -465 +447 @@
                 return result;
         }
+
+        /**
+         * Sets the flags of an existing message.
+         * 
+         * @param localMessageToken The token for the message to set flags for
+         * @param messageFlags The flags to set
+         * @return True if message flags were updated, false otherwise
+         */
+    public boolean setMessageFlags(LocalMessageToken localMessageToken, MessageFlags messageFlags) throws IOException {
+        if (EventLogger.getMinimumLevel() >= EventLogger.DEBUG_INFO) {
+            EventLogger.logEvent(AppInfo.GUID,
+                ("setMessageFlags(): " + localMessageToken.getMessageUid()).getBytes(),
+                EventLogger.DEBUG_INFO);
+        }
+        if(fileConnection == null) {
+            throw new IOException("Maildir not open");
+        }
+        
+        // Get the current filename
+        String messageFilename = getFileForToken(localMessageToken);
+        if(messageFilename == null) { return false; }
+        
+        // Create the new filename, and verify that it is different
+        StringBuffer buf = new StringBuffer();
+        buf.append(localMessageToken.getMessageUid());
+        appendFlagsToBuffer(buf, messageFlags);
+        String updatedFilename = buf.toString();
+        if(messageFilename.equals(updatedFilename)) { return false; }
+
+        FileConnection mailFileConnection =
+            (FileConnection)Connector.open(fileConnection.getURL() + '/' + messageFilename);
+        if(mailFileConnection.exists() && !mailFileConnection.isDirectory() && mailFileConnection.canRead()) {
+            mailFileConnection.rename(updatedFilename);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Get the filename matching a message token.
+     * 
+     * @param localMessageToken Token to find the file for
+     * @return Filename if found, or null if not found
+     */
+    private String getFileForToken(LocalMessageToken localMessageToken) throws IOException {
+        // Get the filename unique id prefix, and shortcut out if not found
+        String uniqueId = localMessageToken.getMessageUid();
+        if(uniqueId == null) {
+            return null;
+        }
+        
+        // Find the file matching the unique id, and shortcut out if not found
+        String matchingFile;
+        Enumeration e = fileConnection.list(uniqueId + '*', false);
+        if(e.hasMoreElements()) {
+            matchingFile = (String)e.nextElement();
+        }
+        else {
+            return null;
+        }
+        return matchingFile;
+    }
+
+    private static void appendFlagsToBuffer(StringBuffer buf, MessageFlags messageFlags) {
+        buf.append("_2,");
+        if(messageFlags.isAnswered()) { buf.append('R'); }
+        if(messageFlags.isDeleted()) { buf.append('T'); }
+        if(messageFlags.isDraft()) { buf.append('D'); }
+        if(messageFlags.isFlagged()) { buf.append('F'); }
+        if(messageFlags.isSeen()) { buf.append('S'); }
+    }
 }