summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorAleksandr Granin <aleksandr@mullvad.net>2021-03-15 09:50:32 +0100
committerAleksandr Granin <aleksandr@mullvad.net>2021-03-19 20:28:23 +0100
commit06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1 (patch)
tree8895e4bbe90169e18bf371a0941bd12d7c91569c /android/src/main
parent0fa4da6d5641c6d891c45a75cd51e7550a1f389e (diff)
downloadmullvadvpn-06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1.tar.xz
mullvadvpn-06cd2512ed79ba77d82bd4e4aa9fa3e569d6a2a1.zip
Run ktlint and xml-tidy only for main code
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt2
1 files changed, 1 insertions, 1 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)