From 64ff59b73bdf74f1564979e3dc6d6c8a1d21d8aa Mon Sep 17 00:00:00 2001 From: vince-bourgmayer Date: Fri, 8 Mar 2019 11:44:16 +0100 Subject: [PATCH 1/3] implement prewritten url from mail --- .../accountmanager/ui/setup/EeloAuthenticatorFragment.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt index a071c64ca..310bf1ef9 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt @@ -47,6 +47,15 @@ class EeloAuthenticatorFragment : Fragment() { val view = inflater.inflate(R.layout.fragment_eelo_authenticator, container, false) view.urlpwd_other_account_title_panel.setOnClickListener(){ expandCollapse() } + view.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus -> + if (!hasFocus && v.urlpwd_user_name.text.toString().contains("@")) { + val dns = v.urlpwd_user_name.text.toString().substringAfter("@") + val pre_custom_url = "https://"+dns; + view.urlpwd_server_uri.setText(pre_custom_url) + }else{ + view.urlpwd_server_uri.setText("") + } + } view.login.setOnClickListener { login() } -- GitLab From 3eb6638c99bce46b1e944eac3c650a76eb62ce63 Mon Sep 17 00:00:00 2001 From: Vincent Bourgmayer Date: Fri, 8 Mar 2019 10:47:27 +0000 Subject: [PATCH 2/3] remove ";" --- .../e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt index 310bf1ef9..4a8f3e641 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt @@ -50,7 +50,7 @@ class EeloAuthenticatorFragment : Fragment() { view.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus -> if (!hasFocus && v.urlpwd_user_name.text.toString().contains("@")) { val dns = v.urlpwd_user_name.text.toString().substringAfter("@") - val pre_custom_url = "https://"+dns; + val pre_custom_url = "https://"+dns view.urlpwd_server_uri.setText(pre_custom_url) }else{ view.urlpwd_server_uri.setText("") -- GitLab From 7a0ab39f85cd5c19e053e9d536ec6bd17fb71e20 Mon Sep 17 00:00:00 2001 From: vince-bourgmayer Date: Fri, 8 Mar 2019 15:09:08 +0100 Subject: [PATCH 3/3] fix issue --- .../ui/setup/EeloAuthenticatorFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt index 4a8f3e641..93ac27eda 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt @@ -48,12 +48,14 @@ class EeloAuthenticatorFragment : Fragment() { view.urlpwd_other_account_title_panel.setOnClickListener(){ expandCollapse() } view.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus -> - if (!hasFocus && v.urlpwd_user_name.text.toString().contains("@")) { - val dns = v.urlpwd_user_name.text.toString().substringAfter("@") - val pre_custom_url = "https://"+dns - view.urlpwd_server_uri.setText(pre_custom_url) - }else{ - view.urlpwd_server_uri.setText("") + 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 + view.urlpwd_server_uri.setText(pre_custom_url) + } else { + view.urlpwd_server_uri.setText("") + } } } -- GitLab