kumi/Android-Password-Store
1
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)) {