From 2f81ad6465df9a3a92786874fd1c785d89e01a0f Mon Sep 17 00:00:00 2001
From: sitou <sitou@atled.jp>
Date: Tue, 27 May 2025 09:53:05 +0900
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E7=B6=9A=E5=85=88=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=82=82url=E6=9C=AA=E5=85=A5?=
 =?UTF-8?q?=E5=8A=9B=E6=99=82=E3=81=AB=E6=8E=A5=E7=B6=9A=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E6=8A=BC=E3=81=9B=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=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    | 5 ++++-
 .../jp/atled/agileworks/view/ui/login/LoginViewModel.kt   | 8 ++++++++
 2 files changed, 12 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 9c28d6b0..c44f0216 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
@@ -83,8 +83,11 @@ class LoginFragment: Fragment() {
         if (requireActivity().intent.action != LoginActivity.ACTION_ADD_SERVER) {
             binding.viewmodel?.fetchServerUrl()
             binding.viewmodel?.fetchServerContext()
-            setupObservers()
+        } else {
+            binding.viewmodel?.refreshServerUrl()
+            binding.viewmodel?.refreshServerContext()
         }
+        setupObservers()
 
         mOAuthService.initAuthService(requireContext());
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
index 55e3c394..e6900600 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginViewModel.kt
@@ -30,6 +30,10 @@ class LoginViewModel: BaseViewModel() {
         return serverUrlLive.value
     }
 
+    fun refreshServerUrl() {
+        serverUrlLive.value = ""
+    }
+
     fun loadServerContext(serverContext: String) {
         if (serverContext.isBlank()) {
             serverContextLive.value = serverContext
@@ -50,6 +54,10 @@ class LoginViewModel: BaseViewModel() {
         return serverContextLive.value
     }
 
+    fun refreshServerContext() {
+        serverContextLive.value = ""
+    }
+
     private fun String.stripScheme(): String = SCHEME_PATTERN.replaceFirst(this, "")
     companion object {
         private val SCHEME_PATTERN = Regex("^https?://")
-- 
GitLab