From 2d0586dcf8151fa93ec41de2da4288a91de38ce0 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 1 Nov 2022 11:49:36 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E7=84=A1=E5=8A=B9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agileworks/view/ui/login/LoginFragment.kt     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index 48aa9a61..cf22b502 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -256,7 +256,12 @@ class LoginFragment: Fragment() {
         Log.d(TAG, "call startBiometricPrompt()")
         BiometricPrompt.auth(this.requireActivity()) {
             when (it) {
-                BiometricPrompt.Result.Success -> setCookie()
+                BiometricPrompt.Result.Success -> {
+                    requireActivity().runOnUiThread {
+                        disableLogin()
+                    }
+                    setCookie()
+                }
                 BiometricPrompt.Result.UnsupportedHardware -> onFailureAuthBiometricPrompt(R.string.auth_biometric_unsupported_hardware)
                 BiometricPrompt.Result.NotHasBiometricsOnHardware -> onFailureAuthBiometricPrompt(R.string.auth_biometric_not_has_biometrics_on_hardware)
                 BiometricPrompt.Result.Cancel -> onFailureAuthBiometricPrompt(R.string.auth_biometric_cancel)
@@ -491,9 +496,11 @@ class LoginFragment: Fragment() {
     companion object {
         // ログイン時に利用するコントロール用 View の ID 群
         val LOGIN_CONTROL_IDS = listOf(
-                R.id.serverUrl,
-                R.id.server_context,
-                R.id.loginButton
+            R.id.serverUrl,
+            R.id.server_context,
+            R.id.loginButton,
+            R.id.clientCertChoiceButton,
+            R.id.qrReadButton
         )
 
         private val SCHEME_PATTERN = Regex("^https?://")
-- 
GitLab


From 5888e20a2d2144ed38c1157b0f1e542e160f2882 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Wed, 2 Nov 2022 10:37:09 +0900
Subject: [PATCH 2/2] =?UTF-8?q?widget=E3=83=BB=E9=80=9A=E7=9F=A5=E3=83=BB?=
 =?UTF-8?q?=E7=94=9F=E4=BD=93=E8=AA=8D=E8=A8=BC=E3=81=8B=E3=82=89=E8=B5=B7?=
 =?UTF-8?q?=E5=8B=95=E5=BE=8C=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E7=84=A1=E5=8A=B9=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/atled/agileworks/view/ui/login/LoginFragment.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index cf22b502..a41e6334 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -49,6 +49,7 @@ class LoginFragment: Fragment() {
     val mOAuthService = OAuthService
     private lateinit var binding: FragmentLoginBinding
     private var shouldClearTaskOnOAuthFailure = false
+    private var disableButtonFlg = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         Log.d(TAG, "call onCreateView()")
@@ -84,13 +85,13 @@ class LoginFragment: Fragment() {
                     if (binding.viewmodel?.getAppBackGroundStatus() == true) {
                         Log.d(TAG, "authState.isAuthorized == true")
                         Log.d(TAG,"appBackGroundStatus == true")
+                        disableButtonFlg = true
                         disableLogin()
                         setCookie()
                     } else {
                         // 認証済みの場合、生体/デバイス認証を実行
                         Log.d(TAG, "authState.isAuthorized == true")
                         if (BiometricPrompt.anyAuthenticationAvailable(this.requireContext())) {
-                            disableLogin()
                             Handler().postDelayed({
                                 startBiometricPrompt()
                             }, 0)
@@ -216,7 +217,9 @@ class LoginFragment: Fragment() {
     }
 
     private fun setLoginButtonEnable(host: String, context: String) {
-        loginButton.isEnabled = inputIsValid(host, context)
+        if (!disableButtonFlg) {
+            loginButton.isEnabled = inputIsValid(host, context)
+        }
     }
 
     private fun inputIsValid(host: String, context: String): Boolean {
@@ -258,6 +261,7 @@ class LoginFragment: Fragment() {
             when (it) {
                 BiometricPrompt.Result.Success -> {
                     requireActivity().runOnUiThread {
+                        disableButtonFlg = true
                         disableLogin()
                     }
                     setCookie()
-- 
GitLab