summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-09-02 16:03:43 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-09-26 10:40:08 +0200
commita984929ab268193a8569f6604e596ad46d0b7051 (patch)
treea860b41abfd603c4615c197d3117948fcf0cf466 /android/lib
parentfced0fa39344e4b2ca1f8cf2127681850f09d898 (diff)
downloadmullvadvpn-a984929ab268193a8569f6604e596ad46d0b7051.tar.xz
mullvadvpn-a984929ab268193a8569f6604e596ad46d0b7051.zip
Remove auto-connect feature from ui
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt7
-rw-r--r--android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt1
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SetAutoConnectError.kt5
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt1
4 files changed, 0 insertions, 14 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 514d4f83aa..3ffbe0fc4a 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -103,7 +103,6 @@ import net.mullvad.mullvadvpn.lib.model.RemoveApiAccessMethodError
import net.mullvad.mullvadvpn.lib.model.RemoveSplitTunnelingAppError
import net.mullvad.mullvadvpn.lib.model.SetAllowLanError
import net.mullvad.mullvadvpn.lib.model.SetApiAccessMethodError
-import net.mullvad.mullvadvpn.lib.model.SetAutoConnectError
import net.mullvad.mullvadvpn.lib.model.SetDaitaSettingsError
import net.mullvad.mullvadvpn.lib.model.SetDnsOptionsError
import net.mullvad.mullvadvpn.lib.model.SetObfuscationOptionsError
@@ -502,12 +501,6 @@ class ManagementService(
.mapLeft(SetObfuscationOptionsError::Unknown)
.mapEmpty()
- suspend fun setAutoConnect(isEnabled: Boolean): Either<SetAutoConnectError, Unit> =
- Either.catch { grpc.setAutoConnect(BoolValue.of(isEnabled)) }
- .onLeft { Logger.e("Set auto connect error") }
- .mapLeft(SetAutoConnectError::Unknown)
- .mapEmpty()
-
suspend fun setAllowLan(allow: Boolean): Either<SetAllowLanError, Unit> =
Either.catch { grpc.setAllowLan(BoolValue.of(allow)) }
.onLeft { Logger.e("Set allow lan error") }
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
index 0f57ce58dc..99b4554f0b 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
@@ -254,7 +254,6 @@ internal fun ManagementInterface.Settings.toDomain(): Settings =
obfuscationSettings = obfuscationSettings.toDomain(),
customLists = customLists.customListsList.map { it.toDomain() },
allowLan = allowLan,
- autoConnect = autoConnect,
tunnelOptions = tunnelOptions.toDomain(),
relayOverrides = relayOverridesList.map { it.toDomain() },
showBetaReleases = showBetaReleases,
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SetAutoConnectError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SetAutoConnectError.kt
deleted file mode 100644
index b2b3b74edf..0000000000
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SetAutoConnectError.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.mullvad.mullvadvpn.lib.model
-
-sealed interface SetAutoConnectError {
- data class Unknown(val throwable: Throwable) : SetAutoConnectError
-}
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
index f59d85184c..b3f1a2e8a0 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
@@ -8,7 +8,6 @@ data class Settings(
val obfuscationSettings: ObfuscationSettings,
val customLists: List<CustomList>,
val allowLan: Boolean,
- val autoConnect: Boolean,
val tunnelOptions: TunnelOptions,
val relayOverrides: List<RelayOverride>,
val showBetaReleases: Boolean,