null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Prevent potential "Comparison method violates its general contract!" crash

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2025-04-17 17:09:00 +07:00
parent 8be33e0f81
commit 271e440014
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -660,6 +660,9 @@ class LibraryPresenter(
* @param itemList the map to sort.
*/
private fun LibraryMap.applySort(): LibraryMap {
// Making sure `allCategories` is stable for `.sort()`
val categoryOrderMap = allCategories.associate { it.id to it.order }
val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 ->
val category = i1.header.category
val compare = when {
@ -688,12 +691,8 @@ class LibraryPresenter(
LibrarySort.DateAdded -> i2.manga.manga.date_added.compareTo(i1.manga.manga.date_added)
LibrarySort.DragAndDrop -> {
if (category.isDynamic) {
val category1 =
allCategories.find { i1.manga.category == it.id }?.order
?: 0
val category2 =
allCategories.find { i2.manga.category == it.id }?.order
?: 0
val category1 = categoryOrderMap[i1.manga.category] ?: 0
val category2 = categoryOrderMap[i2.manga.category] ?: 0
category1.compareTo(category2)
} else {
sortAlphabetical(i1, i2)
@ -727,7 +726,7 @@ class LibraryPresenter(
}
return this.mapValues { (category, values) ->
// Making sure category has valid sort
// Making sure category has valid sort before doing the actual sorting
if (category.mangaOrder.isEmpty() && category.mangaSort == null) {
category.changeSortTo(preferences.librarySortingMode().get())
if (category.id == 0) {
@ -804,7 +803,7 @@ class LibraryPresenter(
preferences.groupLibraryBy().changes(),
preferences.showAllCategories().changes(),
preferences.librarySortingMode().changes(),
preferences.librarySortingAscending().changes(),