1 files changed, 7 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
index b75450b438..cdd90b0d3c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
@@ -13,9 +13,6 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
     }
 
     private val jobTracker = JobTracker()
-    private val subscriptionId = settingsListener.accountNumberNotifier.subscribe { accountNumber ->
-        handleNewAccountNumber(accountNumber)
-    }
 
     private var accountNumber: String? = null
     private var accountExpiry: DateTime? = null
@@ -28,6 +25,12 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
             }
         }
 
+    init {
+        settingsListener.accountNumberNotifier.subscribe(this) { accountNumber ->
+            handleNewAccountNumber(accountNumber)
+        }
+    }
+
     fun fetchAccountExpiry() {
         accountNumber?.let { account ->
             jobTracker.newBackgroundJob("fetch") {
@@ -51,7 +54,7 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
     }
 
     fun onDestroy() {
-        settingsListener.accountNumberNotifier.unsubscribe(subscriptionId)
+        settingsListener.accountNumberNotifier.unsubscribe(this)
         jobTracker.cancelAllJobs()
     }