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

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

Merge branch '690-Update_to_upstream_6_307' into 'main' 

690- update to upstream v6.307

See merge request !112
parents c74a50e5 a59f9b37

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
@@ -41,6 +41,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

+0 −5
Original line number Diff line number Diff line
@@ -201,9 +201,6 @@ object K9 : EarlyInit { 
    @JvmStatic

    var isUseVolumeKeysForNavigation = false



    @JvmStatic

    var isUseVolumeKeysForListNavigation = false



    @JvmStatic

    var isShowUnifiedInbox = true
@@ -314,7 +311,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", true)
@@ -394,7 +390,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("isSentSoundEnabled", isSentSoundEnabled)