Use ItemIdentifier and itemID instead of FeedIdentifier and feedID. (FeedIdentifier was renamed to ItemIdentifier.)

This commit is contained in:
Brent Simmons
2023-07-04 14:41:02 -07:00
parent 4890a33469
commit a6832dd2a5
16 changed files with 101 additions and 101 deletions

View File

@@ -172,11 +172,11 @@ private extension ActivityManager {
activity.keywords = Set(makeKeywords(title))
activity.isEligibleForSearch = true
let articleFetcherIdentifierUserInfo = feed.feedID?.userInfo ?? [AnyHashable: Any]()
activity.userInfo = [UserInfoKey.feedIdentifier: articleFetcherIdentifierUserInfo]
let articleFetcherIdentifierUserInfo = feed.itemID?.userInfo ?? [AnyHashable: Any]()
activity.userInfo = [UserInfoKey.itemIdentifier: articleFetcherIdentifierUserInfo]
activity.requiredUserInfoKeys = Set(activity.userInfo!.keys.map { $0 as! String })
activity.persistentIdentifier = feed.feedID?.description ?? ""
activity.persistentIdentifier = feed.itemID?.description ?? ""
#if os(iOS)
activity.suggestedInvocationPhrase = title
@@ -192,9 +192,9 @@ private extension ActivityManager {
activity.title = ArticleStringFormatter.truncatedTitle(article)
if let feed = feed {
let articleFetcherIdentifierUserInfo = feed.feedID?.userInfo ?? [AnyHashable: Any]()
let articleFetcherIdentifierUserInfo = feed.itemID?.userInfo ?? [AnyHashable: Any]()
let articlePathUserInfo = article.pathUserInfo
activity.userInfo = [UserInfoKey.feedIdentifier: articleFetcherIdentifierUserInfo, UserInfoKey.articlePath: articlePathUserInfo]
activity.userInfo = [UserInfoKey.itemIdentifier: articleFetcherIdentifierUserInfo, UserInfoKey.articlePath: articlePathUserInfo]
} else {
activity.userInfo = [UserInfoKey.articlePath: article.pathUserInfo]
}