Remove tunnel state storage in shared preferences

4 files changed, 0 insertions, 113 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index a4685b6dd8..d8cf359dc4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -15,7 +15,6 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.model.Settings
 import net.mullvad.mullvadvpn.service.endpoint.ServiceEndpoint
 import net.mullvad.mullvadvpn.service.notifications.AccountExpiryNotification
-import net.mullvad.mullvadvpn.service.tunnelstate.TunnelStateUpdater
 import net.mullvad.mullvadvpn.ui.MainActivity
 import net.mullvad.talpid.TalpidVpnService
 
@@ -55,7 +54,6 @@ class MullvadVpnService : TalpidVpnService() {
     private lateinit var endpoint: ServiceEndpoint
     private lateinit var keyguardManager: KeyguardManager
     private lateinit var notificationManager: ForegroundNotificationManager
-    private lateinit var tunnelStateUpdater: TunnelStateUpdater
 
     private var pendingAction by observable<PendingAction?>(null) { _, _, _ ->
         endpoint.settingsListener.settings?.let { settings ->
@@ -91,8 +89,6 @@ class MullvadVpnService : TalpidVpnService() {
             connectionProxy.reconnect()
         }
 
-        tunnelStateUpdater = TunnelStateUpdater(this, connectionProxy)
-
         notificationManager =
             ForegroundNotificationManager(this, connectionProxy, keyguardManager).apply {
                 acknowledgeStartForegroundService()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/Persistence.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/Persistence.kt
deleted file mode 100644
index 73b5c6de7e..0000000000
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/Persistence.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.mullvad.mullvadvpn.service.tunnelstate
-
-import android.content.Context
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
-import java.net.InetSocketAddress
-import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.talpid.net.Endpoint
-import net.mullvad.talpid.net.TransportProtocol
-import net.mullvad.talpid.net.TunnelEndpoint
-
-private const val SHARED_PREFERENCES = "tunnel_state"
-private const val KEY_TUNNEL_STATE = "tunnel_state"
-
-// TODO: Maybe replace using this with actually persisting the endpoint information
-private val dummyTunnelEndpoint = TunnelEndpoint(
-    Endpoint(
-        InetSocketAddress.createUnresolved("dummy", 53),
-        TransportProtocol.Tcp
-    )
-)
-
-internal class Persistence(context: Context) {
-    val sharedPreferences =
-        context.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE)
-
-    var state
-        get() = loadState()
-        set(value) {
-            persistState(value)
-        }
-
-    var listener: OnSharedPreferenceChangeListener? = null
-        set(value) {
-            if (value != field) {
-                if (field != null) {
-                    sharedPreferences.unregisterOnSharedPreferenceChangeListener(field)
-                }
-
-                if (value != null) {
-                    sharedPreferences.registerOnSharedPreferenceChangeListener(value)
-                }
-
-                field = value
-            }
-        }
-
-    private fun loadState(): TunnelState {
-        val description = sharedPreferences.getString(KEY_TUNNEL_STATE, TunnelState.DISCONNECTED)!!
-
-        return TunnelState.fromString(description, dummyTunnelEndpoint)
-    }
-
-    private fun persistState(state: TunnelState) {
-        sharedPreferences
-            .edit()
-            .putString(KEY_TUNNEL_STATE, state.toString())
-            .commit()
-    }
-}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateListener.kt
deleted file mode 100644
index 7f7832d3e4..0000000000
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateListener.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package net.mullvad.mullvadvpn.service.tunnelstate
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
-import net.mullvad.mullvadvpn.model.TunnelState
-
-class TunnelStateListener(context: Context) {
-    private val persistence = Persistence(context)
-
-    private val listener = object : OnSharedPreferenceChangeListener {
-        override fun onSharedPreferenceChanged(preferences: SharedPreferences, key: String) {
-            state = persistence.state
-        }
-    }
-
-    var state = persistence.state
-        private set(value) {
-            if (field != value) {
-                field = value
-                onStateChange?.invoke(value)
-            }
-        }
-
-    var onStateChange: ((TunnelState) -> Unit)? = null
-        set(value) {
-            field = value
-
-            if (value == null) {
-                persistence.listener = null
-            } else {
-                persistence.listener = listener
-                state = persistence.state
-            }
-        }
-}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
deleted file mode 100644
index 4d33ec4896..0000000000
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.mullvad.mullvadvpn.service.tunnelstate
-
-import android.content.Context
-import net.mullvad.mullvadvpn.service.endpoint.ConnectionProxy
-
-class TunnelStateUpdater(context: Context, private val connectionProxy: ConnectionProxy) {
-    private val persistence = Persistence(context)
-
-    init {
-        connectionProxy.onStateChange.subscribe(this) { newState ->
-            persistence.state = newState
-        }
-    }
-}