Removed shadow socks predefined ports

mullvad · Aug 30, 2024 · c5ea6bd · c5ea6bd
1 parent cbe21e7
commit c5ea6bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ShadowsocksSettingsScreen.kt b/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ShadowsocksSettingsScreen.kt
@@ -27,6 +27,7 @@ import net.mullvad.mullvadvpn.compose.test.SHADOWSOCKS_PORT_ITEM_AUTOMATIC_TEST_
 import net.mullvad.mullvadvpn.compose.test.SHADOWSOCKS_PORT_ITEM_X_TEST_TAG
 import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.compose.util.OnNavResultValue
+import net.mullvad.mullvadvpn.constant.SHADOWSOCKS_AVAILABLE_PORTS
 import net.mullvad.mullvadvpn.constant.SHADOWSOCKS_PRESET_PORTS
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.Port
@@ -75,7 +76,7 @@ fun ShadowsocksSettings(
                                     context.getString(R.string.shadowsocks),
                                 ),
                             customPort = state.customPort,
-                            allowedPortRanges = state.validPortRanges,
+                            allowedPortRanges = SHADOWSOCKS_AVAILABLE_PORTS,
                         )
                     )
                 )

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/WireguardConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/WireguardConstant.kt
@@ -1,7 +1,10 @@
 package net.mullvad.mullvadvpn.constant
 
 import net.mullvad.mullvadvpn.lib.model.Port
+import net.mullvad.mullvadvpn.lib.model.PortRange
 
 val WIREGUARD_PRESET_PORTS = listOf(Port(51820), Port(53))
 val UDP2TCP_PRESET_PORTS = listOf(Port(80), Port(5001))
-val SHADOWSOCKS_PRESET_PORTS = listOf(Port(80), Port(443))
+val SHADOWSOCKS_PRESET_PORTS = emptyList<Port>()
+val SHADOWSOCKS_AVAILABLE_PORTS =
+    listOf(PortRange(IntRange(0, 65535))) // Currently we consider all ports to be available
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortExtensions.kt
@@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.util
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.PortRange
 
-// fun Port.in()
-
 fun Port.inAnyOf(portRanges: List<PortRange>): Boolean =
     portRanges.any { portRange -> this in portRange }