removing loggedIn

KevinSchildhorn · Oct 11, 2024 · 93ee04c · 93ee04c
1 parent b8e51af
commit 93ee04c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/...mmonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryScreen.kt b/...mmonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryScreen.kt
@@ -69,7 +69,6 @@ fun DirectoryScreen(
     var overlayVisible by remember { mutableStateOf(DirectoryOverlay.NONE) }
 
     // Navigation
-    if (!uiState.loggedIn) onLogout()
     uiState.slideshowDetails?.let {
         onStartSlideshow(it)
     }

diff --git a/...ain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryScreenState.kt b/...ain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryScreenState.kt
@@ -13,7 +13,6 @@ data class DirectoryScreenState(
     val currentPath: String = "",
     var directoryGridState: DirectoryGridState = DirectoryGridState(emptyList(), mutableListOf()),
     val slideshowDetails: ImageSlideshowDetails? = null,
-    val loggedIn: Boolean = true,
     val selectedDirectory: DirectoryGridCellState? = null,
     val currentImageCount: Int = 0,
     val totalImageCount: Int = 0,

diff --git a/...nMain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryViewModel.kt b/...nMain/kotlin/com/kevinschildhorn/fotopresenter/ui/screens/directory/DirectoryViewModel.kt
@@ -74,18 +74,12 @@ class DirectoryViewModel(
 
     //region Connection
 
-    fun setLoggedIn() {
-        _uiState.update { it.copy(loggedIn = true) }
-    }
-
     fun logout() {
         cancelJobs()
         viewModelScope.launch(Dispatchers.Default) {
             logger.i { "Logging Out" }
             val logoutUseCase = UseCaseFactory.disconnectFromServerUseCase
             logoutUseCase()
-            logger.d { "Setting loggedIn state to false" }
-            _uiState.update { it.copy(loggedIn = false) }
         }
     }
 

diff --git a/...ommonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModelTest.kt b/...ommonTest/kotlin/com/kevinschildhorn/fotopresenter/ui/viewmodel/DirectoryViewModelTest.kt
@@ -54,7 +54,6 @@ class DirectoryViewModelTest : KoinTest {
     fun `Refresh Screen`() =
         runTest(testDispatcher) {
             val viewModel: DirectoryViewModel by inject()
-            assertTrue(viewModel.uiState.value.loggedIn)
 
             viewModel.uiState.test {
                 viewModel.refreshScreen()
@@ -68,7 +67,6 @@ class DirectoryViewModelTest : KoinTest {
                 state = awaitItem()
                 assertEquals(UiState.SUCCESS, state.state)
                 assertEquals("", state.currentPath)
-                assertTrue(state.loggedIn)
                 assertEquals(2, state.directoryGridState.imageStates.count())
                 assertEquals(2, state.directoryGridState.folderStates.count())
                 cancelAndIgnoreRemainingEvents()
@@ -79,12 +77,10 @@ class DirectoryViewModelTest : KoinTest {
     fun logout() =
         runTest(testDispatcher) {
             val viewModel: DirectoryViewModel by inject()
-            assertTrue(viewModel.uiState.value.loggedIn)
             viewModel.uiState.test {
                 var state = awaitItem()
                 viewModel.logout()
                 state = awaitItem()
-                assertFalse(state.loggedIn)
                 cancelAndIgnoreRemainingEvents()
             }
         }