From 1771ab5e9ef3fbf81a1e8909903f4bd52cfe67dc Mon Sep 17 00:00:00 2001
From: sitou <sitou@atled.jp>
Date: Thu, 19 Dec 2024 10:42:50 +0900
Subject: [PATCH 1/2] =?UTF-8?q?getApprovalItems=E3=81=A7while=E3=81=8C?=
 =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=97=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agileworks/widget/AwAppWidgetRemoteViewsFactory.kt      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
index 7bad2ff6..7044e988 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt
@@ -166,9 +166,15 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent?
     private fun getApprovalItems(): List<ApprovalInfo>? {
         try {
             val prefs = AwApp.instance.applicationContext.getSharedPreferences(AwApp.WIDGET_PREFERENCES, Context.MODE_PRIVATE)
+            val timeout = 10000L
+            val startTime = System.currentTimeMillis()
 
             while (prefs.getBoolean(AwApp.WIDGET_UPDATE_FLG, false)) {
                 //別のウィジェットが更新中の場合は待つ
+                if(System.currentTimeMillis() - startTime > timeout){
+                    break
+                }
+                Thread.sleep(100)
             }
 
             prefs.edit().putBoolean(AwApp.WIDGET_UPDATE_FLG, true).apply()
-- 
GitLab


From 573704f870af4837bede7b05138fbbe45dabe730 Mon Sep 17 00:00:00 2001
From: sitou <sitou@atled.jp>
Date: Tue, 18 Mar 2025 02:52:07 +0000
Subject: [PATCH 2/2] =?UTF-8?q?T-005576=20=E6=8E=A5=E7=B6=9A=E5=85=88?=
 =?UTF-8?q?=E3=81=8C=E4=BF=9D=E5=AD=98=E6=B8=88=E3=81=BF=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=81=A8=E9=87=8D=E8=A4=87=E3=81=99=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E3=81=8D=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=9B?=
 =?UTF-8?q?=E3=81=9A=E6=8E=A5=E7=B6=9A=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/atled/agileworks/view/ui/login/LoginFragment.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 7a3ada6f..4b048dba 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
@@ -179,7 +179,7 @@ class LoginFragment: Fragment() {
                 binding.viewmodel?.setServerContext()
 
                 if (checkServer()) {
-                    loginAlert(R.string.login_server_check_alert)
+                    whenAuthorizationSucceeds()
                 } else {
                     try {
                         startAuthorization()
@@ -254,6 +254,8 @@ class LoginFragment: Fragment() {
         for (server in serverList) {
             val serverName = LoginRepository(server).loadServerUrl()
             if (serverName == serverHost) {
+                ServerRepository().setServer(server)
+                ServerRepository().changeServerList(server)
                 return true
             }
         }
-- 
GitLab