From d5350fd719675ef9f299551121478808164b5769 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 7 Apr 2020 21:40:36 -0400 Subject: [PATCH] Tweak string comparison to account for length (fixes #2831) --- .../java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt index 2d4d3b9b1..2dfe6f743 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/StringExtensions.kt @@ -30,7 +30,9 @@ fun String.truncateCenter(count: Int, replacement: String = "..."): String { * Case-insensitive natural comparator for strings. */ fun String.compareToCaseInsensitiveNaturalOrder(other: String): Int { - return String.CASE_INSENSITIVE_ORDER.then(naturalOrder()).compare(this, other) + return compareBy { it.length } + .then(String.CASE_INSENSITIVE_ORDER) + .then(naturalOrder()).compare(this, other) } /**