From bbb3a6808761ab450a605008f50ec86609927f8b Mon Sep 17 00:00:00 2001
From: Jenna Vassar <jenna.vassar@toptal.com>
Date: Mon, 10 Aug 2026 09:28:32 -0700
Subject: [PATCH] Save the selected account provider to history even if the
 flow default is reset

---
 .../accountprovider/AccountProviderDataSource.kt |  7 +++++++
 .../SaveAccountProviderToHistory.kt              |  6 +++++-
 .../SaveAccountProviderToHistoryTest.kt          | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
index 28e4294fa4..809c835d65 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderDataSource.kt
@@ -43,6 +43,12 @@ class AccountProviderDataSource(
 
     val flow: StateFlow<AccountProvider> = accountProvider.asStateFlow()
 
+    // The account provider the user last explicitly selected (via [setAccountProvider] / [setUrl]).
+    // Unlike [flow], this is not recomputed by [reset], so it survives to be persisted to history on a
+    // successful sign-in even when the login flow is torn down in between (e.g. across an OAuth round-trip).
+    var lastSelectedAccountProviderUrl: String? = null
+        private set
+
     init {
         // Seed the default from the last used provider, unless the user has already selected one.
         coroutineScope.launch {
@@ -72,6 +78,7 @@ class AccountProviderDataSource(
     }
 
     suspend fun setAccountProvider(data: AccountProvider) {
+        lastSelectedAccountProviderUrl = data.url
         accountProvider.emit(data)
     }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistory.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistory.kt
index a88be1ae15..46f3281826 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistory.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistory.kt
@@ -23,6 +23,10 @@ class SaveAccountProviderToHistory(
     private val appPreferencesStore: AppPreferencesStore,
 ) {
     suspend operator fun invoke() {
-        appPreferencesStore.addHomeserverToHistory(accountProviderDataSource.flow.value.url)
+        // Persist the provider the user actually selected, not the currently-exposed default: the latter can be
+        // reset back to the history default while the login flow is torn down across an OAuth round-trip.
+        val url = accountProviderDataSource.lastSelectedAccountProviderUrl
+            ?: accountProviderDataSource.flow.value.url
+        appPreferencesStore.addHomeserverToHistory(url)
     }
 }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistoryTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistoryTest.kt
index 957235395f..21fd7efce8 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistoryTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/accountprovider/SaveAccountProviderToHistoryTest.kt
@@ -31,4 +31,20 @@ class SaveAccountProviderToHistoryTest {
         assertThat(appPreferencesStore.getHomeserverHistoryFlow().first())
             .containsExactly("https://example.com")
     }
+
+    @Test
+    fun `invoke saves the selected provider even after the exposed default has been reset`() = runTest {
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val accountProviderDataSource = anAccountProviderDataSource(appPreferencesStore = appPreferencesStore)
+        accountProviderDataSource.setUrl("https://example.com")
+        // Simulate the login flow being torn down (e.g. across an OAuth round-trip), which reverts the
+        // exposed default; the user's selection must still be the one saved to history.
+        accountProviderDataSource.reset()
+        val sut = SaveAccountProviderToHistory(accountProviderDataSource, appPreferencesStore)
+
+        sut()
+
+        assertThat(appPreferencesStore.getHomeserverHistoryFlow().first())
+            .containsExactly("https://example.com")
+    }
 }