diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-19 08:35:13 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-19 11:04:10 +0200 |
| commit | 4497d2b12ebdbf27de8042ca5e03d15160e02460 (patch) | |
| tree | 7e16fa096a4e40232fd0c837fbaa56bac93f1839 /android | |
| parent | 5a7bf69a73418ee2e3d35ead31088fad02025445 (diff) | |
| download | mullvadvpn-4497d2b12ebdbf27de8042ca5e03d15160e02460.tar.xz mullvadvpn-4497d2b12ebdbf27de8042ca5e03d15160e02460.zip | |
Align feature indicator order with other platforms
Diffstat (limited to 'android')
2 files changed, 6 insertions, 10 deletions
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 aaf1c454f8..0f57ce58dc 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 @@ -605,7 +605,7 @@ internal fun ManagementInterface.SocksAuth.toDomain(): SocksAuth = SocksAuth(username = username, password = password) internal fun ManagementInterface.FeatureIndicators.toDomain(): List<FeatureIndicator> = - this.activeFeaturesList.map { it.toDomain() }.sorted() + activeFeaturesList.map { it.toDomain() }.sorted() internal fun ManagementInterface.FeatureIndicator.toDomain() = when (this) { 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 9b6b5cbf33..74fea07326 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 @@ -1,21 +1,17 @@ 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, UDP_2_TCP, + SHADOWSOCKS, LAN_SHARING, DNS_CONTENT_BLOCKERS, CUSTOM_DNS, SERVER_IP_OVERRIDE, CUSTOM_MTU, - DAITA, - SHADOWSOCKS, - // Currently not supported - // DAITA_SMART_ROUTING - // LOCKDOWN_MODE, - // MULTIHOP, - // BRIDGE_MODE, - // CUSTOM_MSS_FIX, - // UNRECOGNIZED, } |