github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-29 22:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash when filter groups contain items with identical names (closes #3568)

Browse source
This commit is contained in:
arkon 2020-08-02 12:52:40 -04:00
parent 8e8c30c1eb
commit ea3b8767de
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/filter/SectionItems.kt
View file

@ -16,11 +16,14 @@ class TriStateSectionItem(filter: Filter.TriState) : TriStateItem(filter), ISect
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (javaClass != other?.javaClass) return false if (javaClass != other?.javaClass) return false
return filter == (other as TriStateSectionItem).filter
other as TriStateSectionItem
if (head != other.head) return false
return filter == other.filter
} }
override fun hashCode(): Int { override fun hashCode(): Int {
return filter.hashCode() return filter.hashCode() + (head?.hashCode() ?: 0)
} }
} }
@ -37,11 +40,14 @@ class TextSectionItem(filter: Filter.Text) : TextItem(filter), ISectionable<Text
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (javaClass != other?.javaClass) return false if (javaClass != other?.javaClass) return false
return filter == (other as TextSectionItem).filter
other as TextSectionItem
if (head != other.head) return false
return filter == other.filter
} }
override fun hashCode(): Int { override fun hashCode(): Int {
return filter.hashCode() return filter.hashCode() + (head?.hashCode() ?: 0)
} }
} }
@ -58,11 +64,14 @@ class CheckboxSectionItem(filter: Filter.CheckBox) : CheckboxItem(filter), ISect
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (javaClass != other?.javaClass) return false if (javaClass != other?.javaClass) return false
return filter == (other as CheckboxSectionItem).filter
other as CheckboxSectionItem
if (head != other.head) return false
return filter == other.filter
} }
override fun hashCode(): Int { override fun hashCode(): Int {
return filter.hashCode() return filter.hashCode() + (head?.hashCode() ?: 0)
} }
} }
@ -79,10 +88,13 @@ class SelectSectionItem(filter: Filter.Select<*>) : SelectItem(filter), ISection
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
if (javaClass != other?.javaClass) return false if (javaClass != other?.javaClass) return false
return filter == (other as SelectSectionItem).filter
other as SelectSectionItem
if (head != other.head) return false
return filter == other.filter
} }
override fun hashCode(): Int { override fun hashCode(): Int {
return filter.hashCode() return filter.hashCode() + (head?.hashCode() ?: 0)
} }
} }