summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-30 16:20:30 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-31 14:36:30 +0000
commit23bc35b295504c76d3f1681294ecea71e40e7454 (patch)
tree2629b302dc94e7581a634be16fe79a235252ef4c /android/src/main
parentd0a879acf854046900b755b405e9ef5b49c52943 (diff)
downloadmullvadvpn-23bc35b295504c76d3f1681294ecea71e40e7454.tar.xz
mullvadvpn-23bc35b295504c76d3f1681294ecea71e40e7454.zip
Use `List` instead of `ArrayList` for history
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt2
3 files changed, 3 insertions, 3 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 5548b93b36..d4f6d9501b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/AccountCache.kt
@@ -23,7 +23,7 @@ class AccountCache(val daemon: MullvadDaemon, val settingsListener: SettingsList
val onAccountNumberChange = EventNotifier<String?>(null)
val onAccountExpiryChange = EventNotifier<DateTime?>(null)
- val onAccountHistoryChange = EventNotifier<ArrayList<String>>(ArrayList())
+ val onAccountHistoryChange = EventNotifier<List<String>>(listOf<String>())
var newlyCreatedAccount = false
private set
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
index 555d8e75b0..caefcfe51f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
@@ -14,7 +14,7 @@ class AccountHistoryAdapter : Adapter<AccountHistoryHolder>() {
}
}
- var accountHistory by observable(ArrayList<String>()) { _, _, _ ->
+ var accountHistory by observable(listOf<String>()) { _, _, _ ->
notifyDataSetChanged()
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
index 2d608f8c67..e4256a9dc5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
@@ -99,7 +99,7 @@ class AccountLogin : RelativeLayout {
val hasFocus
get() = focused
- var accountHistory by observable<ArrayList<String>?>(null) { _, _, history ->
+ var accountHistory by observable<List<String>?>(null) { _, _, history ->
val entryCount = history?.size ?: 0
historyHeight = entryCount * (historyEntryHeight + dividerHeight)