diff options
| author | Albin <albin@mullvad.net> | 2023-04-05 11:48:03 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-04-05 15:18:28 +0200 |
| commit | dd45299927ae04380e77f6eb86d3459582cd64dd (patch) | |
| tree | 2f99fffd0bebb1eca5638a6681431af083431e79 /android | |
| parent | b04dc2e451e093618af5c9d89a3852897c2d243f (diff) | |
| download | mullvadvpn-dd45299927ae04380e77f6eb86d3459582cd64dd.tar.xz mullvadvpn-dd45299927ae04380e77f6eb86d3459582cd64dd.zip | |
Fix app version missing in settings when no daemon connection
This issue was caused by the app version being provided by the
daemon. To fix this, the app version will now instead be resolved
via the `BuildConfig`.
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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 ?: "" } } |
