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

Commit 32f4b34e authored by cketti's avatar cketti
Browse files

Merge branch 'main' into message-view-redesign

parents 7f3bea63 142124c1

app/autodiscovery/providersxml/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ dependencies { 
}



android {

    namespace 'com.fsck.k9.autodiscovery.providersxml'



    compileSdkVersion buildConfig.compileSdk

    buildToolsVersion buildConfig.buildTools

app/autodiscovery/providersxml/src/main/AndroidManifest.xml

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest package="com.fsck.k9.autodiscovery.providersxml" />

app/core/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ dependencies { 
}



android {

    namespace 'com.fsck.k9.core'



    compileSdkVersion buildConfig.compileSdk

    buildToolsVersion buildConfig.buildTools

app/core/src/main/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.fsck.k9.core">

    xmlns:tools="http://schemas.android.com/tools">



    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

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

+14 −7
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ object K9 : EarlyInit { 
    val fontSizes = FontSizes()



    @JvmStatic

    var backgroundOps = BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC

    var backgroundOps = BACKGROUND_OPS.ALWAYS



    @JvmStatic

    var isShowAnimations = true
@@ -188,9 +188,6 @@ object K9 : EarlyInit { 
    @JvmStatic

    var isUseVolumeKeysForNavigation = false



    @JvmStatic

    var isUseVolumeKeysForListNavigation = false



    @JvmStatic

    var isShowUnifiedInbox = true
@@ -253,6 +250,12 @@ object K9 : EarlyInit { 
    @JvmStatic

    var pgpSignOnlyDialogCounter: Int = 0



    @JvmStatic

    var swipeRightAction: SwipeAction = SwipeAction.ToggleSelection



    @JvmStatic

    var swipeLeftAction: SwipeAction = SwipeAction.ToggleRead



    val isQuietTime: Boolean

        get() {

            if (!isQuietTimeEnabled) {
@@ -298,7 +301,6 @@ object K9 : EarlyInit { 
        isSensitiveDebugLoggingEnabled = storage.getBoolean("enableSensitiveLogging", false)

        isShowAnimations = storage.getBoolean("animations", true)

        isUseVolumeKeysForNavigation = storage.getBoolean("useVolumeKeysForNavigation", false)

        isUseVolumeKeysForListNavigation = storage.getBoolean("useVolumeKeysForListNavigation", false)

        isShowUnifiedInbox = storage.getBoolean("showUnifiedInbox", true)

        isShowStarredCount = storage.getBoolean("showStarredCount", false)

        isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)
@@ -348,7 +350,7 @@ object K9 : EarlyInit { 
        isThreadedViewEnabled = storage.getBoolean("threadedView", true)

        fontSizes.load(storage)



        backgroundOps = storage.getEnum("backgroundOperations", BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC)

        backgroundOps = storage.getEnum("backgroundOperations", BACKGROUND_OPS.ALWAYS)



        isColorizeMissingContactPictures = storage.getBoolean("colorizeMissingContactPictures", true)
@@ -362,6 +364,9 @@ object K9 : EarlyInit { 
        pgpSignOnlyDialogCounter = storage.getInt("pgpSignOnlyDialogCounter", 0)



        k9Language = storage.getString("language", "")



        swipeRightAction = storage.getEnum("swipeRightAction", SwipeAction.ToggleSelection)

        swipeLeftAction = storage.getEnum("swipeLeftAction", SwipeAction.ToggleRead)

    }



    internal fun save(editor: StorageEditor) {
@@ -370,7 +375,6 @@ object K9 : EarlyInit { 
        editor.putEnum("backgroundOperations", backgroundOps)

        editor.putBoolean("animations", isShowAnimations)

        editor.putBoolean("useVolumeKeysForNavigation", isUseVolumeKeysForNavigation)

        editor.putBoolean("useVolumeKeysForListNavigation", isUseVolumeKeysForListNavigation)

        editor.putBoolean("autofitWidth", isAutoFitWidth)

        editor.putBoolean("quietTimeEnabled", isQuietTimeEnabled)

        editor.putBoolean("notificationDuringQuietTimeEnabled", isNotificationDuringQuietTimeEnabled)
@@ -422,6 +426,9 @@ object K9 : EarlyInit { 
        editor.putInt("pgpInlineDialogCounter", pgpInlineDialogCounter)

        editor.putInt("pgpSignOnlyDialogCounter", pgpSignOnlyDialogCounter)



        editor.putEnum("swipeRightAction", swipeRightAction)

        editor.putEnum("swipeLeftAction", swipeLeftAction)



        fontSizes.save(editor)

    }