Merge branch 'readonly-p4-donut' into donut

src/com/android/email/MessagingController.java

@@ -1113,6 +1113,20 @@ public class MessagingController implements Runnable {
                         localTrashFolder.updateMessage(localMessage);
                     }
                 }
+                
+                /**
+                 * This will be called if the deleted message doesn't exist and can't be
+                 * deleted (e.g. it was already deleted from the server.)  In this case,
+                 * attempt to delete the local copy as well.
+                 */
+                public void onMessageNotFound(Message message) throws MessagingException {
+                    LocalMessage localMessage =
+                        (LocalMessage) localTrashFolder.getMessage(message.getUid());
+                    if (localMessage != null) {
+                        localMessage.setFlag(Flag.DELETED, true);
+                    }
+                }
+
             }
             );
         }

src/com/android/email/mail/Folder.java

@@ -210,8 +210,15 @@ public abstract class Folder {
          * @param message The message for which the UID changed
          * @param newUid The new UID for the message
          */
-        public void onMessageUidChange(Message message, String newUid) 
+        public void onMessageUidChange(Message message, String newUid) throws MessagingException;
-                throws MessagingException;
+
+        /**
+         * The operation could not be completed because the message doesn't exist
+         * (for example, it was already deleted from the server side.)
+         * @param message The message that does not exist
+         * @throws MessagingException
+         */
+        public void onMessageNotFound(Message message) throws MessagingException;
     }
 
     @Override