diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-18 10:28:46 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-18 10:28:46 -0300 |
| commit | b94272f83c2af3ec0657ced3758949dcb7c16081 (patch) | |
| tree | 0f9404d4637b0941826a051040024f8189653510 | |
| parent | d27c978a41da972d8ec1438b9f6cedf059c02771 (diff) | |
| parent | 71baa51dad773c409d8705dc4b700586df6f077e (diff) | |
| download | mullvadvpn-b94272f83c2af3ec0657ced3758949dcb7c16081.tar.xz mullvadvpn-b94272f83c2af3ec0657ced3758949dcb7c16081.zip | |
Merge branch 'fix-connectivity-listener-leak'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e1a4b04ab..43e879ed5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ Line wrap the file at 100 chars. Th #### Android - Make sure the settings screen is scrollable so that devices with small screens can access the quit button. +- Fix connectivity listener leak causing possible battery usage increase. #### Windows - Fix bug where failing to initialize the route manager could cause the daemon to get stuck in a diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt index 7d04bcc2c7..a521bcebfd 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt @@ -72,6 +72,7 @@ class LocationInfoCache( } fun onDestroy() { + connectivityListener.connectivityNotifier.unsubscribe(connectivityListenerId) activeFetch?.cancel() } |