fix(sort): alphanumeric comparator - #17390
Open
alperozturk96 wants to merge 3 commits into
Open
Conversation
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
4 tasks
Collaborator
Author
|
/backport to stable-34.1.x |
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
4 tasks
|
blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed. |
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
This PR replaces the legacy natural-sort implementation with a new Kotlin-based AlphanumericComparator and expands/modernizes unit tests to validate comparator correctness and ordering across more edge cases (per linked issue).
Changes:
- Introduces
com.owncloud.android.utils.sort.AlphanumericComparator(+ChunkKind) and updates call sites to use it. - Removes the previous
thirdparties.daveKoeller.AlphanumComparatorimplementation. - Reworks
NaturalSortTestin Kotlin and broadens coverage (expected orders + comparator contract checks).
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| app/src/test/java/com/nextcloud/client/utils/NaturalSortTest.kt | Converts and expands natural-sort tests; adds locale setup and contract validations. |
| app/src/main/java/thirdparties/daveKoeller/AlphanumComparator.java | Removes the legacy third-party comparator implementation. |
| app/src/main/java/com/owncloud/android/utils/sort/ChunkKind.kt | Adds chunk-kind enum used by the new comparator. |
| app/src/main/java/com/owncloud/android/utils/sort/AlphanumericComparator.kt | Adds new Kotlin comparator implementation based on chunking + collator comparisons. |
| app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.kt | Switches sorting logic to use the new comparator. |
| app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt | Switches backup file sorting to the new comparator. |
| app/src/main/java/com/owncloud/android/datamodel/OCFile.java | Updates compareTo to use the new comparator’s static compare. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+52
to
+55
| private val collators: ThreadLocal<Collator> = ThreadLocal.withInitial { Collator.getInstance() } | ||
|
|
||
| private val collator: Collator | ||
| get() = collators.get() ?: Collator.getInstance() |
Comment on lines
+70
to
+75
| private fun compareChunks(ours: String, theirs: String): Int { | ||
| val kind = kindOf(ours[0]) | ||
| val byKind = kind.compareTo(kindOf(theirs[0])) | ||
| if (byKind != 0) { | ||
| return byKind | ||
| } |
Comment on lines
+99
to
+110
| fun sortingNeverThrowsRegardlessOfInputOrder() { | ||
| val comparator = AlphanumericComparator<String>() | ||
| val names = largeNameListWithIgnorableCharacters() | ||
|
|
||
| val failures = (0 until SORT_ATTEMPTS).mapNotNull { seed -> | ||
| runCatching { names.shuffled(Random(seed)).sortedWith(comparator) } | ||
| .exceptionOrNull() | ||
| ?.let { "seed $seed: ${it.message}" } | ||
| } | ||
|
|
||
| assertTrue("Sorting must never throw, but failed for ${failures.take(FAILURES_TO_REPORT)}", failures.isEmpty()) | ||
| } |
Comment on lines
+1
to
+6
| /* | ||
| * Nextcloud - Android Client | ||
| * | ||
| * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com> | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ |
|
master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/17390-IT-master-15-21 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes
Test