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

Commit fe01ab98 authored by Nihar Thakkar's avatar Nihar Thakkar Committed by Fahim Salam Chowdhury
Browse files

Use username instead of email address as account email address (due to issue with Nextcloud)

parent 6f8c63b3

app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class AccountSettingsTest { 
    fun setUp() {

        hiltRule.inject()



        assertTrue(AccountUtils.createAccount(context, account, AccountSettings.initialUserData(fakeCredentials.userName, fakeCredentials, null)))

        assertTrue(AccountUtils.createAccount(context, account, AccountSettings.initialUserData(fakeCredentials, null)))

        ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1)

        ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 0)

    }

app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class SyncManagerTest { 
        @BeforeClass

        @JvmStatic

        fun createAccount() {

            assertTrue(AccountManager.get(context).addAccountExplicitly(account, "test", AccountSettings.initialUserData("test", Credentials("test", "test"), null)))

            assertTrue(AccountManager.get(context).addAccountExplicitly(account, "test", AccountSettings.initialUserData(Credentials("test", "test"), null)))

        }



        @AfterClass

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

+4 −4
Original line number Diff line number Diff line
@@ -138,14 +138,14 @@ class AccountSettings( 
        const val SYNC_INTERVAL_MANUALLY = -1L





        fun initialUserData(accountName: String?, credentials: Credentials?, baseURL: String?): Bundle {

        fun initialUserData(credentials: Credentials?, baseURL: String?): Bundle {

            val bundle = Bundle(2)

            bundle.putString(KEY_SETTINGS_VERSION, CURRENT_VERSION.toString())



            if (credentials != null) {

                if (accountName != null && accountName.isNotEmpty()) {

                    bundle.putString(KEY_USERNAME, accountName)

                    bundle.putString(KEY_EMAIL_ADDRESS, accountName)

                if (credentials.userName != null) {

                    bundle.putString(KEY_USERNAME, credentials.userName)

                    bundle.putString(KEY_EMAIL_ADDRESS, credentials.userName)

                }

                if (credentials.certificateAlias != null) {

                    bundle.putString(KEY_CERTIFICATE_ALIAS, credentials.certificateAlias)

app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt

+4 −4
Original line number Diff line number Diff line
@@ -223,10 +223,10 @@ class AccountDetailsFragment : Fragment() { 
                    }

                }



                val account = Account(name, accountType)

                val account = Account(credentials?.userName, accountType)



                // create Android account

                val userData = AccountSettings.initialUserData(name, credentials, baseURL)

                val userData = AccountSettings.initialUserData(credentials, baseURL)

                Logger.log.log(Level.INFO, "Creating Android account with initial config", arrayOf(account, userData))



                val accountManager = AccountManager.get(context)
@@ -274,7 +274,7 @@ class AccountDetailsFragment : Fragment() { 
                    if (config.cardDAV != null) {

                        // insert CardDAV service

                        val id = insertService(

                            name,

                            credentials?.userName ?: "",

                            credentials?.authState?.jsonSerializeString(),

                            accountType,

                            addressBookAccountType,
@@ -298,7 +298,7 @@ class AccountDetailsFragment : Fragment() { 
                    if (config.calDAV != null) {

                        // insert CalDAV service

                        val id = insertService(

                            name,

                            credentials?.userName ?: "",

                            credentials?.authState?.jsonSerializeString(),

                            accountType,

                            addressBookAccountType,