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

Commit 0eee80f0 authored by Jesse Vincent's avatar Jesse Vincent
Browse files

renamed deleteMessagesOlderThan to clearMessagesOlderThan to better 

reflect that it just nukes local copies rather than the synced copies
parent 7d40596a

src/com/fsck/k9/controller/MessagingController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2939,7 +2939,7 @@ public class MessagingController implements Runnable 




            localFolder.appendMessages(messages);

            localFolder.appendMessages(messages);





            localFolder.deleteMessagesOlderThan(nowTime - (15 * 60 * 1000));

            localFolder.clearMessagesOlderThan(nowTime - (15 * 60 * 1000));





        }

        }

        catch (Throwable it)

        catch (Throwable it)

src/com/fsck/k9/mail/store/LocalStore.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -3438,7 +3438,7 @@ public class LocalStore extends Store implements Serializable, LocalStoreMigrati 
            throw new MessagingException("Cannot call getUidFromMessageId on LocalFolder");

            throw new MessagingException("Cannot call getUidFromMessageId on LocalFolder");

        }

        }





        private void deleteMessagesWhere(final String whereClause, final String[] params)  throws MessagingException

        private void clearMessagesWhere(final String whereClause, final String[] params)  throws MessagingException

        {

        {

            open(OpenMode.READ_ONLY);

            open(OpenMode.READ_ONLY);

            Message[] messages  = LocalStore.this.getMessages(

            Message[] messages  = LocalStore.this.getMessages(
@@ -3463,7 +3463,7 @@ public class LocalStore extends Store implements Serializable, LocalStoreMigrati 
            resetUnreadAndFlaggedCounts();

            resetUnreadAndFlaggedCounts();

        }

        }





        public void deleteMessagesOlderThan(long cutoff) throws MessagingException

        public void clearMessagesOlderThan(long cutoff) throws MessagingException

        {

        {

            final String where = "folder_id = ? and date < ?";

            final String where = "folder_id = ? and date < ?";

            final String[] params = new String[]

            final String[] params = new String[]
@@ -3471,7 +3471,7 @@ public class LocalStore extends Store implements Serializable, LocalStoreMigrati 
                Long.toString(mFolderId), Long.toString(cutoff)

                Long.toString(mFolderId), Long.toString(cutoff)

            };

            };





            deleteMessagesWhere(where, params);

            clearMessagesWhere(where, params);

        }

        }