diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-10-07 15:54:14 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-10-07 15:54:14 +0200 |
| commit | bdd4675c11f0a365704b6c32cf0a4d482d4e8b9f (patch) | |
| tree | e05e904006ccc43f0845d12231b119c71f7775dd /android | |
| parent | adc7e44b69da58740bd5a18abbc267c319649714 (diff) | |
| parent | 777013135b01d1c4d13961802db511b0e06e90e9 (diff) | |
| download | mullvadvpn-bdd4675c11f0a365704b6c32cf0a4d482d4e8b9f.tar.xz mullvadvpn-bdd4675c11f0a365704b6c32cf0a4d482d4e8b9f.zip | |
Merge branch 'rename-smart_routing-to-use_multihop_if_necessary-des-1292'
Diffstat (limited to 'android')
3 files changed, 7 insertions, 3 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 7961b5460c..024091c9dc 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 @@ -511,7 +511,13 @@ class ManagementService( suspend fun setDaitaEnabled(enabled: Boolean): Either<SetDaitaSettingsError, Unit> = Either.catch { val daitaSettings = - ManagementInterface.DaitaSettings.newBuilder().setEnabled(enabled).build() + ManagementInterface.DaitaSettings.newBuilder() + .setEnabled(enabled) + // Before Multihop is supported on Android, calling `setDirectOnly` with + // false will cause undefined behaviour. Will be fixed by as part of + // DROID-1412. + .setDirectOnly(true) + .build() grpc.setDaitaSettings(daitaSettings) } .mapLeft(SetDaitaSettingsError::Unknown) 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 4a8ee04683..2f6a08eede 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 @@ -621,7 +621,6 @@ internal fun ManagementInterface.FeatureIndicator.toDomain() = ManagementInterface.FeatureIndicator.CUSTOM_MTU -> FeatureIndicator.CUSTOM_MTU ManagementInterface.FeatureIndicator.DAITA -> FeatureIndicator.DAITA ManagementInterface.FeatureIndicator.SHADOWSOCKS -> FeatureIndicator.SHADOWSOCKS - ManagementInterface.FeatureIndicator.DAITA_SMART_ROUTING, ManagementInterface.FeatureIndicator.LOCKDOWN_MODE, ManagementInterface.FeatureIndicator.MULTIHOP, ManagementInterface.FeatureIndicator.BRIDGE_MODE, diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt index 74fea07326..3c8df824f4 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/FeatureIndicator.kt @@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.lib.model // The order of the variants match the priority order and can be sorted on. enum class FeatureIndicator { DAITA, - // DAITA_SMART_ROUTING QUANTUM_RESISTANCE, // MULTIHOP, SPLIT_TUNNELING, |