summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-19 18:05:57 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-19 18:05:57 -0300
commitb5d9bb08cdae74a7fbc375d29311344bb5f89cdd (patch)
tree17697ac15dc2bfa3d5cde345dc9d47d1f4ae32fa
parent339dcd635871ed273849c9e210e4719dfc681776 (diff)
parent1cfae162d103713d89e965b05bfe38092d294e8f (diff)
downloadmullvadvpn-b5d9bb08cdae74a7fbc375d29311344bb5f89cdd.tar.xz
mullvadvpn-b5d9bb08cdae74a7fbc375d29311344bb5f89cdd.zip
Merge branch 'forcefully-paint-when-header-bar-is-initialized'
-rw-r--r--CHANGELOG.md1
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99f5baca0a..bca02638aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@ Line wrap the file at 100 chars. Th
#### Android
- Fix input area sometimes disappearing when returning to the Login screen.
+- Fix status bar having the wrong color after logging out.
## [2021.2] - 2021-02-18
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
index eb6ba12032..877fcd9c66 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
@@ -53,5 +53,7 @@ class HeaderBar @JvmOverloads constructor(
findViewById<View>(R.id.settings).setOnClickListener {
(context as? MainActivity)?.openSettings()
}
+
+ tunnelState = null
}
}