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

Commit 3efbcbb2 authored by Michael Enoma's avatar Michael Enoma 👽
Browse files

Google Account Fix

parent 43a3bd30

app/ui/legacy/src/main/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 
    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />

    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />



    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.USE_CREDENTIALS" />



    <queries>

        <intent>

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+4 −6
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.fsck.k9.Preferences 
import com.fsck.k9.account.BackgroundAccountRemover

import com.fsck.k9.activity.compose.MessageActions

import com.fsck.k9.activity.setup.AccountSetupBasics

import com.fsck.k9.activity.setup.accountmanager.AccountManagerConstants.KEY_ACCOUNT_NAME

import com.fsck.k9.controller.MessageReference

import com.fsck.k9.fragment.MessageListFragment

import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener
@@ -1618,8 +1617,9 @@ open class MessageList : 


    private fun addNewAccountsAutomatically(accounts: List<Account>): Boolean {

        return try {

            val am: AccountManager = AccountManager.get(this) // "this" references the current Context

            val eeloAccounts: Array<android.accounts.Account> = getEeloAccountsOnDevice()

            val googleAccounts: Array<android.accounts.Account> = getGoogleAccountsOnDevice()

            val googleAccounts: Array<out android.accounts.Account> = getGoogleAccountsOnDevice()

            var accountWasAdded = false

            for (eeloAccount in eeloAccounts) {

                val emailId: String = accountManager.getUserData(eeloAccount, ACCOUNT_EMAIL_ADDRESS_KEY)
@@ -1639,11 +1639,10 @@ open class MessageList : 
            }

            for (googleAccount in googleAccounts) {

                val emailId: String = accountManager.getUserData(googleAccount, ACCOUNT_EMAIL_ADDRESS_KEY)

                val accountName: String = accountManager.getUserData(googleAccount, KEY_ACCOUNT_NAME)

                var accountIsSignedIn = false

                for (account in accounts) {

                    if (emailId == account.email) {

                        if (account.name == accountName) {

                        if (account.name == null) { // we need to fix an old bug

                            account.name = emailId

                            Preferences.getPreferences(this).saveAccount(account)

                        }
@@ -1652,7 +1651,6 @@ open class MessageList : 
                    }

                }

                if (!accountIsSignedIn) {

                    val password: String = accountManager.getPassword(googleAccount)

                   // GoogleAccountCreator.createAccount(this, emailId)

                    EeloAccountCreator.createAccount(this, emailId, "")

                    accountWasAdded = true

app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/AccountManagerConstants.kt

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ package com.fsck.k9.activity.setup.accountmanager 


object AccountManagerConstants {

    const val EELO_ACCOUNT_TYPE = "e.foundation.webdav.eelo"

    const val GOOGLE_ACCOUNT_TYPE = "e.foundation.webdav.google"

    const val GOOGLE_ACCOUNT_TYPE = "webdav.google"

    const val ACCOUNT_EMAIL_ADDRESS_KEY = "email_address"

    const val KEY_ACCOUNT_NAME = "account_name"

    const val MAIL_CONTENT_AUTHORITY = "foundation.e.mail.provider.AppContentProvider"

}

app/ui/base/src/main/res/values/styles.xml

+1 −1

File changed.

Contains only whitespace changes.