diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift index 5a7a4c3ec..114964430 100644 --- a/Frameworks/Account/Feed.swift +++ b/Frameworks/Account/Feed.swift @@ -65,18 +65,7 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha } } - public var name: String? { - get { - return metadata.name - } - set { - let oldNameForDisplay = nameForDisplay - metadata.name = newValue - if oldNameForDisplay != newValue { - postDisplayNameDidChangeNotification() - } - } - } + public var name: String? public var authors: Set? { get { diff --git a/Frameworks/Account/FeedMetadata.swift b/Frameworks/Account/FeedMetadata.swift index 2509b1e04..7da7ac9c0 100644 --- a/Frameworks/Account/FeedMetadata.swift +++ b/Frameworks/Account/FeedMetadata.swift @@ -21,7 +21,6 @@ final class FeedMetadata: Codable { case homePageURL case iconURL case faviconURL - case name case editedName case authors case contentHash @@ -63,14 +62,6 @@ final class FeedMetadata: Codable { } } - var name: String? { - didSet { - if name != oldValue { - valueDidChange(.name) - } - } - } - var editedName: String? { didSet { if editedName != oldValue { diff --git a/Frameworks/Account/Feedly/FeedlyCreateFeedsForCollectionFoldersOperation.swift b/Frameworks/Account/Feedly/FeedlyCreateFeedsForCollectionFoldersOperation.swift index 62c601535..5b22a2aa1 100644 --- a/Frameworks/Account/Feedly/FeedlyCreateFeedsForCollectionFoldersOperation.swift +++ b/Frameworks/Account/Feedly/FeedlyCreateFeedsForCollectionFoldersOperation.swift @@ -52,7 +52,12 @@ final class FeedlyCreateFeedsForCollectionFoldersOperation: FeedlySyncOperation let url = collectionFeed.id let metadata = FeedMetadata(feedID: url) // TODO: More metadata - metadata.name = collectionFeed.title + + // Kiel, I'm commenting this out as we shouldn't be storing the name + // in the feed metadata. It should be stored in the OPML file. + // You can just set the name directly on the feed itself. +// metadata.name = collectionFeed.title + let feed = Feed(account: account, url: url, metadata: metadata) // So the same feed isn't created more than once.