summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-09 16:05:45 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-09 16:05:45 +0200
commit8fcdcbd9ad474e8505fec8930e1ad6f2ae0238fb (patch)
tree918f21d194b35ad1cf3c035c65af2b109eee865a
parenta41c026cc3cddf19d01b49cc427dc4cba63bb618 (diff)
parentdf350eba064be0aa2047ad51d22226b77a2a6170 (diff)
downloadmullvadvpn-8fcdcbd9ad474e8505fec8930e1ad6f2ae0238fb.tar.xz
mullvadvpn-8fcdcbd9ad474e8505fec8930e1ad6f2ae0238fb.zip
Merge branch 'fix-obfuscation-order'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt4
1 files changed, 2 insertions, 2 deletions
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
index d860aa3c21..3da55e69b9 100644
--- 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
@@ -191,6 +191,8 @@ data class VpnSettingsUiState(val settings: List<VpnSettingItem>, val isModal: B
)
)
add(VpnSettingItem.Divider)
+ add(VpnSettingItem.ObfuscationItem.Lwo(obfuscationMode == ObfuscationMode.Lwo))
+ add(VpnSettingItem.Divider)
add(
VpnSettingItem.ObfuscationItem.Shadowsocks(
obfuscationMode == ObfuscationMode.Shadowsocks,
@@ -209,8 +211,6 @@ data class VpnSettingsUiState(val settings: List<VpnSettingItem>, val isModal: B
VpnSettingItem.ObfuscationItem.Quic(obfuscationMode == ObfuscationMode.Quic)
)
add(VpnSettingItem.Divider)
- add(VpnSettingItem.ObfuscationItem.Lwo(obfuscationMode == ObfuscationMode.Lwo))
- add(VpnSettingItem.Divider)
add(VpnSettingItem.ObfuscationItem.Off(obfuscationMode == ObfuscationMode.Off))
add(VpnSettingItem.Spacer)