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

Commit f1a6c080 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1051-Update_to_upstream_v6_506' into 'main' 

1051-Update_to_upstream_v6.506

See merge request !132
parents 45f2e1f2 26274f65

app/core/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ dependencies { 
    implementation libs.moshi

    implementation libs.timber

    implementation libs.mime4j.core

    implementation libs.mime4j.dom



    testImplementation project(':mail:testing')

    testImplementation project(":backend:imap")

app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt

+0 −2
Original line number Diff line number Diff line
@@ -15,14 +15,12 @@ import com.fsck.k9.network.connectivityModule 
import com.fsck.k9.notification.coreNotificationModule

import com.fsck.k9.power.powerModule

import com.fsck.k9.preferences.preferencesModule

import com.fsck.k9.search.searchModule



val coreModules = listOf(

    mainModule,

    openPgpModule,

    autocryptModule,

    mailStoreModule,

    searchModule,

    extractorModule,

    htmlModule,

    quoteModule,

app/core/src/main/java/com/fsck/k9/FontSizes.java

+9 −48
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ public class FontSizes { 
    private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate";

    private static final String MESSAGE_LIST_PREVIEW = "fontSizeMessageListPreview";

    private static final String MESSAGE_VIEW_SENDER = "fontSizeMessageViewSender";

    private static final String MESSAGE_VIEW_TO = "fontSizeMessageViewTo";

    private static final String MESSAGE_VIEW_CC = "fontSizeMessageViewCC";

    private static final String MESSAGE_VIEW_BCC = "fontSizeMessageViewBCC";

    private static final String MESSAGE_VIEW_ADDITIONAL_HEADERS = "fontSizeMessageViewAdditionalHeaders";

    private static final String MESSAGE_VIEW_RECIPIENTS = "fontSizeMessageViewTo";

    private static final String MESSAGE_VIEW_SUBJECT = "fontSizeMessageViewSubject";

    private static final String MESSAGE_VIEW_DATE = "fontSizeMessageViewDate";

    private static final String MESSAGE_VIEW_CONTENT_PERCENT = "fontSizeMessageViewContentPercent";
@@ -40,10 +37,7 @@ public class FontSizes { 
    private int messageListDate;

    private int messageListPreview;

    private int messageViewSender;

    private int messageViewTo;

    private int messageViewCC;

    private int messageViewBCC;

    private int messageViewAdditionalHeaders;

    private int messageViewRecipients;

    private int messageViewSubject;

    private int messageViewDate;

    private int messageViewContentPercent;
@@ -57,10 +51,7 @@ public class FontSizes { 
        messageListPreview = FONT_DEFAULT;



        messageViewSender = FONT_DEFAULT;

        messageViewTo = FONT_DEFAULT;

        messageViewCC = FONT_DEFAULT;

        messageViewBCC = FONT_DEFAULT;

        messageViewAdditionalHeaders = FONT_DEFAULT;

        messageViewRecipients = FONT_DEFAULT;

        messageViewSubject = FONT_DEFAULT;

        messageViewDate = FONT_DEFAULT;

        messageViewContentPercent = 100;
@@ -75,10 +66,7 @@ public class FontSizes { 
        editor.putInt(MESSAGE_LIST_PREVIEW, messageListPreview);



        editor.putInt(MESSAGE_VIEW_SENDER, messageViewSender);

        editor.putInt(MESSAGE_VIEW_TO, messageViewTo);

        editor.putInt(MESSAGE_VIEW_CC, messageViewCC);

        editor.putInt(MESSAGE_VIEW_BCC, messageViewBCC);

        editor.putInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);

        editor.putInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);

        editor.putInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);

        editor.putInt(MESSAGE_VIEW_DATE, messageViewDate);

        editor.putInt(MESSAGE_VIEW_CONTENT_PERCENT, getMessageViewContentAsPercent());
@@ -93,10 +81,7 @@ public class FontSizes { 
        messageListPreview = storage.getInt(MESSAGE_LIST_PREVIEW, messageListPreview);



        messageViewSender = storage.getInt(MESSAGE_VIEW_SENDER, messageViewSender);

        messageViewTo = storage.getInt(MESSAGE_VIEW_TO, messageViewTo);

        messageViewCC = storage.getInt(MESSAGE_VIEW_CC, messageViewCC);

        messageViewBCC = storage.getInt(MESSAGE_VIEW_BCC, messageViewBCC);

        messageViewAdditionalHeaders = storage.getInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);

        messageViewRecipients = storage.getInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);

        messageViewSubject = storage.getInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);

        messageViewDate = storage.getInt(MESSAGE_VIEW_DATE, messageViewDate);
@@ -149,36 +134,12 @@ public class FontSizes { 
        this.messageViewSender = messageViewSender;

    }



    public int getMessageViewTo() {

        return messageViewTo;

    public int getMessageViewRecipients() {

        return messageViewRecipients;

    }



    public void setMessageViewTo(int messageViewTo) {

        this.messageViewTo = messageViewTo;

    }



    public int getMessageViewCC() {

        return messageViewCC;

    }



    public void setMessageViewCC(int messageViewCC) {

        this.messageViewCC = messageViewCC;

    }



    public int getMessageViewBCC() {

        return messageViewBCC;

    }



    public void setMessageViewBCC(int messageViewBCC) {

        this.messageViewBCC = messageViewBCC;

    }



    public int getMessageViewAdditionalHeaders() {

        return messageViewAdditionalHeaders;

    }



    public void setMessageViewAdditionalHeaders(int messageViewAdditionalHeaders) {

        this.messageViewAdditionalHeaders = messageViewAdditionalHeaders;

    public void setMessageViewRecipients(int messageViewRecipients) {

        this.messageViewRecipients = messageViewRecipients;

    }



    public int getMessageViewSubject() {

app/core/src/main/java/com/fsck/k9/SettingsChangeListener.kt

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
package com.fsck.k9



fun interface SettingsChangeListener {

    fun onSettingsChanged()

}

app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ val controllerModule = module { 
            get<NotificationController>(),

            get<NotificationStrategy>(),

            get<LocalStoreProvider>(),

            get<MessageCountsProvider>(),

            get<BackendManager>(),

            get<Preferences>(),

            get<MessageStoreManager>(),
@@ -31,8 +30,7 @@ val controllerModule = module { 
    single<MessageCountsProvider> {

        DefaultMessageCountsProvider(

            preferences = get(),

            accountSearchConditions = get(),

            localStoreProvider = get()

            messageStoreManager = get()

        )

    }

}