Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95c47fcd authored by Daniel Applebaum's avatar Daniel Applebaum
Browse files

Restore ability for FolderMessageList "Refresh" to get a new list of 

folders

Automatically clean up deleted messages in Outbox (make deleted
messages destroyed); don't try to send deleted messages, destroy
messages in outbox when deleting.  (Yep, the first and third items are
redundant, but will automatically clean up damaged outboxes)
parent a81facc6

src/com/android/email/MessagingController.java

+11 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ public class MessagingController implements Runnable { 
            Store localStore = Store.getInstance(account.getLocalStoreUri(), mApplication);

            Folder[] localFolders = localStore.getPersonalNamespaces();



            if ( localFolders == null || localFolders.length == 0) {

            if ( refreshRemote || localFolders == null || localFolders.length == 0) {

                doRefreshRemote(account, listener);

                return;

            }
@@ -1795,6 +1795,10 @@ s * critical data as fast as possible, and then we'll fill in the de 


            Transport transport = Transport.getInstance(account.getTransportUri());

            for (Message message : localMessages) {

              if (message.isSet(Flag.DELETED)) {

                message.setFlag(Flag.X_DESTROYED, true);

                continue;

              }

                try {

                    localFolder.fetch(new Message[] { message }, fp, null);

                    try {
@@ -1903,9 +1907,14 @@ s * critical data as fast as possible, and then we'll fill in the de 
                // TODO: Turn the fetch/copy/delete into an atomic move

                localFolder.fetch(new Message[] { message }, fp, null);

                localFolder.copyMessages(new Message[] { message }, localTrashFolder);

                if (folder.equals(account.getOutboxFolderName())) {

                  message.setFlag(Flag.X_DESTROYED, true);

                }

                else {

                  message.setFlag(Flag.DELETED, true);

                }

              }

            }

            if (listener != null) {

              listener.messageDeleted(account, folder, message);

            }