From d2d0dc4d2589d2850db9872e521253234cd96b7d Mon Sep 17 00:00:00 2001
From: 1 <386029724@qq.com>
Date: Sat, 12 Jul 2025 11:41:34 +0800
Subject: [PATCH] optimize routes

---
 .../main/java/com/donut/mixfile/server/CustomUploader.kt    | 2 +-
 app/src/main/java/com/donut/mixfile/ui/nav/Nav.kt           | 6 ++++--
 app/src/main/java/com/donut/mixfile/ui/nav/NavUtil.kt       | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/donut/mixfile/server/CustomUploader.kt b/app/src/main/java/com/donut/mixfile/server/CustomUploader.kt
index 4f39825..8b3dfb9 100644
--- a/app/src/main/java/com/donut/mixfile/server/CustomUploader.kt
+++ b/app/src/main/java/com/donut/mixfile/server/CustomUploader.kt
@@ -22,7 +22,7 @@ var CUSTOM_REFERER by cachedMutableOf("", "CUSTOM_REFERER")
 
 val UPLOADERS = listOf(A1Uploader, A2Uploader, A3Uploader, CustomUploader)
 
-var currentUploader by cachedMutableOf(A1Uploader.name, "current_uploader")
+var currentUploader by cachedMutableOf(A2Uploader.name, "current_uploader")
 
 fun getCurrentUploader() =
     UPLOADERS.firstOrNull { it.name.contentEquals(currentUploader) } ?: A1Uploader
diff --git a/app/src/main/java/com/donut/mixfile/ui/nav/Nav.kt b/app/src/main/java/com/donut/mixfile/ui/nav/Nav.kt
index 5b20b23..1362cc2 100644
--- a/app/src/main/java/com/donut/mixfile/ui/nav/Nav.kt
+++ b/app/src/main/java/com/donut/mixfile/ui/nav/Nav.kt
@@ -63,8 +63,10 @@ fun NavComponent() {
                     NavigationDrawerItem(
                         selected = selected,
                         onClick = {
-                            controller.navigate(jumpTo) {
-                                launchSingleTop = true
+                            if (!selected) {
+                                controller.navigate(jumpTo) {
+                                    launchSingleTop = true
+                                }
                             }
                             scope.launch {
                                 drawerState.close()
diff --git a/app/src/main/java/com/donut/mixfile/ui/nav/NavUtil.kt b/app/src/main/java/com/donut/mixfile/ui/nav/NavUtil.kt
index 76f28b6..5487fcb 100644
--- a/app/src/main/java/com/donut/mixfile/ui/nav/NavUtil.kt
+++ b/app/src/main/java/com/donut/mixfile/ui/nav/NavUtil.kt
@@ -31,7 +31,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.donut.mixfile.server.core.utils.extensions.isNotNull
 import com.donut.mixfile.server.core.utils.genRandomString
 import java.lang.ref.WeakReference
 
@@ -102,8 +101,8 @@ fun NavTitle(showBackIcon: Boolean = false, title: String) {
 @Composable
 fun getNavController(): NavHostController {
     val cache = navControllerCache.get()
-    if (cache.isNotNull()) {
-        return cache!!
+    if (cache != null) {
+        return cache
     }
     val navController = rememberNavController()
     navControllerCache = WeakReference(navController)