From b7dfb2ca5fd9c019d4601e54522a60e4823b7848 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Fri, 14 Nov 2025 13:33:33 -0500
Subject: [PATCH] Always initialize server/user view models

---
 .../damontecres/wholphin/ui/setup/SwitchServerContent.kt | 1 +
 .../wholphin/ui/setup/SwitchServerViewModel.kt           | 4 ----
 .../damontecres/wholphin/ui/setup/SwitchUserContent.kt   | 3 +++
 .../damontecres/wholphin/ui/setup/SwitchUserViewModel.kt | 9 +++------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerContent.kt
index c90dbe41..4cb05d43 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerContent.kt
@@ -53,6 +53,7 @@ fun SwitchServerContent(
     var showAddServer by remember { mutableStateOf(false) }
 
     LaunchedEffect(Unit) {
+        viewModel.init()
         viewModel.discoverServers()
     }
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerViewModel.kt
index 11202a31..d75dafaa 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchServerViewModel.kt
@@ -52,10 +52,6 @@ class SwitchServerViewModel
             addServerState.value = LoadingState.Pending
         }
 
-        init {
-            init()
-        }
-
         fun init() {
             viewModelScope.launchIO {
                 withContext(Dispatchers.Main) {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserContent.kt
index f747a612..a33479cb 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserContent.kt
@@ -58,6 +58,9 @@ fun SwitchUserContent(
         ),
 ) {
     val context = LocalContext.current
+    LaunchedEffect(Unit) {
+        viewModel.init()
+    }
 
 //    val currentServer by viewModel.serverRepository.currentServer.observeAsState()
     val currentUser by viewModel.serverRepository.currentUser.observeAsState()
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
index cd1d6daf..56d7ab98 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserViewModel.kt
@@ -48,12 +48,6 @@ class SwitchUserViewModel
             fun create(server: JellyfinServer): SwitchUserViewModel
         }
 
-        init {
-            viewModelScope.launch(Dispatchers.Main + ExceptionHandler()) {
-                serverRepository.switchServerOrUser()
-            }
-        }
-
         val serverQuickConnect = MutableLiveData<Boolean>(false)
 
         val users = MutableLiveData<List<JellyfinUser>>(listOf())
@@ -78,6 +72,9 @@ class SwitchUserViewModel
         }
 
         fun init() {
+            viewModelScope.launch(Dispatchers.Main + ExceptionHandler()) {
+                serverRepository.switchServerOrUser()
+            }
             quickConnectJob?.cancel()
             viewModelScope.launchIO {
                 users.setValueOnMain(listOf())