Commit 87c9a411 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch '5338-notes_sync_issue' into 'master'

AccountManager: Hardcode sync url for e.email

See merge request !38
parents 242cbeb0 db818a57
Pipeline #181197 passed with stage
in 2 minutes
......@@ -33,5 +33,6 @@ object Constants {
const val EELO_SYNC_SCHEME = "https://"
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
}
......@@ -9,6 +9,7 @@ import android.view.ViewGroup
import android.widget.Toast
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProviders
import foundation.e.accountmanager.Constants
import foundation.e.accountmanager.ECloudAccountHelper
import foundation.e.accountmanager.R
import foundation.e.accountmanager.databinding.FragmentEeloAuthenticatorBinding
......@@ -114,7 +115,11 @@ class EeloAuthenticatorFragment : Fragment() {
private fun validate(): Boolean {
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() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment