summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-14 13:43:27 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-14 13:43:27 -0300
commitcf4fa1723cdd723bc816ffe35588a4de965a1386 (patch)
treed8524718f9f82e1405030a5b3662675e5c99c0f0
parent525e9eabc592705fc0fcf107284ec164263ca03b (diff)
parenta69b3a2a264f87dcd4214e927d2965b971250f99 (diff)
downloadmullvadvpn-cf4fa1723cdd723bc816ffe35588a4de965a1386.tar.xz
mullvadvpn-cf4fa1723cdd723bc816ffe35588a4de965a1386.zip
Merge branch 'fix-notification-in-foreground'
-rw-r--r--CHANGELOG.md1
-rw-r--r--android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44e968c99..02dcc2053a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ Line wrap the file at 100 chars. Th
- Fix app restarting itself after quitting.
- Fix connect action from quick-settings tile or notification sometimes opening the UI instead of
connecting.
+- Fix notification sometimes not being dismissible.
## [2020.5] - 2020-06-25
diff --git a/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt b/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
index 405722f010..f0084e25d4 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
@@ -18,11 +18,11 @@ class EventNotifier<T>(private val initialValue: T) {
fun notify(event: T) {
synchronized(this) {
+ latestEvent = event
+
for (listener in listeners.values) {
listener(event)
}
-
- latestEvent = event
}
}