mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 22:05:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when using type independent sort (#734)

Browse Source
This commit is contained in:
Fabian Henneke
2020-04-22 18:13:56 +02:00
committed by GitHub
parent 9c1cc8690d
commit 00361a58c7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt
View File

@@ -92,7 +92,9 @@ private fun PasswordItem.Companion.makeComparator(
): Comparator<PasswordItem> {
return when (typeSortOrder) {
PasswordRepository.PasswordSortOrder.FOLDER_FIRST -> compareBy { it.type }
PasswordRepository.PasswordSortOrder.INDEPENDENT -> compareBy<PasswordItem>()
// In order to let INDEPENDENT not distinguish between items based on their type, we simply
// declare them all equal at this stage.
PasswordRepository.PasswordSortOrder.INDEPENDENT -> Comparator<PasswordItem> { _, _ -> 0 }
PasswordRepository.PasswordSortOrder.FILE_FIRST -> compareByDescending { it.type }
}
.then(compareBy(nullsLast(CaseInsensitiveComparator)) {