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

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

Merge branch '667-Fix_update_with_upstream_merge_conflict' into 'main' 

667-Fix_update_with_upstream_merge_conflict

See merge request !110
parents 841d9c4d 5f69e2b0

.editorconfig

+1 −1
Original line number Diff line number Diff line 
[*.{kt,kts}]

kotlin_imports_layout = *,^*
 
ij_kotlin_imports_layout = *,^*

app/autodiscovery/api/build.gradle

+1 −0
Original line number Diff line number Diff line 
apply plugin: 'java-library'

apply plugin: 'kotlin'

apply plugin: 'com.android.lint'



java {

    sourceCompatibility = javaVersion

app/autodiscovery/srvrecords/build.gradle

+1 −0
Original line number Diff line number Diff line 
apply plugin: 'java-library'

apply plugin: 'kotlin'

apply plugin: 'com.android.lint'



java {

    sourceCompatibility = javaVersion

app/autodiscovery/thunderbird/build.gradle

+1 −0
Original line number Diff line number Diff line 
apply plugin: 'java-library'

apply plugin: 'kotlin'

apply plugin: 'com.android.lint'



java {

    sourceCompatibility = javaVersion

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

+2 −2
Original line number Diff line number Diff line
@@ -523,11 +523,11 @@ class AccountPreferenceSerializer( 
            defaultEnum

        } else {

            try {

                java.lang.Enum.valueOf<T>(defaultEnum.declaringClass, stringPref)

                java.lang.Enum.valueOf<T>(defaultEnum.declaringJavaClass, stringPref)

            } catch (ex: IllegalArgumentException) {

                Timber.w(

                    ex, "Unable to convert preference key [%s] value [%s] to enum of type %s",

                    key, stringPref, defaultEnum.declaringClass

                    key, stringPref, defaultEnum.declaringJavaClass

                )



                defaultEnum