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

Commit ed727883 authored by cketti's avatar cketti
Browse files

Some cleanup

parent 37adb419

legacy/core/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ dependencies { 


    implementation(projects.plugins.openpgpApiLib.openpgpApi)

    implementation(projects.feature.telemetry.api)

    implementation(projects.core.featureflags)



    api(libs.androidx.annotation)
@@ -35,7 +36,6 @@ dependencies { 
    implementation(libs.timber)

    implementation(libs.mime4j.core)

    implementation(libs.mime4j.dom)

    implementation(projects.core.featureflags)



    testApi(projects.core.testing)

    testApi(projects.core.android.testing)

legacy/core/src/main/java/com/fsck/k9/controller/ArchiveOperations.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ internal class ArchiveOperations( 
        messages: List<LocalMessage>,

        archiveFolderId: Long,

    ) {

        val operation = when (featureFlagProvider.provide("move_and_mark_as_read".toFeatureFlagKey())) {

        val operation = when (featureFlagProvider.provide("archive_marks_as_read".toFeatureFlagKey())) {

            FeatureFlagResult.Enabled -> MoveOrCopyFlavor.MOVE_AND_MARK_AS_READ

            FeatureFlagResult.Disabled -> MoveOrCopyFlavor.MOVE

            FeatureFlagResult.Unavailable -> MoveOrCopyFlavor.MOVE

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

+2 −5
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ public class MessagingController implements MessagingControllerRegistry, Messagi 
    private final DraftOperations draftOperations;

    private final NotificationOperations notificationOperations;

    private final ArchiveOperations archiveOperations;

    private final FeatureFlagProvider featureFlagProvider;





    private volatile boolean stopped = false;
@@ -160,7 +159,6 @@ public class MessagingController implements MessagingControllerRegistry, Messagi 
        this.saveMessageDataCreator = saveMessageDataCreator;

        this.specialLocalFoldersCreator = specialLocalFoldersCreator;

        this.localDeleteOperationDecider = localDeleteOperationDecider;

        this.featureFlagProvider = featureFlagProvider;



        controllerThread = new Thread(new Runnable() {

            @Override
@@ -176,7 +174,7 @@ public class MessagingController implements MessagingControllerRegistry, Messagi 


        draftOperations = new DraftOperations(this, messageStoreManager, saveMessageDataCreator);

        notificationOperations = new NotificationOperations(notificationController, preferences, messageStoreManager);

        archiveOperations = new ArchiveOperations(this, this.featureFlagProvider);

        archiveOperations = new ArchiveOperations(this, featureFlagProvider);

    }



    private void initializeControllerExtensions(List<ControllerExtension> controllerExtensions) {
@@ -1787,8 +1785,7 @@ public class MessagingController implements MessagingControllerRegistry, Messagi 
                        unreadCountAffected = true;

                        message.setFlag(Flag.SEEN, true);

                    }

                }

                else {

                } else {

                    if (!unreadCountAffected && !message.isSet(Flag.SEEN)) {

                        unreadCountAffected = true;

                    }