From c402e182069a3c1662ff938fc9adf13aab0819b4 Mon Sep 17 00:00:00 2001
From: acite <1498045907@qq.com>
Date: Wed, 17 Sep 2025 00:09:30 +0800
Subject: [PATCH] [fix] Can't hot reload server config in abyss mode.

---
 .../java/com/acitelight/aether/view/MeScreen.kt     |  4 ++--
 .../aether/viewModel/MeScreenViewModel.kt           | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/acitelight/aether/view/MeScreen.kt b/app/src/main/java/com/acitelight/aether/view/MeScreen.kt
index e93389d..554b854 100644
--- a/app/src/main/java/com/acitelight/aether/view/MeScreen.kt
+++ b/app/src/main/java/com/acitelight/aether/view/MeScreen.kt
@@ -116,7 +116,7 @@ fun MeScreen(meScreenViewModel: MeScreenViewModel = androidx.hilt.lifecycle.view
                     // Save Button
                     Button(
                         onClick = {
-                            meScreenViewModel.updateAccount(username, privateKey, context)
+                            meScreenViewModel.updateAccount(username, privateKey)
                         },
                         modifier = Modifier.fillMaxWidth(),
                         enabled = privateKey != "******"
@@ -198,7 +198,7 @@ fun MeScreen(meScreenViewModel: MeScreenViewModel = androidx.hilt.lifecycle.view
                     Row{
                         Button(
                             onClick = {
-                                meScreenViewModel.updateServer(url, cert, context)
+                                meScreenViewModel.updateServer(url, cert)
                             },
                             modifier = Modifier.weight(0.5f).padding(8.dp)
                         ) {
diff --git a/app/src/main/java/com/acitelight/aether/viewModel/MeScreenViewModel.kt b/app/src/main/java/com/acitelight/aether/viewModel/MeScreenViewModel.kt
index 3aef370..8008d24 100644
--- a/app/src/main/java/com/acitelight/aether/viewModel/MeScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/MeScreenViewModel.kt
@@ -86,7 +86,7 @@ class MeScreenViewModel @Inject constructor(
         }
     }
 
-    fun updateServer(u: String, c: String, context: Context)
+    fun updateServer(u: String, c: String)
     {
         viewModelScope.launch {
             settingsDataStoreManager.saveUrl(u)
@@ -101,26 +101,23 @@ class MeScreenViewModel @Inject constructor(
 
             try {
                 val usedUrl = ApiClient.apply(context, u, if(uss.first()) c else "")
+                (context as AetherApp).abyssService?.proxy?.config(ApiClient.getBase().toUri().host!!, 4096)
+                context.abyssService?.downloader?.init()
                 mediaManager.token = AuthManager.fetchToken(
                     us,
                     p
                 )!!
 
                 Global.loggedIn = true
-                withContext(Dispatchers.IO)
-                {
-                    (context as AetherApp).abyssService?.proxy?.config(ApiClient.getBase().toUri().host!!, 4096)
-                    context.abyssService?.downloader?.init()
-                }
                 Toast.makeText(context, "Server Updated, Used Url: $usedUrl", Toast.LENGTH_SHORT).show()
             } catch (e: Exception) {
                 print(e.message)
-                Toast.makeText(context, "Invalid Account or Server Information", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, "${e.message}", Toast.LENGTH_SHORT).show()
             }
         }
     }
 
-    fun updateAccount(u: String, p: String, context: Context) {
+    fun updateAccount(u: String, p: String) {
         viewModelScope.launch {
             settingsDataStoreManager.saveUserName(u)
             settingsDataStoreManager.savePrivateKey(p)