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

Commit e4ebc291 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

chore: Improve code quality based on authState set 

Improve code quality where is the AuthState is setting up.

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/3293
parent 893ced03

app/src/main/kotlin/at/bitfire/davdroid/settings/AccountSettings.kt

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class AccountSettings( 
                }

            }



            if (!cookies.isNullOrEmpty()) {

            if (!cookies.isNullOrBlank()) {

                bundle.putString(COOKIE_KEY, cookies)

            }
@@ -265,7 +265,7 @@ class AccountSettings( 


    // authentication settings

    fun credentials(): Credentials {

        return if (accountManager.getUserData(account, KEY_AUTH_STATE).isNullOrEmpty()) {

        return if (accountManager.getUserData(account, KEY_AUTH_STATE).isNullOrBlank()) {

            Credentials(

                accountManager.getUserData(account, KEY_USERNAME),

                accountManager.getPassword(account),

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/AccountUtils.kt

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ object AccountUtils { 


    fun isLoggedInWithMurenaSso(context: Context, account: Account): Boolean {

        val accountManager = AccountManager.get(context)

        val hasAuthStateData = accountManager.getUserData(account, AccountSettings.KEY_AUTH_STATE) != null

        val isPasswordNull = accountManager.getPassword(account).isNullOrEmpty()

        val hasAuthStateData = !accountManager.getUserData(account, AccountSettings.KEY_AUTH_STATE).isNullOrBlank()

        val isPasswordNull = accountManager.getPassword(account).isNullOrBlank()



        return isPasswordNull && hasAuthStateData

    }

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ class ContactsSyncManager( 
                    .get()

                    .url(httpUrl)



                if (!accessToken.isNullOrEmpty()) {

                if (!accessToken.isNullOrBlank()) {

                    requestBuilder.header("Authorization", "Bearer $accessToken")

                }

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/DefaultAccountAuthenticatorService.kt

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ abstract class DefaultAccountAuthenticatorService : Service(), OnAccountsUpdateL 
        ): Bundle? {

            val accountManager = AccountManager.get(context)

            val authStateString = accountManager.getUserData(account, AccountSettings.KEY_AUTH_STATE) ?: return null

            if (authStateString.isBlank()) {

                return null

            }



            val authState = AuthState.jsonDeserialize(authStateString)

app/src/main/kotlin/at/bitfire/davdroid/ui/ShowUrlActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class ShowUrlActivity : AppCompatActivity() { 


        val url = intent.getStringExtra(URL)



        if (url.isNullOrEmpty()) {

        if (url.isNullOrBlank()) {

            finish()

            return

        }