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

Commit 4bc47e18 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Delete emails on the email server when deleted locally

parent a9500929

k9mail/src/main/java/io/eelo/mail/Account.java

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class Account implements BaseAccount, AccountConfig { 
    public static final boolean DEFAULT_SORT_ASCENDING = false;

    public static final long NO_OPENPGP_KEY = 0;



    private DeletePolicy deletePolicy = DeletePolicy.NEVER;

    private DeletePolicy deletePolicy = DeletePolicy.ON_DELETE;



    private final String accountUuid;

    private String storeUri;
@@ -424,7 +424,7 @@ public class Account implements BaseAccount, AccountConfig { 
        notifySelfNewMail = storage.getBoolean(accountUuid + ".notifySelfNewMail", true);

        notifyContactsMailOnly = storage.getBoolean(accountUuid + ".notifyContactsMailOnly", false);

        notifySync = storage.getBoolean(accountUuid + ".notifyMailCheck", false);

        deletePolicy =  DeletePolicy.fromInt(storage.getInt(accountUuid + ".deletePolicy", DeletePolicy.NEVER.setting));

        deletePolicy =  DeletePolicy.fromInt(storage.getInt(accountUuid + ".deletePolicy", DeletePolicy.ON_DELETE.setting));

        inboxFolderName = storage.getString(accountUuid + ".inboxFolderName", INBOX);

        draftsFolderName = storage.getString(accountUuid + ".draftsFolderName", "Drafts");

        sentFolderName = storage.getString(accountUuid + ".sentFolderName", "Sent");

k9mail/src/main/java/io/eelo/mail/activity/setup/AccountConfigImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class AccountConfigImpl implements AccountConfig, Parcelable { 
    private int automaticCheckIntervalMinutes = 5;

    private Account.FolderMode folderPushMode = Account.FolderMode.FIRST_CLASS;



    private Account.DeletePolicy deletePolicy = Account.DeletePolicy.NEVER;

    private Account.DeletePolicy deletePolicy = Account.DeletePolicy.ON_DELETE;



    private Preferences preferences;

k9mail/src/main/java/io/eelo/mail/preferences/AccountSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class AccountSettings { 
                new Settings.V(1, new Settings.BooleanSetting(Account.DEFAULT_QUOTED_TEXT_SHOWN))

        ));

        s.put("deletePolicy", Settings.versions(

                new Settings.V(1, new DeletePolicySetting(Account.DeletePolicy.NEVER))

                new Settings.V(1, new DeletePolicySetting(Account.DeletePolicy.ON_DELETE))

        ));

        s.put("displayCount", Settings.versions(

                new Settings.V(1, new IntegerResourceSetting(K9.DEFAULT_VISIBLE_LIMIT,