Skip to content

Commit

Permalink
Remove auto-connect feature from ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pururun
Pururun committed Sep 9, 2024
1 parent 47bbeff commit 1694f4c
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 60 deletions.
6 changes: 3 additions & 3 deletions ...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ class VpnSettingsScreenTest {
// Arrange
setContentWithTheme {
VpnSettingsScreen(
state = VpnSettingsUiState.createDefault(systemVpnSettingsAvailable = false),
state = VpnSettingsUiState.createDefault(systemVpnSettingsAvailable = false)
)
}

Expand All @@ -621,9 +621,9 @@ class VpnSettingsScreenTest {
state =
VpnSettingsUiState.createDefault(
systemVpnSettingsAvailable = false,
autoStartAndConnectOnBoot = false
autoStartAndConnectOnBoot = false,
),
onToggleAutoStartAndConnectOnBoot = mockOnToggleAutoStartAndConnectOnBoot
onToggleAutoStartAndConnectOnBoot = mockOnToggleAutoStartAndConnectOnBoot,
)
}

Expand Down
26 changes: 0 additions & 26 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ private fun PreviewVpnSettings() {
VpnSettingsScreen(
state =
VpnSettingsUiState.createDefault(
isAutoConnectEnabled = true,
mtu = Mtu(1337),
isCustomDnsEnabled = true,
customDnsItems = listOf(CustomDnsItem("0.0.0.0", false)),
Expand All @@ -125,7 +124,6 @@ private fun PreviewVpnSettings() {
onToggleBlockTrackers = {},
onToggleBlockAds = {},
onToggleBlockMalware = {},
onToggleAutoConnect = {},
onToggleLocalNetworkSharing = {},
onToggleBlockAdultContent = {},
onToggleBlockGambling = {},
Expand Down Expand Up @@ -241,7 +239,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,
Expand Down Expand Up @@ -294,7 +291,6 @@ fun VpnSettingsScreen(
onToggleBlockTrackers: (Boolean) -> Unit = {},
onToggleBlockAds: (Boolean) -> Unit = {},
onToggleBlockMalware: (Boolean) -> Unit = {},
onToggleAutoConnect: (Boolean) -> Unit = {},
onToggleLocalNetworkSharing: (Boolean) -> Unit = {},
onDisableDaita: () -> Unit = {},
onToggleBlockAdultContent: (Boolean) -> Unit = {},
Expand Down Expand Up @@ -337,28 +333,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))
Expand Down
3 changes: 0 additions & 3 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -31,7 +30,6 @@ data class VpnSettingsUiState(
companion object {
fun createDefault(
mtu: Mtu? = null,
isAutoConnectEnabled: Boolean = false,
isLocalNetworkSharingEnabled: Boolean = false,
isDaitaEnabled: Boolean = false,
isCustomDnsEnabled: Boolean = false,
Expand All @@ -48,7 +46,6 @@ data class VpnSettingsUiState(
) =
VpnSettingsUiState(
mtu,
isAutoConnectEnabled,
isLocalNetworkSharingEnabled,
isDaitaEnabled,
isCustomDnsEnabled,
Expand Down
2 changes: 0 additions & 2 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ class SettingsRepository(

suspend fun setObfuscation(value: SelectedObfuscation) = managementService.setObfuscation(value)

suspend fun setAutoConnect(isEnabled: Boolean) = managementService.setAutoConnect(isEnabled)

suspend fun setLocalNetworkSharing(isEnabled: Boolean) =
managementService.setAllowLan(isEnabled)

Expand Down
9 changes: 0 additions & 9 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -113,14 +112,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 {
Expand Down
3 changes: 0 additions & 3 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation

data class VpnSettingsViewModelState(
val mtuValue: Mtu?,
val isAutoConnectEnabled: Boolean,
val isLocalNetworkSharingEnabled: Boolean,
val isDaitaEnabled: Boolean,
val isCustomDnsEnabled: Boolean,
Expand All @@ -29,7 +28,6 @@ data class VpnSettingsViewModelState(
fun toUiState(): VpnSettingsUiState =
VpnSettingsUiState(
mtuValue,
isAutoConnectEnabled,
isLocalNetworkSharingEnabled,
isDaitaEnabled,
isCustomDnsEnabled,
Expand All @@ -49,7 +47,6 @@ data class VpnSettingsViewModelState(
fun default() =
VpnSettingsViewModelState(
mtuValue = null,
isAutoConnectEnabled = false,
isLocalNetworkSharingEnabled = false,
isDaitaEnabled = false,
isCustomDnsEnabled = false,
Expand Down
7 changes: 0 additions & 7 deletions ...b/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ import net.mullvad.mullvadvpn.lib.model.RemoveSplitTunnelingAppError
import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
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
Expand Down Expand Up @@ -490,12 +489,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") }
Expand Down
1 change: 0 additions & 1 deletion ...lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,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,
Expand Down
5 changes: 0 additions & 5 deletions android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SetAutoConnectError.kt
View file

This file was deleted.

1 change: 0 additions & 1 deletion android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 1694f4c

Please sign in to comment.