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 d670125e00e61121a631d63aa9023638bf0ab8da..d77fce4bc1f2a874fb9cc266530c7ca7258ef3d3 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()")