From f5266a7ef8e441bef6e310cfde7cdab5c7fe2551 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Mon, 27 Jun 2022 17:22:40 +0900 Subject: [PATCH] =?UTF-8?q?#94=20=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AF=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=A6=E3=83=AD=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E7=94=BB=E9=9D=A2=E3=81=B8=E9=81=B7=E7=A7=BB=E3=80=81?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E7=94=BB=E9=9D=A2=E3=81=B8?= =?UTF-8?q?=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/atled/agileworks/view/ui/login/LoginFragment.kt | 10 ++++++++-- 1 file changed, 8 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 d670125e..d77fce4b 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 @@ -370,8 +370,14 @@ class LoginFragment: Fragment() { setupFcm() } } else { - // 失敗したらログイン画面 - whenAuthorizationFails(ex) + // キャンセルした場合は何もせずログイン画面へ遷移、失敗したらダイアログを表示してログイン画面へ遷移 + if (ex?.code == AuthorizationException.GeneralErrors.USER_CANCELED_AUTH_FLOW.code) { + whenAuthorizationFails(ex) + } else { + requireActivity().runOnUiThread { + loginAlert(R.string.login_alert_msg) + } + } } }) Log.d(TAG, "return handleAuthorizationResponse()") -- GitLab