Remove auto-connect feature from ui

mullvad · Sep 24, 2024 · eb03e36 · eb03e36
1 parent d848157
commit eb03e36
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 60 deletions.
diff --git a/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -528,7 +528,7 @@ class VpnSettingsScreenTest {
             // Arrange
             setContentWithTheme {
                 VpnSettingsScreen(
-                    state = VpnSettingsUiState.createDefault(systemVpnSettingsAvailable = false),
+                    state = VpnSettingsUiState.createDefault(systemVpnSettingsAvailable = false)
                 )
             }
 
@@ -546,9 +546,9 @@ class VpnSettingsScreenTest {
                     state =
                         VpnSettingsUiState.createDefault(
                             systemVpnSettingsAvailable = false,
-                            autoStartAndConnectOnBoot = false
+                            autoStartAndConnectOnBoot = false,
                         ),
-                    onToggleAutoStartAndConnectOnBoot = mockOnToggleAutoStartAndConnectOnBoot
+                    onToggleAutoStartAndConnectOnBoot = mockOnToggleAutoStartAndConnectOnBoot,
                 )
             }
 

diff --git a/...tlin/net/mullvad/mullvadvpn/compose/preview/VpnSettingsUiStatePreviewParameterProvider.kt b/...tlin/net/mullvad/mullvadvpn/compose/preview/VpnSettingsUiStatePreviewParameterProvider.kt
@@ -19,7 +19,6 @@ class VpnSettingsUiStatePreviewParameterProvider : PreviewParameterProvider<VpnS
             VpnSettingsUiState.createDefault(),
             VpnSettingsUiState.createDefault(
                 mtu = Mtu(MTU),
-                isAutoConnectEnabled = true,
                 isLocalNetworkSharingEnabled = true,
                 isDaitaEnabled = true,
                 isCustomDnsEnabled = true,
@@ -38,6 +37,7 @@ class VpnSettingsUiStatePreviewParameterProvider : PreviewParameterProvider<VpnS
                 customWireguardPort = PORT1,
                 availablePortRanges = listOf(PORT1..PORT2),
                 systemVpnSettingsAvailable = true,
+                autoStartAndConnectOnBoot = true,
             ),
         )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -118,7 +118,6 @@ private fun PreviewVpnSettings(
             onToggleBlockTrackers = {},
             onToggleBlockAds = {},
             onToggleBlockMalware = {},
-            onToggleAutoConnect = {},
             onToggleLocalNetworkSharing = {},
             onToggleBlockAdultContent = {},
             onToggleBlockGambling = {},
@@ -232,7 +231,6 @@ fun VpnSettings(
         onToggleBlockTrackers = vm::onToggleBlockTrackers,
         onToggleBlockAds = vm::onToggleBlockAds,
         onToggleBlockMalware = vm::onToggleBlockMalware,
-        onToggleAutoConnect = vm::onToggleAutoConnect,
         onToggleLocalNetworkSharing = vm::onToggleLocalNetworkSharing,
         onDisableDaita = { vm.onToggleDaita(false) },
         onToggleBlockAdultContent = vm::onToggleBlockAdultContent,
@@ -289,7 +287,6 @@ fun VpnSettingsScreen(
     onToggleBlockTrackers: (Boolean) -> Unit = {},
     onToggleBlockAds: (Boolean) -> Unit = {},
     onToggleBlockMalware: (Boolean) -> Unit = {},
-    onToggleAutoConnect: (Boolean) -> Unit = {},
     onToggleLocalNetworkSharing: (Boolean) -> Unit = {},
     onDisableDaita: () -> Unit = {},
     onToggleBlockAdultContent: (Boolean) -> Unit = {},
@@ -332,28 +329,6 @@ fun VpnSettingsScreen(
                         text = stringResource(id = R.string.auto_connect_and_lockdown_mode_footer)
                     )
                 }
-                item {
-                    Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
-                    HeaderSwitchComposeCell(
-                        title = stringResource(R.string.auto_connect_legacy),
-                        isToggled = state.isAutoConnectEnabled,
-                        isEnabled = true,
-                        onCellClicked = { newValue -> onToggleAutoConnect(newValue) },
-                    )
-                }
-                item {
-                    SwitchComposeSubtitleCell(
-                        text =
-                            HtmlCompat.fromHtml(
-                                    textResource(
-                                        R.string.auto_connect_footer_legacy,
-                                        textResource(R.string.auto_connect_and_lockdown_mode),
-                                    ),
-                                    HtmlCompat.FROM_HTML_MODE_COMPACT,
-                                )
-                                .toAnnotatedString(boldFontWeight = FontWeight.ExtraBold)
-                    )
-                }
             } else {
                 item {
                     Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
@@ -11,7 +11,6 @@ import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
 
 data class VpnSettingsUiState(
     val mtu: Mtu?,
-    val isAutoConnectEnabled: Boolean,
     val isLocalNetworkSharingEnabled: Boolean,
     val isDaitaEnabled: Boolean,
     val isCustomDnsEnabled: Boolean,
@@ -34,7 +33,6 @@ data class VpnSettingsUiState(
     companion object {
         fun createDefault(
             mtu: Mtu? = null,
-            isAutoConnectEnabled: Boolean = false,
             isLocalNetworkSharingEnabled: Boolean = false,
             isDaitaEnabled: Boolean = false,
             isCustomDnsEnabled: Boolean = false,
@@ -52,7 +50,6 @@ data class VpnSettingsUiState(
         ) =
             VpnSettingsUiState(
                 mtu,
-                isAutoConnectEnabled,
                 isLocalNetworkSharingEnabled,
                 isDaitaEnabled,
                 isCustomDnsEnabled,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
@@ -68,8 +68,6 @@ class SettingsRepository(
 
     suspend fun setObfuscation(value: ObfuscationMode) = managementService.setObfuscation(value)
 
-    suspend fun setAutoConnect(isEnabled: Boolean) = managementService.setAutoConnect(isEnabled)
-
     suspend fun setLocalNetworkSharing(isEnabled: Boolean) =
         managementService.setAllowLan(isEnabled)
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
@@ -65,7 +65,6 @@ class VpnSettingsViewModel(
             ) { settings, portRanges, customWgPort, autoStartAndConnectOnBoot ->
                 VpnSettingsViewModelState(
                     mtuValue = settings?.tunnelOptions?.wireguard?.mtu,
-                    isAutoConnectEnabled = settings?.autoConnect ?: false,
                     isLocalNetworkSharingEnabled = settings?.allowLan ?: false,
                     isDaitaEnabled = settings?.isDaitaEnabled() ?: false,
                     isCustomDnsEnabled = settings?.isCustomDnsEnabled() ?: false,
@@ -114,14 +113,6 @@ class VpnSettingsViewModel(
         }
     }
 
-    fun onToggleAutoConnect(isEnabled: Boolean) {
-        viewModelScope.launch(dispatcher) {
-            repository.setAutoConnect(isEnabled).onLeft {
-                _uiSideEffect.send(VpnSettingsSideEffect.ShowToast.GenericError)
-            }
-        }
-    }
-
     fun onToggleLocalNetworkSharing(isEnabled: Boolean) {
         viewModelScope.launch(dispatcher) {
             repository.setLocalNetworkSharing(isEnabled).onLeft {

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt
@@ -11,7 +11,6 @@ import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
 
 data class VpnSettingsViewModelState(
     val mtuValue: Mtu?,
-    val isAutoConnectEnabled: Boolean,
     val isLocalNetworkSharingEnabled: Boolean,
     val isDaitaEnabled: Boolean,
     val isCustomDnsEnabled: Boolean,
@@ -34,7 +33,6 @@ data class VpnSettingsViewModelState(
     fun toUiState(): VpnSettingsUiState =
         VpnSettingsUiState(
             mtuValue,
-            isAutoConnectEnabled,
             isLocalNetworkSharingEnabled,
             isDaitaEnabled,
             isCustomDnsEnabled,
@@ -55,7 +53,6 @@ data class VpnSettingsViewModelState(
         fun default() =
             VpnSettingsViewModelState(
                 mtuValue = null,
-                isAutoConnectEnabled = false,
                 isLocalNetworkSharingEnabled = false,
                 isDaitaEnabled = false,
                 isCustomDnsEnabled = false,

diff --git a/...b/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/...b/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/...lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/...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
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
@@ -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,