Skip to content

Commit e9a8034

Browse files
PururunPururun
committed
WIP
1 parent e9af9e7 commit e9a8034

File tree

19 files changed

+221
-11
lines changed

19 files changed

+221
-11
lines changed

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt

+26
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ private fun PreviewVpnSettings(
142142
navigateToWireguardPortDialog = {},
143143
navigateToServerIpOverrides = {},
144144
onSelectDeviceIpVersion = {},
145+
onToggleIPv6Toggle = {},
146+
onToggleRouteIpv6Traffic = {},
145147
)
146148
}
147149
}
@@ -271,6 +273,8 @@ fun VpnSettings(
271273
dropUnlessResumed { navigator.navigate(Udp2TcpSettingsDestination) },
272274
onToggleAutoStartAndConnectOnBoot = vm::onToggleAutoStartAndConnectOnBoot,
273275
onSelectDeviceIpVersion = vm::onDeviceIpVersionSelected,
276+
onToggleIPv6Toggle = vm::setIpV6Enabled,
277+
onToggleRouteIpv6Traffic = vm::onToggleRouteIpv6Traffic,
274278
)
275279
}
276280

@@ -308,6 +312,8 @@ fun VpnSettingsScreen(
308312
navigateToUdp2TcpSettings: () -> Unit,
309313
onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit,
310314
onSelectDeviceIpVersion: (ipVersion: Constraint<IpVersion>) -> Unit,
315+
onToggleIPv6Toggle: (Boolean) -> Unit,
316+
onToggleRouteIpv6Traffic: (Boolean) -> Unit,
311317
) {
312318
var expandContentBlockersState by rememberSaveable { mutableStateOf(false) }
313319
val biggerPadding = 54.dp
@@ -686,6 +692,26 @@ fun VpnSettingsScreen(
686692
}
687693
item { MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) }
688694

695+
item {
696+
HeaderSwitchComposeCell(
697+
title = "Enable IPv6",
698+
isToggled = state.isIPv6Enabled,
699+
isEnabled = true,
700+
onCellClicked = { newValue -> onToggleIPv6Toggle(newValue) },
701+
)
702+
Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))
703+
}
704+
705+
item {
706+
HeaderSwitchComposeCell(
707+
title = "Route IPv6 traffic",
708+
isToggled = state.routeIpv6Traffic || state.isIPv6Enabled,
709+
isEnabled = !state.isIPv6Enabled,
710+
onCellClicked = { newValue -> onToggleRouteIpv6Traffic(newValue) },
711+
)
712+
Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))
713+
}
714+
689715
item { ServerIpOverrides(navigateToServerIpOverrides) }
690716
}
691717
}

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ data class VpnSettingsUiState(
2626
val systemVpnSettingsAvailable: Boolean,
2727
val autoStartAndConnectOnBoot: Boolean,
2828
val deviceIpVersion: Constraint<IpVersion>,
29+
val isIPv6Enabled: Boolean,
30+
val routeIpv6Traffic: Boolean,
2931
) {
3032
val isCustomWireguardPort =
3133
selectedWireguardPort is Constraint.Only &&
@@ -51,6 +53,8 @@ data class VpnSettingsUiState(
5153
systemVpnSettingsAvailable: Boolean = false,
5254
autoStartAndConnectOnBoot: Boolean = false,
5355
deviceIpVersion: Constraint<IpVersion> = Constraint.Any,
56+
isIPv6Enabled: Boolean = true,
57+
routeIpv6Traffic: Boolean = true,
5458
) =
5559
VpnSettingsUiState(
5660
mtu,
@@ -68,6 +72,8 @@ data class VpnSettingsUiState(
6872
systemVpnSettingsAvailable,
6973
autoStartAndConnectOnBoot,
7074
deviceIpVersion,
75+
isIPv6Enabled,
76+
routeIpv6Traffic,
7177
)
7278
}
7379
}

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ import org.koin.core.qualifier.named
113113
import org.koin.dsl.module
114114

115115
val uiModule = module {
116-
single<DataStore<UserPreferences>> { androidContext().userPreferencesStore }
116+
single<DataStore<UserPreferences>>(named("COOL")) { androidContext().userPreferencesStore }
117117

118118
single<PackageManager> { androidContext().packageManager }
119119
single<String>(named(SELF_PACKAGE_NAME)) { androidContext().packageName }
@@ -131,7 +131,9 @@ val uiModule = module {
131131
single { androidContext().contentResolver }
132132

133133
single { ChangelogRepository(get(), get(), get()) }
134-
single { UserPreferencesRepository(get(), get()) }
134+
single<UserPreferencesRepository> {
135+
UserPreferencesRepository(get<DataStore<UserPreferences>>(named("COOL")), get())
136+
}
135137
single { SettingsRepository(get()) }
136138
single { MullvadProblemReport(get(), get<DaemonConfig>().apiEndpointOverride, get()) }
137139
single { RelayOverridesRepository(get()) }
@@ -233,7 +235,7 @@ val uiModule = module {
233235
viewModel { SettingsViewModel(get(), get(), get(), get(), IS_PLAY_BUILD) }
234236
viewModel { SplashViewModel(get(), get(), get(), get()) }
235237
viewModel { VoucherDialogViewModel(get()) }
236-
viewModel { VpnSettingsViewModel(get(), get(), get(), get(), get()) }
238+
viewModel { VpnSettingsViewModel(get(), get(), get(), get(), get(), get(), get()) }
237239
viewModel { WelcomeViewModel(get(), get(), get(), get(), isPlayBuild = IS_PLAY_BUILD) }
238240
viewModel { ReportProblemViewModel(get(), get()) }
239241
viewModel { ViewLogsViewModel(get()) }

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt

+2
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ class SettingsRepository(
7474
suspend fun setDaitaEnabled(enabled: Boolean) = managementService.setDaitaEnabled(enabled)
7575

7676
suspend fun setDaitaDirectOnly(enabled: Boolean) = managementService.setDaitaDirectOnly(enabled)
77+
78+
suspend fun setIpV6Enabled(enabled: Boolean) = managementService.setIpv6Enabled(enabled)
7779
}

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointFromIntentHolder
3333
import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
3434
import net.mullvad.mullvadvpn.lib.model.PrepareError
3535
import net.mullvad.mullvadvpn.lib.model.Prepared
36+
import net.mullvad.mullvadvpn.lib.model.modelModule
3637
import net.mullvad.mullvadvpn.lib.theme.AppTheme
3738
import net.mullvad.mullvadvpn.repository.SplashCompleteRepository
3839
import net.mullvad.mullvadvpn.repository.UserPreferencesRepository
@@ -65,7 +66,7 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {
6566
private var isReadyNextDraw: Boolean = false
6667

6768
override fun onCreate(savedInstanceState: Bundle?) {
68-
loadKoinModules(listOf(uiModule, paymentModule))
69+
loadKoinModules(listOf(uiModule, paymentModule, modelModule))
6970

7071
lifecycle.addObserver(mullvadAppViewModel)
7172

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt

+26-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import java.net.UnknownHostException
88
import kotlinx.coroutines.CoroutineDispatcher
99
import kotlinx.coroutines.Dispatchers
1010
import kotlinx.coroutines.channels.Channel
11+
import kotlinx.coroutines.delay
1112
import kotlinx.coroutines.flow.MutableStateFlow
1213
import kotlinx.coroutines.flow.SharingStarted
1314
import kotlinx.coroutines.flow.combine
@@ -28,6 +29,8 @@ import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
2829
import net.mullvad.mullvadvpn.lib.model.Port
2930
import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
3031
import net.mullvad.mullvadvpn.lib.model.Settings
32+
import net.mullvad.mullvadvpn.lib.model.TunnelPreferencesRepository
33+
import net.mullvad.mullvadvpn.lib.shared.ConnectionProxy
3134
import net.mullvad.mullvadvpn.repository.AutoStartAndConnectOnBootRepository
3235
import net.mullvad.mullvadvpn.repository.RelayListRepository
3336
import net.mullvad.mullvadvpn.repository.SettingsRepository
@@ -51,6 +54,8 @@ class VpnSettingsViewModel(
5154
private val systemVpnSettingsUseCase: SystemVpnSettingsAvailableUseCase,
5255
private val autoStartAndConnectOnBootRepository: AutoStartAndConnectOnBootRepository,
5356
private val wireguardConstraintsRepository: WireguardConstraintsRepository,
57+
private val tunnelPreferencesRepository: TunnelPreferencesRepository,
58+
private val connectionProxy: ConnectionProxy,
5459
private val dispatcher: CoroutineDispatcher = Dispatchers.IO,
5560
) : ViewModel() {
5661

@@ -65,7 +70,8 @@ class VpnSettingsViewModel(
6570
relayListRepository.portRanges,
6671
customPort,
6772
autoStartAndConnectOnBootRepository.autoStartAndConnectOnBoot,
68-
) { settings, portRanges, customWgPort, autoStartAndConnectOnBoot ->
73+
tunnelPreferencesRepository.preferencesFlow,
74+
) { settings, portRanges, customWgPort, autoStartAndConnectOnBoot, preferences ->
6975
VpnSettingsViewModelState(
7076
mtuValue = settings?.tunnelOptions?.wireguard?.mtu,
7177
isLocalNetworkSharingEnabled = settings?.allowLan == true,
@@ -85,6 +91,8 @@ class VpnSettingsViewModel(
8591
systemVpnSettingsAvailable = systemVpnSettingsUseCase(),
8692
autoStartAndConnectOnBoot = autoStartAndConnectOnBoot,
8793
deviceIpVersion = settings?.getDeviceIpVersion() ?: Constraint.Any,
94+
ipv6Enabled = settings?.tunnelOptions?.genericOptions?.enableIpv6 == true,
95+
routeIpv6 = preferences.routeIpV6,
8896
)
8997
}
9098
.stateIn(
@@ -253,6 +261,23 @@ class VpnSettingsViewModel(
253261
}
254262
}
255263

264+
fun setIpV6Enabled(enable: Boolean) {
265+
viewModelScope.launch(dispatcher) {
266+
repository.setIpV6Enabled(enable).onLeft {
267+
_uiSideEffect.send(VpnSettingsSideEffect.ShowToast.GenericError)
268+
}
269+
}
270+
}
271+
272+
fun onToggleRouteIpv6Traffic(enable: Boolean) {
273+
viewModelScope.launch(dispatcher) {
274+
tunnelPreferencesRepository.setRouteIpv6(enable)
275+
connectionProxy.disconnect()
276+
delay(1000L)
277+
connectionProxy.connect()
278+
}
279+
}
280+
256281
private fun updateDefaultDnsOptionsViaRepository(contentBlockersOption: DefaultDnsOptions) =
257282
viewModelScope.launch(dispatcher) {
258283
repository

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ data class VpnSettingsViewModelState(
2626
val systemVpnSettingsAvailable: Boolean,
2727
val autoStartAndConnectOnBoot: Boolean,
2828
val deviceIpVersion: Constraint<IpVersion>,
29+
val ipv6Enabled: Boolean,
30+
val routeIpv6: Boolean,
2931
) {
3032
val isCustomWireguardPort =
3133
selectedWireguardPort is Constraint.Only &&
@@ -48,6 +50,8 @@ data class VpnSettingsViewModelState(
4850
systemVpnSettingsAvailable,
4951
autoStartAndConnectOnBoot,
5052
deviceIpVersion,
53+
ipv6Enabled,
54+
routeIpv6,
5155
)
5256

5357
companion object {
@@ -68,6 +72,8 @@ data class VpnSettingsViewModelState(
6872
systemVpnSettingsAvailable = false,
6973
autoStartAndConnectOnBoot = false,
7074
deviceIpVersion = Constraint.Any,
75+
ipv6Enabled = false,
76+
routeIpv6 = false,
7177
)
7278
}
7379
}

‎android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt

+5
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,11 @@ class ManagementService(
802802
.mapLeft(SetWireguardConstraintsError::Unknown)
803803
.mapEmpty()
804804

805+
suspend fun setIpv6Enabled(enabled: Boolean): Either<SetDaitaSettingsError, Unit> =
806+
Either.catch { grpc.setEnableIpv6(BoolValue.of(enabled)) }
807+
.mapLeft(SetDaitaSettingsError::Unknown)
808+
.mapEmpty()
809+
805810
private fun <A> Either<A, Empty>.mapEmpty() = map {}
806811

807812
private inline fun <B, C> Either<Throwable, B>.mapLeftStatus(

‎android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt

+9-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import net.mullvad.mullvadvpn.lib.model.Endpoint
3939
import net.mullvad.mullvadvpn.lib.model.ErrorState
4040
import net.mullvad.mullvadvpn.lib.model.ErrorStateCause
4141
import net.mullvad.mullvadvpn.lib.model.FeatureIndicator
42+
import net.mullvad.mullvadvpn.lib.model.GenericOptions
4243
import net.mullvad.mullvadvpn.lib.model.GeoIpLocation
4344
import net.mullvad.mullvadvpn.lib.model.GeoLocationId
4445
import net.mullvad.mullvadvpn.lib.model.IpVersion
@@ -434,7 +435,11 @@ internal fun ManagementInterface.CustomList.toDomain(): CustomList =
434435
)
435436

436437
internal fun ManagementInterface.TunnelOptions.toDomain(): TunnelOptions =
437-
TunnelOptions(wireguard = wireguard.toDomain(), dnsOptions = dnsOptions.toDomain())
438+
TunnelOptions(
439+
wireguard = wireguard.toDomain(),
440+
dnsOptions = dnsOptions.toDomain(),
441+
genericOptions = generic.toDomain(),
442+
)
438443

439444
internal fun ManagementInterface.TunnelOptions.WireguardOptions.toDomain(): WireguardTunnelOptions =
440445
WireguardTunnelOptions(
@@ -674,6 +679,9 @@ internal fun ManagementInterface.SocksAuth.toDomain(): SocksAuth =
674679
internal fun ManagementInterface.FeatureIndicators.toDomain(): List<FeatureIndicator> =
675680
activeFeaturesList.map { it.toDomain() }.sorted()
676681

682+
internal fun ManagementInterface.TunnelOptions.GenericOptions.toDomain(): GenericOptions =
683+
GenericOptions(enableIpv6 = enableIpv6)
684+
677685
internal fun ManagementInterface.FeatureIndicator.toDomain() =
678686
when (this) {
679687
ManagementInterface.FeatureIndicator.QUANTUM_RESISTANCE ->

‎android/lib/model/build.gradle.kts

+23
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
import org.gradle.kotlin.dsl.android
2+
import org.gradle.kotlin.dsl.get
3+
import org.gradle.kotlin.dsl.kotlin
4+
import org.gradle.kotlin.dsl.plugins
5+
16
plugins {
27
alias(libs.plugins.android.library)
38
alias(libs.plugins.kotlin.android)
49
alias(libs.plugins.kotlin.parcelize)
510
alias(libs.plugins.kotlin.ksp)
11+
alias(libs.plugins.protobuf.core)
612

713
id(Dependencies.junit5AndroidPluginId) version Versions.junit5Plugin
814
}
@@ -34,12 +40,29 @@ android {
3440
}
3541
}
3642

43+
protobuf {
44+
protoc { artifact = libs.plugins.protobuf.protoc.get().toString() }
45+
plugins {
46+
create("java") { artifact = libs.plugins.grpc.protoc.gen.grpc.java.get().toString() }
47+
}
48+
generateProtoTasks {
49+
all().forEach {
50+
it.plugins { create("java") { option("lite") } }
51+
it.builtins { create("kotlin") { option("lite") } }
52+
}
53+
}
54+
}
55+
3756
dependencies {
3857
implementation(libs.kotlin.stdlib)
3958
implementation(libs.kotlinx.coroutines.android)
4059
implementation(libs.arrow)
4160
implementation(libs.arrow.optics)
4261
ksp(libs.arrow.optics.ksp)
62+
implementation(libs.protobuf.kotlin.lite)
63+
implementation(libs.androidx.datastore)
64+
implementation(libs.koin)
65+
implementation(libs.koin.android)
4366

4467
// Test dependencies
4568
testRuntimeOnly(Dependencies.junitJupiterEngine)

‎android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/GenericOptions.kt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package net.mullvad.mullvadvpn.lib.model
2+
3+
data class GenericOptions(val enableIpv6: Boolean)

‎android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ModelModule.kt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package net.mullvad.mullvadvpn.lib.model
2+
3+
import android.content.Context
4+
import androidx.datastore.core.DataStore
5+
import androidx.datastore.dataStore
6+
import net.mullvad.mullvadvpn.model.TunnelPreference
7+
import org.koin.android.ext.koin.androidContext
8+
import org.koin.dsl.module
9+
10+
val modelModule = module {
11+
single<DataStore<TunnelPreference>> { androidContext().tunnelPreferencesStore }
12+
single<TunnelPreferencesRepository> { TunnelPreferencesRepository(get()) }
13+
}
14+
15+
private val Context.tunnelPreferencesStore: DataStore<TunnelPreference> by
16+
dataStore(
17+
fileName = "net.mullvad.mullvadvpn_tunnel_preferences",
18+
serializer = TunnelPreferencesSerializer,
19+
)

‎android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelOptions.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ package net.mullvad.mullvadvpn.lib.model
33
import arrow.optics.optics
44

55
@optics
6-
data class TunnelOptions(val wireguard: WireguardTunnelOptions, val dnsOptions: DnsOptions) {
6+
data class TunnelOptions(
7+
val wireguard: WireguardTunnelOptions,
8+
val dnsOptions: DnsOptions,
9+
val genericOptions: GenericOptions,
10+
) {
711
companion object
812
}

‎android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelPreferencesRepository.kt

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package net.mullvad.mullvadvpn.lib.model
2+
3+
import androidx.datastore.core.DataStore
4+
import java.io.IOException
5+
import kotlinx.coroutines.flow.Flow
6+
import kotlinx.coroutines.flow.catch
7+
import kotlinx.coroutines.flow.first
8+
import kotlinx.coroutines.runBlocking
9+
import net.mullvad.mullvadvpn.model.TunnelPreference
10+
11+
class TunnelPreferencesRepository(private val userPreferencesStore: DataStore<TunnelPreference>) {
12+
13+
// Note: this should not be made into a StateFlow. See:
14+
// https://developer.android.com/reference/kotlin/androidx/datastore/core/DataStore#data()
15+
val preferencesFlow: Flow<TunnelPreference> =
16+
userPreferencesStore.data.catch { exception ->
17+
// dataStore.data throws an IOException when an error is encountered when reading data
18+
if (exception is IOException) {
19+
// Logger.e("Error reading user preferences file, falling back to default.",
20+
// exception)
21+
emit(TunnelPreference.getDefaultInstance())
22+
} else {
23+
throw exception
24+
}
25+
}
26+
27+
fun preferences(): TunnelPreference = runBlocking { preferencesFlow.first() }
28+
29+
fun isRouteIpv6(): Boolean = preferences().routeIpV6
30+
31+
suspend fun setRouteIpv6(enable: Boolean) {
32+
userPreferencesStore.updateData { prefs -> prefs.toBuilder().setRouteIpV6(enable).build() }
33+
}
34+
}

0 commit comments

Comments
 (0)