From 04c0e1474a79ee19950d2ab1cfe379c84cd5b3e8 Mon Sep 17 00:00:00 2001
From: sitou <sitou@atled.jp>
Date: Mon, 18 Aug 2025 16:07:50 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3AP?=
 =?UTF-8?q?I=E3=81=8C=E5=AE=8C=E4=BA=86=E3=81=97=E3=81=A6=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6=E3=83=88=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E9=80=B2=E3=82=81=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=E3=80=82=E9=80=9A=E7=9F=A5=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E9=96=8B=E3=81=84=E3=81=9F=E7=94=BB=E9=9D=A2=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/NotificationRepository.kt           | 49 ++++++++++----
 .../view/ui/DirectOpenDocumentActivity.kt     |  1 -
 .../jp/atled/agileworks/view/ui/DrawerMenu.kt | 67 +++++++++++++++++--
 .../atled/agileworks/view/ui/MainActivity.kt  | 11 +++
 .../ui/documentweb/DocumentWebFragment.kt     | 21 +++++-
 app/src/main/res/layout/activity_main.xml     | 15 +++++
 6 files changed, 142 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt b/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
index c8890aca..7bca3c86 100644
--- a/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
+++ b/app/src/main/java/jp/atled/agileworks/model/NotificationRepository.kt
@@ -6,6 +6,12 @@ import android.content.SharedPreferences
 import android.util.Log
 import jp.atled.agileworks.AwApp
 import jp.atled.agileworks.model.api.ApiClient
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.coroutines.resume
 
 /**
  * 通知全般を扱うリポジトリ
@@ -39,21 +45,40 @@ class NotificationRepository(_serverNumber: Int? = null) {
     fun clearToken(onResult: (Boolean) -> Unit) {
         Log.d("AgileWorks", "firebase token clean")
         ApiClient.reCreateLogout(serverNumber)
-        LogoutRepository.getInstance().getLogout {
-            /*
-            FcmRepository().removeFcmToken {
-                Log.d("AgileWorks", "firebase token clean -> ${successOrFailured(it)}")
-                onResult(it)
+        // 30秒でタイムアウト
+        GlobalScope.launch(Dispatchers.Main) {
+            val timeoutMillis = 30000L
+            val result = withTimeoutOrNull(timeoutMillis) {
+                suspendCancellableCoroutine<Boolean> { continuation ->
+                    LogoutRepository.getInstance().getLogout { success ->
+                        if (continuation.isActive) {
+                            continuation.resume(success)
+                        }
+                    }
+                }
             }
-            */
-            // 全サーバログアウト状態で FcmToken の削除
-            val serverList = ServerRepository().loadServerList()
-            if (serverList.isEmpty()) {
-                FcmRepository().removeFcmToken {
-                    Log.d("AgileWorks", "firebase token clean -> ${successOrFailured(it)}")
+
+            if (result == null) {
+                // タイムアウトした場合
+                // 全サーバログアウト状態で FcmToken の削除
+                val serverList = ServerRepository().loadServerList()
+                if (serverList.isEmpty()) {
+                    FcmRepository().removeFcmToken {
+                        Log.d("AgileWorks", "firebase token clean (timeout path)")
+                    }
+                }
+                onResult(true) // 成功として扱う
+            } else {
+                // タイムアウトしなかった場合
+                // 全サーバログアウト状態で FcmToken の削除
+                val serverList = ServerRepository().loadServerList()
+                if (serverList.isEmpty()) {
+                    FcmRepository().removeFcmToken {
+                        Log.d("AgileWorks", "firebase token clean -> ${successOrFailured(result)}")
+                    }
                 }
+                onResult(result)
             }
-            onResult(it)
         }
     }
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
index 036635ee..0c0df764 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
@@ -52,7 +52,6 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
         setContentView(binding.root)
         binding.toolbar.title = title()
         setSupportActionBar(binding.toolbar)
-        setupDrawerMenu()
         findViewById<Button>(R.id.close_btn).setOnClickListener(this);
         ViewCompat.setOnApplyWindowInsetsListener(binding.directOpenDocumentContent) { view, insets ->
             val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/DrawerMenu.kt b/app/src/main/java/jp/atled/agileworks/view/ui/DrawerMenu.kt
index 166955a3..0ffceb1f 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/DrawerMenu.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/DrawerMenu.kt
@@ -3,19 +3,25 @@ package jp.atled.agileworks.view.ui
 import BottomSheetFragment
 import android.app.Activity
 import android.content.Intent
+import android.util.Log
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.lifecycleScope
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.navigation.NavigationView
 import jp.atled.agileworks.R
 import jp.atled.agileworks.model.LoginRepository
 import jp.atled.agileworks.model.SessionRepository
+import jp.atled.agileworks.view.ui.documentweb.DocumentWebFragment
 import jp.atled.agileworks.view.ui.license.License
 import jp.atled.agileworks.view.ui.login.LoginUtil
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 
 class DrawerMenu {
     companion object {
@@ -30,14 +36,44 @@ class DrawerMenu {
                     }
                     R.id.drawer_applcation_logout -> {
                         AlertDialog.Builder(activity) // FragmentではActivityを取得して生成
-                                .setTitle(R.string.application_logout_title)
-                                .setMessage(R.string.application_logout_message)
-                                .setPositiveButton(R.string.application_logout_dialog_ok) { _, _ ->
-                                    LoginUtil.logout(activity)
+                            .setTitle(R.string.application_logout_title)
+                            .setMessage(R.string.application_logout_message)
+                            .setPositiveButton(R.string.application_logout_dialog_ok) { _, _ ->
+                                if (activity is MainActivity) {
+                                    activity.showLoadingIndicators()
                                 }
-                                .setNegativeButton(R.string.application_logout_dialog_no) { _, _ ->
+
+                                val scope = when (activity) {
+                                    is androidx.fragment.app.FragmentActivity -> activity.lifecycleScope
+                                    else -> null // 必要に応じて適切なスコープを選択
+                                }
+                                scope?.launch {
+                                    val documentWebFragment = findDocumentWebFragment(activity)
+
+                                    if (documentWebFragment != null) {
+                                        documentWebFragment.setLoadingLogout(true)
+                                        //　セッションAPI完了まで待つ。60秒でタイムアウト
+                                        val result = withTimeoutOrNull(60000) {
+                                            while (documentWebFragment.isSessionUpdateRequestInProgress()) {
+                                                Log.d(TAG, "Waiting for session update to complete before logout...")
+                                                delay(500)
+                                            }
+                                            true
+                                        }
+                                        if (result == true) {
+                                            Log.d(TAG,"SessionAPI update completed.")
+                                        } else {
+                                            Log.d(TAG,"SessionAPI timed out.")
+                                        }
+                                        LoginUtil.logout(activity)
+                                    } else {
+                                        LoginUtil.logout(activity)
+                                    }
                                 }
-                                .show()
+                            }
+                            .setNegativeButton(R.string.application_logout_dialog_no) { _, _ ->
+                            }
+                            .show()
                     }
                     R.id.drawer_application_license -> {
                         License.showLicense(activity)
@@ -61,6 +97,25 @@ class DrawerMenu {
             }
         }
 
+        // DrawerMenu 内に DocumentWebFragment を見つけるヘルパー関数
+        private fun findDocumentWebFragment(activity: AppCompatActivity): DocumentWebFragment? {
+            if (activity is MainActivity) {
+                try {
+                    // 現在表示されているFragmentを取得し、それがDocumentWebFragmentか確認する
+                    val navHostFragment = activity.supportFragmentManager.findFragmentById(R.id.main_nav_fragment)
+                    val currentFragment = navHostFragment?.childFragmentManager?.primaryNavigationFragment
+                    if (currentFragment is DocumentWebFragment) {
+                        return currentFragment
+                    }
+                } catch (e: Exception) {
+                    // ID が存在しない、キャストできないなどのエラーハンドリング
+                    Log.e(TAG, "Error finding DocumentWebFragment in MainActivity", e)
+                }
+
+            }
+            return null
+        }
+
         private fun setupUserName(activity: Activity, drawer: NavigationView) {
             SessionRepository.getInstance(activity).getSession { _, response, _ ->
                 val userName = response?.user?.name.orEmpty()
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
index 3a42d427..3815f35d 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
@@ -10,6 +10,7 @@ import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -241,6 +242,16 @@ class MainActivity : BaseActivity() {
             }
         }
     }
+
+    fun showLoadingIndicators() {
+        binding.progressBar.visibility = View.VISIBLE
+        binding.disablingView.visibility = View.VISIBLE
+    }
+
+    fun hideLoadingIndicators() {
+        binding.progressBar.visibility = View.INVISIBLE
+        binding.disablingView.visibility = View.INVISIBLE
+    }
 }
 
 fun Intent.toDeepLinkArguments() = Bundle().apply {
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
index f516c958..d2c1b59f 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/documentweb/DocumentWebFragment.kt
@@ -50,6 +50,7 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
     // タブ選択時初期URLリロードするかどうか
     private var reloadTab = false
     //tokenチェック重複防止フラグ
+    @Volatile
     private var sessionflg = false
     // 書類表示時 URL
     val docUrl = arrayOf("#docDetail", "#docCommentAdd", "#docAttachmentAdd")
@@ -62,6 +63,16 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
 
     private val baseViewModel by activityViewModels<BaseViewModel>()
 
+    private var isLoadingLogout = false
+
+    fun setLoadingLogout(loadingLogout: Boolean) {
+        this.isLoadingLogout = loadingLogout
+    }
+
+    fun isSessionUpdateRequestInProgress(): Boolean {
+        return sessionflg
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         viewDataBinding = FragmentWebviewDetailBinding.inflate(inflater, container, false).apply {
             viewModel = ViewModelProvider(this@DocumentWebFragment).get(DocumentWebViewModel::class.java)
@@ -552,6 +563,10 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
 
     //tokenチェック
     override fun updateSession(url: String?, updateLanguage: Boolean) {
+        if (isLoadingLogout) {
+            Log.d(TAG, "skip updateSession because isLoadingLogout")
+            return
+        }
         // 非同期にセッション情報取得,cookie設定
         val lock = java.util.concurrent.locks.ReentrantLock()
         lock.withLock {
@@ -572,9 +587,9 @@ class DocumentWebFragment : Fragment(), DocumentWebPresenter {
                                 val uri = Uri.parse(url)
                                 response!!.session_id?.apply {
                                     sessionId = response!!.session_id
-                                        headers?.get("set-cookie")?.also { setCookieHeaders ->
-                                            SessionRepository.setCookie(setCookieHeaders, sessionId!!, "https://${uri.host}")
-                                        }
+                                    headers?.get("set-cookie")?.also { setCookieHeaders ->
+                                        SessionRepository.setCookie(setCookieHeaders, sessionId!!, "https://${uri.host}")
+                                    }
                                 }
                                 if (updateLanguage) {
                                     // 多言語対応
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6a701119..978eb2cb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -91,6 +91,21 @@
             app:menu="@menu/bottom_menu_nav"
             app:labelVisibilityMode="labeled"
             />
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="invisible"/>
+        <View
+            android:id="@+id/disablingView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/white_trans_50"
+            android:visibility="invisible"
+            android:elevation="10dp"
+            android:clickable="true"
+            />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.navigation.NavigationView
-- 
GitLab