diff options
| author | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-15 09:50:32 +0100 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-19 20:28:23 +0100 |
| commit | 06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1 (patch) | |
| tree | 8895e4bbe90169e18bf371a0941bd12d7c91569c /android | |
| parent | 0fa4da6d5641c6d891c45a75cd51e7550a1f389e (diff) | |
| download | mullvadvpn-06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1.tar.xz mullvadvpn-06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1.zip | |
Run ktlint and xml-tidy only for main code
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt | 2 | ||||
| -rw-r--r-- | android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt index 4922e68cf5..32f473b194 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt @@ -24,7 +24,7 @@ internal object RelayNameComparator : Comparator<Relay> { private fun compareStringOrInt(s1: String, s2: String): Int { val int1 = s1.toIntOrNull() val int2 = s2.toIntOrNull() - return if (int1 == null || int2 == null) { + return if (int1 == null || int2 == null || int1 == int2) { s2.compareTo(s1) } else { int2.compareTo(int1) diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt b/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt index 0147bc5e05..a3c96349d9 100644 --- a/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt +++ b/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt @@ -39,8 +39,7 @@ class RelayNameComparatorTest { val relay3 = Relay(mockedCity, "3", false) val relay100 = Relay(mockedCity, "100", false) - assertTrue(RelayNameComparator.compare(relay001, relay1) == 0) - assertTrue(RelayNameComparator.compare(relay1, relay001) == 0) + relay001 assertOrderBothDirection relay1 relay001 assertOrderBothDirection relay3 relay1 assertOrderBothDirection relay3 relay3 assertOrderBothDirection relay100 |