Merge branch 'fix-settings-listener'

mullvad · May 8, 2020 · f06dfd5 · f06dfd5
2 parents 184330c + 693cf1d
commit f06dfd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,14 +42,15 @@ Line wrap the file at 100 chars.                                              Th
 - Adjust the minimum supported Android version to correctly reflect the supported versions decided
   in 2020.4-beta2. The app will now only install on Android 7 and later (API level 24).
 
-
+### Fixed
 #### Android
 - Fix crash when leaving WireGuard Key screen while key is still verifying.
 - Fix crash that sometimes happens right after some other unrelated crash.
 - Fix app not connecting when pressing the notification or quick-settings tile when the service
   isn't running. It would previously just open the app UI and stay in the disconnected state.
 - Fix crash when requesting to connect from notification or quick-settings tile.
 - Fix version update notifications not appearing.
+- Fix UI losing any settings updates that happen after leaving the app and then coming back.
 
 
 ## [2020.4-beta4] - 2020-05-06

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
@@ -28,6 +28,5 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity:
         appVersionInfoCache.onDestroy()
         keyStatusListener.onDestroy()
         relayListListener.onDestroy()
-        settingsListener.onDestroy()
     }
 }