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

Commit 2c8dd2a3 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Store refreshed access token, email id in AccountManager for K-9 Mail

parent 5339111a

app/src/main/java/at/bitfire/davdroid/AccountSettings.kt

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ class AccountSettings( 
        const val CURRENT_VERSION = 8

        const val KEY_SETTINGS_VERSION = "version"



        const val KEY_EMAIL_ID = "email_id"

        const val KEY_USERNAME = "user_name"

        const val KEY_AUTH_STATE = "auth_state"

        const val KEY_CERTIFICATE_ALIAS = "certificate_alias"
@@ -98,6 +99,7 @@ class AccountSettings( 
                Credentials.Type.UsernamePassword ->

                    bundle.putString(KEY_USERNAME, credentials.userName)

                Credentials.Type.OAuth -> {

                    bundle.putString(KEY_EMAIL_ID, credentials.userName)

                    bundle.putString(KEY_USERNAME, credentials.userName)

                    bundle.putString(KEY_AUTH_STATE, credentials.authState!!.jsonSerializeString())

                }

app/src/main/java/at/bitfire/davdroid/syncadapter/GoogleAccountAuthenticatorService.kt

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ class GoogleAccountAuthenticatorService : Service(), OnAccountsUpdateListener { 


                    AuthorizationService(context).performTokenRequest(tokenRequest) { tokenResponse, ex ->

                                authState.update(tokenResponse, ex)

                                accountManager.setUserData(account, AccountSettings.KEY_AUTH_STATE, authState.jsonSerializeString())

                                val result = Bundle()

                                result.putString(AccountManager.KEY_ACCOUNT_NAME, account!!.name)

                                result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type)