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

Commit e9b9fea5 authored by cketti's avatar cketti Committed by cketti
Browse files

Remove folder sync class

parent 78121655

core/mail/folder/api/src/main/kotlin/app/k9mail/core/mail/folder/api/FolderDetails.kt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ data class FolderDetails( 
    val folder: Folder,

    val isInTopGroup: Boolean,

    val isIntegrate: Boolean,

    val syncClass: FolderClass,

    val isSyncEnabled: Boolean,

    val displayClass: FolderClass,

    val isNotificationsEnabled: Boolean,

    val isPushEnabled: Boolean,

legacy/account/src/main/java/app/k9mail/legacy/account/Account.kt

+0 −9
Original line number Diff line number Diff line
@@ -490,15 +490,6 @@ class Account( 
        return spamFolderId != null

    }



    @Synchronized

    fun updateFolderSyncMode(syncMode: FolderMode): Boolean {

        val oldSyncMode = folderSyncMode

        folderSyncMode = syncMode



        return (oldSyncMode == FolderMode.NONE && syncMode != FolderMode.NONE) ||

            (oldSyncMode != FolderMode.NONE && syncMode == FolderMode.NONE)

    }



    @Synchronized

    fun isSortAscending(sortType: SortType): Boolean {

        return sortAscending.getOrPut(sortType) { sortType.isDefaultAscending }

legacy/core/src/main/java/com/fsck/k9/controller/MessagingController.java

+2 −5
Original line number Diff line number Diff line
@@ -2284,22 +2284,19 @@ public class MessagingController implements MessagingControllerRegistry, Messagi 


        try {

            Account.FolderMode aDisplayMode = account.getFolderDisplayMode();

            Account.FolderMode aSyncMode = account.getFolderSyncMode();



            LocalStore localStore = localStoreProvider.getInstance(account);

            for (final LocalFolder folder : localStore.getPersonalNamespaces(false)) {

                folder.open();



                FolderClass fDisplayClass = folder.getDisplayClass();

                FolderClass fSyncClass = folder.getSyncClass();



                if (LocalFolder.isModeMismatch(aDisplayMode, fDisplayClass)) {

                    // Never sync a folder that isn't displayed

                    continue;

                }



                if (LocalFolder.isModeMismatch(aSyncMode, fSyncClass)) {

                    // Do not sync folders in the wrong class

                if (!folder.isSyncEnabled()) {

                    // Do not sync folders that are not enabled for sync.

                    continue;

                }

                synchronizeFolder(account, folder, ignoreLastCheckedTime, notify, listener, notificationState);

legacy/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class FolderSettingsProvider(val preferences: Preferences, val account: Account) 
        return FolderSettings(

            visibleLimit = account.displayCount,

            displayClass = storage.getString("$prefix.displayMode", null).toFolderClass(FolderClass.NO_CLASS),

            syncClass = storage.getString("$prefix.syncMode", null).toFolderClass(FolderClass.INHERITED),

            isSyncEnabled = storage.getBoolean("$prefix.syncEnabled", false),

            isNotificationsEnabled = storage.getBoolean("$prefix.notificationsEnabled", false),

            isPushEnabled = storage.getBoolean("$prefix.pushEnabled", false),

            inTopGroup = storage.getBoolean("$prefix.inTopGroup", false),
@@ -30,7 +30,7 @@ class FolderSettingsProvider(val preferences: Preferences, val account: Account) 
        val editor = preferences.createStorageEditor()



        editor.remove("$prefix.displayMode")

        editor.remove("$prefix.syncMode")

        editor.remove("$prefix.syncEnabled")

        editor.remove("$prefix.notificationsEnabled")

        editor.remove("$prefix.pushEnabled")

        editor.remove("$prefix.inTopGroup")

legacy/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java

+4 −10
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class LocalFolder { 
    private int visibleLimit = -1;



    private FolderClass displayClass = FolderClass.NO_CLASS;

    private FolderClass syncClass = FolderClass.INHERITED;

    private boolean syncEnabled = false;

    private boolean notificationsEnabled = false;



    private boolean isInTopGroup = false;
@@ -177,8 +177,7 @@ public class LocalFolder { 
        String displayClass = cursor.getString(LocalStore.FOLDER_DISPLAY_CLASS_INDEX);

        this.displayClass = FolderClass.valueOf((displayClass == null) ? noClass : displayClass);

        this.notificationsEnabled = cursor.getInt(LocalStore.FOLDER_NOTIFICATIONS_ENABLED_INDEX) == 1;

        String syncClass = cursor.getString(LocalStore.FOLDER_SYNC_CLASS_INDEX);

        this.syncClass = FolderClass.valueOf((syncClass == null) ? noClass : syncClass);

        syncEnabled = cursor.getInt(LocalStore.FOLDER_SYNC_ENABLED_INDEX) == 1;

        String moreMessagesValue = cursor.getString(LocalStore.MORE_MESSAGES_INDEX);

        moreMessages = MoreMessages.fromDatabaseName(moreMessagesValue);

        name = cursor.getString(LocalStore.FOLDER_NAME_INDEX);
@@ -300,18 +299,13 @@ public class LocalFolder { 
        return displayClass;

    }



    public FolderClass getSyncClass() {

        return (FolderClass.INHERITED == syncClass) ? getDisplayClass() : syncClass;

    }



    public void setDisplayClass(FolderClass displayClass) throws MessagingException {

        this.displayClass = displayClass;

        updateFolderColumn("display_class", this.displayClass.name());

    }



    public void setSyncClass(FolderClass syncClass) throws MessagingException {

        this.syncClass = syncClass;

        updateFolderColumn("poll_class", this.syncClass.name());

    public boolean isSyncEnabled() {

        return syncEnabled;

    }



    public boolean isNotificationsEnabled() {