Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
AccountManager
Commits
62d4dbfe
Commit
62d4dbfe
authored
May 16, 2022
by
Abhishek Aggarwal
Browse files
AccountManager: compute domain on text change instead of focus change
parent
d4eeeb8b
Pipeline
#185968
passed with stage
in 3 minutes and 13 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
62d4dbfe
...
...
@@ -44,6 +44,10 @@ android {
targetCompatibility
JavaVersion
.
VERSION_1_8
}
kotlinOptions
{
jvmTarget
=
JavaVersion
.
VERSION_1_8
.
toString
()
}
dataBinding
.
enabled
=
true
flavorDimensions
"distribution"
...
...
app/src/main/java/foundation/e/accountmanager/Constants.kt
View file @
62d4dbfe
...
...
@@ -31,8 +31,6 @@ object Constants {
const
val
AUTH_TOKEN_TYPE
=
"oauth2-access-token"
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
const
val
E_SYNC_URL
=
"e.email"
}
app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt
View file @
62d4dbfe
...
...
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
android.widget.Toast
import
androidx.core.widget.doOnTextChanged
import
androidx.fragment.app.Fragment
import
androidx.lifecycle.ViewModelProviders
import
foundation.e.accountmanager.Constants
...
...
@@ -49,15 +50,17 @@ class EeloAuthenticatorFragment : Fragment() {
v
.
root
.
server_toggle_button
.
setOnClickListener
()
{
expandCollapse
()
}
v
.
root
.
urlpwd_user_name
.
setOnFocusChangeListener
()
{
v
,
hasFocus
->
if
(!
hasFocus
)
{
if
(
v
.
urlpwd_user_name
.
text
.
toString
().
contains
(
"@"
))
{
val
dns
=
v
.
urlpwd_user_name
.
text
.
toString
().
substringAfter
(
"@"
)
val
pre_custom_url
=
"https://"
+
dns
requireView
().
urlpwd_server_uri
.
setText
(
pre_custom_url
)
}
else
{
requireView
().
urlpwd_server_uri
.
setText
(
""
)
v
.
root
.
urlpwd_user_name
.
doOnTextChanged
{
text
,
_
,
_
,
_
->
if
(
text
.
toString
().
contains
(
"@"
))
{
var
dns
=
text
.
toString
().
substringAfter
(
"@"
)
if
(
dns
==
Constants
.
E_SYNC_URL
)
{
dns
=
Constants
.
EELO_SYNC_HOST
}
val
pre_custom_url
=
"https://$dns"
requireView
().
urlpwd_server_uri
.
setText
(
pre_custom_url
)
}
else
{
requireView
().
urlpwd_server_uri
.
setText
(
""
)
}
}
...
...
@@ -115,11 +118,7 @@ class EeloAuthenticatorFragment : Fragment() {
private
fun
validate
():
Boolean
{
var
valid
=
false
var
serverUrl
=
requireView
().
urlpwd_server_uri
.
text
.
toString
()
if
(
serverUrl
==
Constants
.
E_SYNC_URL
)
{
serverUrl
=
Constants
.
EELO_SYNC_URL
}
val
serverUrl
=
requireView
().
urlpwd_server_uri
.
text
.
toString
()
fun
validateUrl
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment