Use `observable` delegate for `isConnected`

1 files changed, 7 insertions, 9 deletions

diff --git a/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index 5de430bbcb..aca773fca9 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
@@ -6,6 +6,7 @@ import android.net.ConnectivityManager.NetworkCallback
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import kotlin.properties.Delegates.observable
 import net.mullvad.talpid.util.EventNotifier
 
 class ConnectivityListener {
@@ -33,17 +34,14 @@ class ConnectivityListener {
 
     val connectivityNotifier = EventNotifier(false)
 
-    var isConnected = false
-        private set(value) {
-            field = value
-
-            if (senderAddress != 0L) {
-                notifyConnectivityChange(value, senderAddress)
-            }
-
-            connectivityNotifier.notify(value)
+    var isConnected by observable(false) { _, _, value ->
+        if (senderAddress != 0L) {
+            notifyConnectivityChange(value, senderAddress)
         }
 
+        connectivityNotifier.notify(value)
+    }
+
     var senderAddress = 0L
 
     fun register(context: Context) {