FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2254 from Wevah/master 

Use parentContainerID for isEqual, and not just feedID
This commit is contained in:
Maurice Parker 2020-07-12 09:36:56 -05:00 committed by GitHub
parent 2eb20c86af 059ebd5e27
commit 9ecc5ec67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
iOS/MasterFeed/Cell/MasterFeedTableViewIdentifier.swift
View File

@ -51,11 +51,14 @@ final class MasterFeedTableViewIdentifier: NSObject, NSCopying {
override func isEqual(_ object: Any?) -> Bool { override func isEqual(_ object: Any?) -> Bool {
guard let otherIdentifier = object as? MasterFeedTableViewIdentifier else { return false } guard let otherIdentifier = object as? MasterFeedTableViewIdentifier else { return false }
if self === otherIdentifier { return true } if self === otherIdentifier { return true }
return feedID == otherIdentifier.feedID return feedID == otherIdentifier.feedID && parentContainerID == otherIdentifier.parentContainerID
} }
override var hash: Int { override var hash: Int {
return feedID.hashValue var hasher = Hasher()
hasher.combine(feedID)
hasher.combine(parentContainerID)
return hasher.finalize()
} }
func copy(with zone: NSZone? = nil) -> Any { func copy(with zone: NSZone? = nil) -> Any {