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

Unverified Commit 4748a5a1 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #5223 from k9mail/refactor_LocalKeyStore

parents c6af41df 0e1ff7d6

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ val mainModule = module { 
    single { LocalStoreProvider() }

    single<PowerManager> { TracingPowerManager.getPowerManager(get()) }

    single { Contacts.getInstance(get()) }

    single { LocalKeyStore.createInstance(get()) }

    single { LocalKeyStore(directoryProvider = get()) }

    single { TrustManagerFactory.createInstance(get()) }

    single { LocalKeyStoreManager(get()) }

    single<TrustedSocketFactory> { DefaultTrustedSocketFactory(get(), get()) }

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

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class LocalKeyStoreManager( 
        } else {

            account.outgoingServerSettings

        }

        localKeyStore.addCertificate(serverSettings.host, serverSettings.port, certificate)

        localKeyStore.addCertificate(serverSettings.host!!, serverSettings.port, certificate)

    }



    /**
@@ -32,7 +32,7 @@ class LocalKeyStoreManager( 
        } else {

            account.outgoingServerSettings

        }

        val oldHost = serverSettings.host

        val oldHost = serverSettings.host!!

        val oldPort = serverSettings.port

        if (oldPort == -1) {

            // This occurs when a new account is created
@@ -49,11 +49,11 @@ class LocalKeyStoreManager( 
     */

    fun deleteCertificates(account: Account) {

        account.incomingServerSettings?.let { serverSettings ->

            localKeyStore.deleteCertificate(serverSettings.host, serverSettings.port)

            localKeyStore.deleteCertificate(serverSettings.host!!, serverSettings.port)

        }



        account.outgoingServerSettings?.let { serverSettings ->

            localKeyStore.deleteCertificate(serverSettings.host, serverSettings.port)

            localKeyStore.deleteCertificate(serverSettings.host!!, serverSettings.port)

        }

    }

}

app/core/src/main/java/com/fsck/k9/helper/AndroidKeyStoreDirectoryProvider.kt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
package com.fsck.k9.helper



import android.content.Context

import com.fsck.k9.mail.ssl.KeyStoreDirectoryProvider

import java.io.File



internal class AndroidKeyStoreDirectoryProvider(private val context: Context) : KeyStoreDirectoryProvider {

    override fun getDirectory(): File {

        return context.getDir("KeyStore", Context.MODE_PRIVATE)

    }

}

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

+2 −0
Original line number Diff line number Diff line 
package com.fsck.k9.helper



import com.fsck.k9.mail.ssl.KeyStoreDirectoryProvider

import org.koin.dsl.module



val helperModule = module {

    single { ClipboardManager(get()) }

    single { MessageHelper.getInstance(get()) }

    factory<KeyStoreDirectoryProvider> { AndroidKeyStoreDirectoryProvider(context = get()) }

}

mail/common/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ dependencies { 
    testImplementation "junit:junit:${versions.junit}"

    testImplementation "com.google.truth:truth:${versions.truth}"

    testImplementation "org.mockito:mockito-core:${versions.mockito}"

    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"

}



android {