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

Commit d1f45eac authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

Merge branch '3293-Improve_code_quality' into 'main' 

Improve checking on setting authState.

See merge request !157
parents 893ced03 132c9f72

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ dependencies { 
    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2

    implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2

    implementation 'com.google.code.gson:gson:2.10.1'

    implementation("foundation.e:Nextcloud-Android-Library:2.0.1-u2.17-release") {

    implementation("foundation.e:Nextcloud-Android-Library:2.0.2-u2.17-release") {

        exclude group: 'foundation.e.dav4jvm', module: 'dav4jvm'

        exclude group: 'com.gitlab.bitfireAT', module: 'dav4jvm'

        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version

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)