diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-30 16:45:19 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-30 16:45:19 -0300 |
| commit | e4cf31a509d43c90ba35ea9281ce35d62190f7d1 (patch) | |
| tree | fccc9b7623932abe30503bfc55d54216026fbd79 | |
| parent | 35b92d42ff83deeb7b95b276df03af5af67b130e (diff) | |
| parent | 733412643f009f17929e2cc81d186d80c4759cde (diff) | |
| download | mullvadvpn-e4cf31a509d43c90ba35ea9281ce35d62190f7d1.tar.xz mullvadvpn-e4cf31a509d43c90ba35ea9281ce35d62190f7d1.zip | |
Merge branch 'fix-notification-dismissal'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 451f031416..97baa2f4a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,7 @@ Line wrap the file at 100 chars. Th - Restart background service if it stops responding. - Fix crash when VPN permission is revoked, either manually or by starting another VPN app. - Fix crash caused by local JNI reference table overflow after running for a long time. +- Dismiss notification after service has stopped. ### Security #### Windows diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt index a04af6d8a8..29c6681cd1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt @@ -169,6 +169,8 @@ class ForegroundNotificationManager(val service: Service, val connectionProxy: C stopForeground(true) } + + notificationManager.cancel(FOREGROUND_NOTIFICATION_ID) } private fun initChannel() { |