diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-10-02 15:00:40 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-10-02 15:00:40 -0300 |
| commit | 14bbfaa52ad1b3bfd2917d0aa79ce7a4dacfc9cd (patch) | |
| tree | 8d8fc1615693d9a1e58aa2dc55fd5185becbdcaa | |
| parent | 1686a92c933d9b0359381cc047725bd42ed177b9 (diff) | |
| parent | d75deccfc9a5e58189c2f9d58c77f5f31457b07b (diff) | |
| download | mullvadvpn-14bbfaa52ad1b3bfd2917d0aa79ce7a4dacfc9cd.tar.xz mullvadvpn-14bbfaa52ad1b3bfd2917d0aa79ce7a4dacfc9cd.zip | |
Merge branch 'fix-disappearing-out-address'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a28bf39b5..8a4576410f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Line wrap the file at 100 chars. Th #### Android - Show WireGuard key age in local timezone instead of UTC. - Fix notification button icons. +- Fix collapsing tunnel information causing tunnel out IP address information to be lost. ## [2019.8] - 2019-09-23 diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt index f0850326b2..113b416195 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt @@ -24,6 +24,8 @@ class LocationInfo(val parentView: View, val context: Context) { var location: GeoIpLocation? = null set(value) { + field = value + country.text = value?.country ?: "" city.text = value?.city ?: "" hostname.text = value?.hostname ?: "" |