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

Unverified Commit 7a35120a authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6236 from thundernest/fix_warnings 

Code cleanup; fix some warnings
parents 7d258781 72e3ee3a

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ object Core : EarlyInit { 
    @JvmStatic

    fun setServicesEnabled(context: Context) {

        val appContext = context.applicationContext

        val acctLength = Preferences.getPreferences(appContext).accounts.size

        val acctLength = Preferences.getPreferences().accounts.size

        val enable = acctLength > 0



        setServicesEnabled(appContext, enable)

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

+2 −2
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ class LocalKeyStoreManager( 
     * certificates for the incoming and outgoing servers.

     */

    fun deleteCertificates(account: Account) {

        account.incomingServerSettings?.let { serverSettings ->

        account.incomingServerSettings.let { serverSettings ->

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

        }



        account.outgoingServerSettings?.let { serverSettings ->

        account.outgoingServerSettings.let { serverSettings ->

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

        }

    }

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

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



import android.content.Context

import androidx.annotation.GuardedBy

import androidx.annotation.RestrictTo

import com.fsck.k9.mail.MessagingException
@@ -291,8 +290,8 @@ class Preferences internal constructor( 


    companion object {

        @JvmStatic

        fun getPreferences(context: Context): Preferences {

            return DI.get(Preferences::class.java)

        fun getPreferences(): Preferences {

            return DI.get()

        }

    }

}

app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ public class LocalStore { 
    }



    protected Preferences getPreferences() {

        return Preferences.getPreferences(context);

        return Preferences.getPreferences();

    }



    public OutboxStateRepository getOutboxStateRepository() {

app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class SettingsImporter { 


            Imported imported = parseSettings(inputStream, globalSettings, accountUuids, false);



            Preferences preferences = Preferences.getPreferences(context);

            Preferences preferences = Preferences.getPreferences();

            Storage storage = preferences.getStorage();



            if (globalSettings) {
@@ -331,7 +331,7 @@ public class SettingsImporter { 


        AccountDescription original = new AccountDescription(account.name, account.uuid);



        Preferences prefs = Preferences.getPreferences(context);

        Preferences prefs = Preferences.getPreferences();

        List<Account> accounts = prefs.getAccounts();



        String uuid = account.uuid;