Listen for history events in the `LoginFragment`

1 files changed, 6 insertions, 10 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 85f2da5e61..e19909a0cf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -59,7 +59,6 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             accountLogin.clearFocus()
         }
 
-        fetchHistory()
         scrollToShow(accountLogin)
 
         return view
@@ -74,11 +73,16 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             }
         }
 
-        fetchHistory()
+        accountCache.onAccountHistoryChange.subscribe(this) { history ->
+            jobTracker.newUiJob("updateHistory") {
+                accountLogin.accountHistory = history
+            }
+        }
     }
 
     override fun onSafelyStop() {
         jobTracker.cancelJob("advanceToNextScreen")
+        accountCache.onAccountHistoryChange.unsubscribe(this)
     }
 
     private fun scrollToShow(view: View) {
@@ -125,14 +129,6 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         performLogin(accountToken)
     }
 
-    private fun fetchHistory() {
-        jobTracker.newUiJob("fetchHistory") {
-            accountLogin.accountHistory = jobTracker.runOnBackground() {
-                daemon.getAccountHistory()
-            }
-        }
-    }
-
     private fun performLogin(accountToken: String) {
         jobTracker.newUiJob("login") {
             val loginResult = jobTracker.runOnBackground {