summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-05 16:28:57 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-02-06 17:10:44 +0000
commita865cfe778a3627f1859601d8bd77a28932d5c7d (patch)
treeeac797224e29b0ba1d82e8cacc4c984b55904e2e /android/src
parente498f07e2322d581e1e0a5b5fc0243fa919eedb3 (diff)
downloadmullvadvpn-a865cfe778a3627f1859601d8bd77a28932d5c7d.tar.xz
mullvadvpn-a865cfe778a3627f1859601d8bd77a28932d5c7d.zip
Make sure `stopForeground` works on API 21
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt7
1 files changed, 6 insertions, 1 deletions
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 0a9a48e3fa..34ccb59bfd 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
@@ -207,7 +207,12 @@ class ForegroundNotificationManager(val service: Service, val connectionProxy: C
service.startForeground(FOREGROUND_NOTIFICATION_ID, buildNotification())
onForeground = true
} else if (!shouldBeOnForeground) {
- service.stopForeground(Service.STOP_FOREGROUND_DETACH)
+ if (Build.VERSION.SDK_INT >= 24) {
+ service.stopForeground(Service.STOP_FOREGROUND_DETACH)
+ } else {
+ service.stopForeground(false)
+ }
+
onForeground = false
}
}