Merge branch '5338-notes_sync_issue' into 'master' (87c9a411) · Commits · e / os / AccountManager

app/src/main/java/foundation/e/accountmanager/Constants.kt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,5 +33,6 @@ object Constants {

	const val EELO_SYNC_SCHEME = "https://"		const val EELO_SYNC_SCHEME = "https://"
	const val EELO_SYNC_HOST = "ecloud.global"		const val EELO_SYNC_HOST = "ecloud.global"
			const val E_SYNC_URL = EELO_SYNC_SCHEME + "e.email"
	const val EELO_SYNC_URL = EELO_SYNC_SCHEME + EELO_SYNC_HOST		const val EELO_SYNC_URL = EELO_SYNC_SCHEME + EELO_SYNC_HOST
	}		}

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ import android.view.ViewGroup
	import android.widget.Toast		import android.widget.Toast
	import androidx.fragment.app.Fragment		import androidx.fragment.app.Fragment
	import androidx.lifecycle.ViewModelProviders		import androidx.lifecycle.ViewModelProviders
			import foundation.e.accountmanager.Constants
	import foundation.e.accountmanager.ECloudAccountHelper		import foundation.e.accountmanager.ECloudAccountHelper
	import foundation.e.accountmanager.R		import foundation.e.accountmanager.R
	import foundation.e.accountmanager.databinding.FragmentEeloAuthenticatorBinding		import foundation.e.accountmanager.databinding.FragmentEeloAuthenticatorBinding
	@@ -114,7 +115,11 @@ class EeloAuthenticatorFragment : Fragment() {
	private fun validate(): Boolean {		private fun validate(): Boolean {
	var valid = false		var valid = false

	var serverUrl = requireView().urlpwd_server_uri.text.toString();		var serverUrl = requireView().urlpwd_server_uri.text.toString()

			if (serverUrl == Constants.E_SYNC_URL) {
			serverUrl = Constants.EELO_SYNC_URL
			}

	fun validateUrl() {		fun validateUrl() {