Merge branch 'fix-split-tunneling-after-restart'

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a3880023..24b8cc0712 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ Line wrap the file at 100 chars.                                              Th
 - Fix rare crash that could happen when starting the background service.
 - Fix rare crash that happened with large text sizes and long location names on the main screen.
 - Fix UI not updating in split screen mode when the window is unfocused.
+- Fix split tunneling not being correctly configured after restarting the app.
 
 
 ## [2020.6-beta2] - 2020-08-27
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt
index 7f0a678baa..78015e4e4b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SplitTunneling.kt
@@ -27,11 +27,14 @@ class SplitTunneling(context: Context) {
         enabledChanged()
     }
 
-    var onChange: ((List<String>) -> Unit)? = null
+    var onChange by observable<((List<String>) -> Unit)?>(null) { _, _, _ ->
+        update()
+    }
 
     init {
         if (appListFile.exists()) {
             excludedApps.addAll(appListFile.readLines())
+            update()
         }
     }