Fix clearing history when switching between servers (#6357)

Author: jpelgrom

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewActivity.kt

@@ -1509,12 +1509,12 @@ class WebViewActivity :
             }
             supportFragmentManager.clearFragmentResultListener(BlockInsecureFragment.RESULT_KEY)
 
-            clearHistory = !keepHistory
             val oldUrl = loadedUrl
             // It means that if we loaded an URL with a path previously and we try to load the same URL without
             // a path we don't do anything.
             val shouldLoadUrl = !url.hasSameOrigin(oldUrl) || url.hasNonRootPath()
             if (shouldLoadUrl) {
+                clearHistory = !keepHistory
                 loadedUrl = url
                 webView.loadUrl(url.toString())
                 waitForConnection()

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenter.kt

@@ -16,6 +16,7 @@ interface WebViewPresenter {
         lifecycle: Lifecycle,
         path: String? = null,
         isInternalOverride: ((ServerConnectionInfo) -> Boolean)? = null,
+        isNewServer: Boolean? = null,
     )
 
     fun getActiveServer(): Int

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewPresenterImpl.kt

@@ -107,10 +107,11 @@ class WebViewPresenterImpl @Inject constructor(
         lifecycle: Lifecycle,
         path: String?,
         isInternalOverride: ((ServerConnectionInfo) -> Boolean)?,
+        isNewServer: Boolean?,
     ) {
         urlFlowJob?.cancel()
 
-        val isNewServer = ensureServerIsAvailable()
+        val isNewServer = isNewServer ?: ensureServerIsAvailable()
         if (!isSessionConnected()) return
 
         urlFlowJob = lifecycle.cancelOnLifecycle(Lifecycle.State.STARTED) {
@@ -260,11 +261,12 @@ class WebViewPresenterImpl @Inject constructor(
     }
 
     override suspend fun switchActiveServer(lifecycle: Lifecycle, id: Int) {
+        val isNewServer = serverId != id
         if (serverId != id && serverId != ServerManager.SERVER_ID_ACTIVE) {
             setAppActive(false) // 'Lock' old server
         }
         setActiveServer(id)
-        load(lifecycle = lifecycle)
+        load(lifecycle, isNewServer = isNewServer)
         view.unlockAppIfNeeded()
     }
 

app/src/test/kotlin/io/homeassistant/companion/android/webview/WebViewPresenterImplTest.kt

@@ -507,6 +507,41 @@ class WebViewPresenterImplTest {
         assertEquals(42, presenter.getActiveServer())
     }
 
+    @Test
+    fun `Given url to load when server is changed then history should not be kept`() = runTest {
+        val server1 = mockk<Server>(relaxed = true)
+        every { server1.id } returns 1
+        coEvery { serverManager.getServer(1) } returns server1
+        coEvery { serverManager.getServer(ServerManager.SERVER_ID_ACTIVE) } returns server1
+
+        coEvery { authenticationRepository.getSessionState() } returns SessionState.CONNECTED
+        coEvery { connectionStateProvider.urlFlow(any()) } returns flowOf(UrlState.HasUrl(URL("https://example.com")))
+
+        lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+        lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
+
+        createPresenter()
+        advanceUntilIdle()
+
+        // Simulate initial load
+        presenter.load(lifecycle, path = null, isInternalOverride = null)
+        advanceUntilIdle()
+
+        // Initial load - server didn't change so history should be kept
+        verify(exactly = 1) { webView.loadUrl(url = any(), keepHistory = true, openInApp = any(), serverHandleInsets = any()) }
+
+        // Switch server
+        val server2 = mockk<Server>(relaxed = true)
+        every { server2.id } returns 2
+        coEvery { serverManager.getServer(2) } returns server2
+
+        presenter.switchActiveServer(lifecycle, server2.id)
+        advanceUntilIdle()
+
+        // Server change should trigger load - server changed so history should not be kept
+        verify(exactly = 1) { webView.loadUrl(url = any(), keepHistory = false, openInApp = any(), serverHandleInsets = any()) }
+    }
+
     @Test
     fun `Given security level not set when load called then shows security level fragment`() = runTest(testDispatcher) {
         val server = mockk<Server>(relaxed = true)