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

Commit 42d99739 authored by cketti's avatar cketti
Browse files

Merge branch 'main' into message-view-redesign

parents 6d2c1df6 7bcb1bc9

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

+5 −2
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ class Preferences internal constructor( 
            }

        }



    private val completeAccounts: List<Account>

        get() = accounts.filter { it.isFinishedSetup }



    override fun getAccount(accountUuid: String): Account? {

        synchronized(accountLock) {

            if (accountsMap == null) {
@@ -151,10 +154,10 @@ class Preferences internal constructor( 
    @OptIn(ExperimentalCoroutinesApi::class)

    override fun getAccountsFlow(): Flow<List<Account>> {

        return callbackFlow {

            send(accounts)

            send(completeAccounts)



            val listener = AccountsChangeListener {

                trySendBlocking(accounts)

                trySendBlocking(completeAccounts)

            }

            addOnAccountsChangeListener(listener)

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

+9 −9
Original line number Diff line number Diff line 
package com.fsck.k9



enum class SwipeAction {

    None,

    ToggleSelection,

    ToggleRead,

    ToggleStar,

    Archive,

    Delete,

    Spam,

    Move

enum class SwipeAction(val removesItem: Boolean) {

    None(removesItem = false),

    ToggleSelection(removesItem = false),

    ToggleRead(removesItem = false),

    ToggleStar(removesItem = false),

    Archive(removesItem = true),

    Delete(removesItem = true),

    Spam(removesItem = true),

    Move(removesItem = true)

}

app/k9mail/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ android { 
        applicationId "com.fsck.k9"

        testApplicationId "com.fsck.k9.tests"



        versionCode 33010

        versionName '6.311-SNAPSHOT'

        versionCode 33012

        versionName '6.313-SNAPSHOT'



        // Keep in sync with the resource string array 'supported_languages'

        resConfigs "in", "br", "ca", "cs", "cy", "da", "de", "et", "en", "en_GB", "es", "eo", "eu", "fr", "gd", "gl",

app/ui/legacy/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ dependencies { 
    implementation "com.takisoft.preferencex:preferencex-colorpicker:${versions.preferencesFix}"

    implementation "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"

    implementation project(':ui-utils:LinearLayoutManager')

    implementation project(':ui-utils:ItemTouchHelper')

    implementation "androidx.lifecycle:lifecycle-runtime-ktx:${versions.androidxLifecycle}"

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.androidxLifecycle}"

    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"

app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt

+9 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class AccountRemover( 


        preferences.deleteAccount(account)



        localKeyStoreManager.deleteCertificates(account)

        removeCertificates(account)

        Core.setServicesEnabled()



        Timber.v("Finished removing account '%s'.", accountName)
@@ -62,4 +62,12 @@ class AccountRemover( 
            Timber.e(e, "Failed to reset remote store for account %s", account)

        }

    }



    private fun removeCertificates(account: Account) {

        try {

            localKeyStoreManager.deleteCertificates(account)

        } catch (e: Exception) {

            Timber.e(e, "Failed to remove certificates for account %s", account)

        }

    }

}