Add base URL for all accounts (e6838969) · Commits · e / os / AccountManager

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

+3 −3

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

		const val SYNC_INTERVAL_MANUALLY = -1L

		fun initialUserData(accountName: String, credentials: Credentials, isEeloAccount: Boolean): Bundle {
		fun initialUserData(accountName: String, credentials: Credentials, baseURL: String?): Bundle {
		val bundle = Bundle(2)
		bundle.putString(KEY_SETTINGS_VERSION, CURRENT_VERSION.toString())

		@@ -109,8 +109,8 @@ class AccountSettings(
		bundle.putString(KEY_CERTIFICATE_ALIAS, credentials.certificateAlias)
		}

		if (isEeloAccount) {
		bundle.putString("oc_base_url", Constants.EELO_SYNC_URL)
		if (!baseURL.isNullOrEmpty()) {
		bundle.putString("oc_base_url", baseURL)
		}

		return bundle

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -161,17 +161,21 @@ 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
		var baseURL : String? = null
		if (config.calDAV != null) {
		baseURL = config.calDAV.principal.toString()
		}

		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
		baseURL = Constants.EELO_SYNC_URL
		}
		LoginActivity.ACCOUNT_PROVIDER_GOOGLE -> {
		accountType = context!!.getString(R.string.google_account_type)
		addressBookAccountType = context!!.getString(R.string.account_type_google_address_book)
		baseURL = null
		}
		}

		@@ -179,7 +183,7 @@ class AccountDetailsFragment : Fragment(), LoaderManager.LoaderCallbacks<CreateS
		val settings = settings ?: return false

		// create Android account
		val userData = AccountSettings.initialUserData(accountName, config.credentials, isEeloAccount)
		val userData = AccountSettings.initialUserData(accountName, config.credentials, baseURL)
		Logger.log.log(Level.INFO, "Creating Android account with initial config", arrayOf(account, userData))

		val accountManager = AccountManager.get(activity)