diff options
| author | Albin <albin@mullvad.net> | 2023-04-05 15:21:20 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-04-05 15:21:20 +0200 |
| commit | 6e2ee9efadf599a9d64a1a246ee18d36370eaba5 (patch) | |
| tree | 62b1f111a2bd70d4ef90fc679d9ef14d43d192e8 /android | |
| parent | b04dc2e451e093618af5c9d89a3852897c2d243f (diff) | |
| parent | dfa3a983f6fb67419e35078d2359f1929d44e918 (diff) | |
| download | mullvadvpn-6e2ee9efadf599a9d64a1a246ee18d36370eaba5.tar.xz mullvadvpn-6e2ee9efadf599a9d64a1a246ee18d36370eaba5.zip | |
Merge branch 'fix-missing-app-verison-in-settings-droid-85'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt | 2 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt index ac52959374..ca5fe50aed 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt @@ -1,7 +1,7 @@ package net.mullvad.mullvadvpn.ui data class VersionInfo( - val currentVersion: String?, + @Deprecated(message = "Use BuildConfig.VERSION_NAME") val currentVersion: String?, val upgradeVersion: String?, val isOutdated: Boolean, val isSupported: Boolean diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt index b5e7a64b39..777f014aa0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch +import net.mullvad.mullvadvpn.BuildConfig import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.DeviceState import net.mullvad.mullvadvpn.repository.AccountRepository @@ -114,6 +115,7 @@ class SettingsFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter private fun initializeUiState() { updateLoggedInStatus(deviceRepository.deviceState.value is DeviceState.LoggedIn) accountMenu.accountExpiry = accountRepository.accountExpiryState.value.date() + appVersionMenu.version = BuildConfig.VERSION_NAME serviceConnectionManager.appVersionInfoCache().let { cache -> updateVersionInfo( if (cache != null) { @@ -189,6 +191,5 @@ class SettingsFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter private fun updateVersionInfo(versionInfo: VersionInfo) { appVersionMenu.updateAvailable = versionInfo.isOutdated || !versionInfo.isSupported - appVersionMenu.version = versionInfo.currentVersion ?: "" } } |