From c576fc95c225dad6aa2bee5e97623f0f6c226086 Mon Sep 17 00:00:00 2001
From: S-6203-ATLED <kikuchi.tomoya@nttdata-sbc.co.jp>
Date: Tue, 31 May 2022 11:56:16 +0900
Subject: [PATCH] =?UTF-8?q?#84=20=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9API?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atled/agileworks/view/ui/login/LoginFragment.kt  | 12 ++++++++++--
 app/src/main/res/values-en/strings.xml               |  1 +
 app/src/main/res/values-ja/strings.xml               |  1 +
 app/src/main/res/values-zh-rTW/strings.xml           |  1 +
 app/src/main/res/values-zh/strings.xml               |  1 +
 app/src/main/res/values/strings.xml                  |  1 +
 6 files changed, 15 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 d5f2d395..0b4d81da 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
@@ -375,8 +375,16 @@ class LoginFragment: Fragment() {
             if (token != null) {
                 DeviceInfoRepository().loadOrCreateDeviceId(this.requireActivity(), token) { _, deviceId ->
                     Log.d(TAG, "device id = $deviceId")
-                    // レスポンスが返ってきたらMainActivity起動
-                    whenAuthorizationSucceeds()
+                    if (deviceId != null) {
+                        // レスポンスが返ってきたらMainActivity起動
+                        whenAuthorizationSucceeds()
+                    } else {
+                        LoginUtil.clearAuthStateAndNotificationToken{
+                            requireActivity().runOnUiThread {
+                                loginAlert(R.string.login_alert_msg)
+                            }
+                        }
+                    }
                 }
             }
         }
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e976030b..b6c4f408 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -55,6 +55,7 @@
     <string name="login_alert_title">AgileWorks</string>
     <string name="login_alert_button_label">OK</string>
     <string name="login_alert_browser_not_found_msg">Default browser is currently unavailable. The application requires a browser to operate. Please check.</string>
+    <string name="login_alert_msg">Login failed. Please login again.</string>
 
     <!-- ダウンロード通知メッセージ -->
     <string name="download_notification_downloading_message">Downloading</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 80346823..266f7401 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -55,6 +55,7 @@
     <string name="login_alert_title">AgileWorks</string>
     <string name="login_alert_button_label">OK</string>
     <string name="login_alert_browser_not_found_msg">現在、既定のブラウザが利用できません。アプリの動作にはブラウザが必要です。確認してください。</string>
+    <string name="login_alert_msg">ログインに失敗しました。再度ログインしてください。</string>
 
     <!-- ダウンロード通知メッセージ -->
     <string name="download_notification_downloading_message">ダウンロード中</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a2801d20..6c47e39a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -55,6 +55,7 @@
     <string name="login_alert_title">AgileWorks</string>
     <string name="login_alert_button_label">好的</string>
     <string name="login_alert_browser_not_found_msg">默認瀏覽器目前不可用。該應用程序需要一個瀏覽器才能工作。請檢查。</string>
+    <string name="login_alert_msg">登录失败。请重新登录。</string>
 
     <!-- ダウンロード通知メッセージ -->
     <string name="download_notification_downloading_message">下載</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 61e31c55..d2cb72f4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -55,6 +55,7 @@
     <string name="login_alert_title">AgileWorks</string>
     <string name="login_alert_button_label">好的</string>
     <string name="login_alert_browser_not_found_msg">默认浏览器目前不可用。 该应用程序需要一个浏览器才能工作。 请检查。</string>
+    <string name="login_alert_msg">登录失败。 请重新登录。</string>
 
     <!-- ダウンロード通知メッセージ -->
     <string name="download_notification_downloading_message">下载</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 80346823..266f7401 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,7 @@
     <string name="login_alert_title">AgileWorks</string>
     <string name="login_alert_button_label">OK</string>
     <string name="login_alert_browser_not_found_msg">現在、既定のブラウザが利用できません。アプリの動作にはブラウザが必要です。確認してください。</string>
+    <string name="login_alert_msg">ログインに失敗しました。再度ログインしてください。</string>
 
     <!-- ダウンロード通知メッセージ -->
     <string name="download_notification_downloading_message">ダウンロード中</string>
-- 
GitLab