diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-04 09:00:46 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-08 15:33:14 +0200 |
| commit | 970c7a1b722add93f9b435cfa658f770ea02d104 (patch) | |
| tree | 5784bbf2ae0e3f2d6888cc900c70449e478427cb /android/lib | |
| parent | fc227c37c50f28dba5a416e5245d5bfbd8f80c70 (diff) | |
| download | mullvadvpn-970c7a1b722add93f9b435cfa658f770ea02d104.tar.xz mullvadvpn-970c7a1b722add93f9b435cfa658f770ea02d104.zip | |
Fix relay comparator
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparator.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparator.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparator.kt index 8008ee3c65..4b848dde7b 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparator.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/RelayNameComparator.kt @@ -22,8 +22,9 @@ internal object RelayNameComparator : Comparator<RelayItem.Location.Relay> { private fun compareStringOrInt(p1: String, p2: String): Int { val int1 = p1.toIntOrNull() val int2 = p2.toIntOrNull() - return if (int1 is Int && int2 is Int) { - // If both are Int we should compare them numbers + return if (int1 is Int && int2 is Int && int1 != int2) { + // If both are Int and not equal (they might have leading zeros) we should compare them + // as numbers int1.compareTo(int2) } else { p1.compareTo(p2) |