diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -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 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index db3f310ef7..dff59d234d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Line wrap the file at 100 chars. Th #### Android - Fix adaptive app icon which previously had a displaced nose and some other oddities. +- Fix app version sometimes missing in the settings menu. #### macOS - Fix tray window behaviour when opening mission control and switching between full-screen workspaces. 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 ?: "" } } |