diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-05-14 18:02:15 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-05-14 18:02:15 +0200 |
| commit | 65b957623a04bff6a9c5b246635225ff0317c819 (patch) | |
| tree | 34af684840c02a86e4f0432a17fe2aafb75f8943 /android/src | |
| parent | 56209ac5b482af7a80a1c9061adbf736fe1093b9 (diff) | |
| parent | 5b88631de855b9ce48fe5da9b8a836602d3f403e (diff) | |
| download | mullvadvpn-65b957623a04bff6a9c5b246635225ff0317c819.tar.xz mullvadvpn-65b957623a04bff6a9c5b246635225ff0317c819.zip | |
Merge branch 'beta-program-update'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt index a658760206..ebb490a5a4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -20,7 +20,7 @@ class AppVersionInfoCache( private val setUpJob = setUp() private val settingsListenerId = settingsListener.subscribe { settings -> - showBetaReleases = settings.showBetaReleases ?: false + showBetaReleases = settings.showBetaReleases } private var appVersionInfo: AppVersionInfo? = null diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt index d9c10a6a01..fbc295d8a0 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt @@ -6,5 +6,5 @@ data class Settings( var allowLan: Boolean, var autoConnect: Boolean, var tunnelOptions: TunnelOptions, - var showBetaReleases: Boolean? + var showBetaReleases: Boolean ) |