1 files changed, 5 insertions, 14 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 f63ca84f58..36e09b1721 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
@@ -20,25 +20,16 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
         public val EXPIRY_FORMAT = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss z")
     }
 
+    val onAccountNumberChange = EventNotifier<String?>(null)
+    val onAccountExpiryChange = EventNotifier<DateTime?>(null)
+
     private val jobTracker = JobTracker()
 
-    private var accountNumber: String? = null
-        set(value) {
-            field = value
-            onAccountNumberChange.notify(value)
-        }
-
-    private var accountExpiry: DateTime? = null
-        set(value) {
-            field = value
-            onAccountExpiryChange.notify(value)
-        }
+    private var accountNumber by onAccountNumberChange.notifiable()
+    private var accountExpiry by onAccountExpiryChange.notifiable()
 
     private var oldAccountExpiry: DateTime? = null
 
-    val onAccountNumberChange = EventNotifier<String?>(null)
-    val onAccountExpiryChange = EventNotifier<DateTime?>(null)
-
     init {
         settingsListener.accountNumberNotifier.subscribe(this) { accountNumber ->
             handleNewAccountNumber(accountNumber)