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

Commit 6c1c24b8 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Add sync URL to /e/ accounts

parent 609f4729

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

+5 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class AccountSettings( 


        const val SYNC_INTERVAL_MANUALLY = -1L



        fun initialUserData(credentials: Credentials): Bundle {

        fun initialUserData(credentials: Credentials, isEeloAccount: Boolean): Bundle {

            val bundle = Bundle(2)

            bundle.putString(KEY_SETTINGS_VERSION, CURRENT_VERSION.toString())
@@ -107,6 +107,10 @@ class AccountSettings( 
                    bundle.putString(KEY_CERTIFICATE_ALIAS, credentials.certificateAlias)

            }



            if (isEeloAccount) {

                bundle.putString("oc_base_url", Constants.EELO_SYNC_URL)

            }



            return bundle

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ object Constants { 


    const val AUTH_TOKEN_TYPE = "oauth2-access-token"



    const val EELO_SYNC_URL = "https://drive.eelo.io"



}

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

+3 −1
Original line number Diff line number Diff line
@@ -144,11 +144,13 @@ class AccountDetailsFragment : Fragment(), LoaderManager.LoaderCallbacks<CreateS 
    private fun createAccount(accountName: String, config: DavResourceFinder.Configuration): Boolean {

        var accountType = context!!.getString(R.string.account_type)

        var addressBookAccountType = context!!.getString(R.string.account_type_address_book)

        var isEeloAccount = false



        when (activity!!.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE)) {

            LoginActivity.ACCOUNT_PROVIDER_EELO -> {

                accountType = context!!.getString(R.string.eelo_account_type)

                addressBookAccountType = context!!.getString(R.string.account_type_eelo_address_book)

                isEeloAccount = true

            }

            LoginActivity.ACCOUNT_PROVIDER_GOOGLE -> {

                accountType = context!!.getString(R.string.google_account_type)
@@ -160,7 +162,7 @@ class AccountDetailsFragment : Fragment(), LoaderManager.LoaderCallbacks<CreateS 
        val settings = settings ?: return false



        // create Android account

        val userData = AccountSettings.initialUserData(config.credentials)

        val userData = AccountSettings.initialUserData(config.credentials, isEeloAccount)

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



        val accountManager = AccountManager.get(activity)

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class EeloAuthenticatorFragment : Fragment() { 
    private fun validateLoginData(): LoginInfo? {

        var valid = true



        val baseUrl = Uri.parse("https://drive.eelo.io")

        val baseUrl = Uri.parse(at.bitfire.davdroid.Constants.EELO_SYNC_URL)

        val uri = validateBaseUrl(baseUrl, false) { message ->

            Toast.makeText(context, "Something went wrong. Please try again later", Toast.LENGTH_LONG).show()

            valid = false