From ee3a767cf72d005410b4a3b71ea4bfc4fa4f0b12 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 19 Oct 2019 18:21:58 -0500 Subject: [PATCH] Add required user info keys to user activities. --- Shared/Activity/ActivityManager.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Shared/Activity/ActivityManager.swift b/Shared/Activity/ActivityManager.swift index 02bc1ae98..5780d5a7e 100644 --- a/Shared/Activity/ActivityManager.swift +++ b/Shared/Activity/ActivityManager.swift @@ -68,7 +68,9 @@ class ActivityManager { let title = NSString.localizedStringWithFormat(localizedText as NSString, folder.nameForDisplay) as String selectingActivity = makeSelectingActivity(type: ActivityType.selectFolder, title: title, identifier: ActivityManager.identifer(for: folder)) - selectingActivity!.userInfo = folder.deepLinkUserInfo + let userInfo = folder.deepLinkUserInfo + selectingActivity!.userInfo = userInfo + selectingActivity!.requiredUserInfoKeys = Set(userInfo.keys.map { $0 as! String }) donate(selectingActivity!) } @@ -79,7 +81,9 @@ class ActivityManager { let title = NSString.localizedStringWithFormat(localizedText as NSString, feed.nameForDisplay) as String selectingActivity = makeSelectingActivity(type: ActivityType.selectFeed, title: title, identifier: ActivityManager.identifer(for: feed)) - selectingActivity!.userInfo = feed.deepLinkUserInfo + let userInfo = feed.deepLinkUserInfo + selectingActivity!.userInfo = userInfo + selectingActivity!.requiredUserInfoKeys = Set(userInfo.keys.map { $0 as! String }) updateSelectingActivityFeedSearchAttributes(with: feed) donate(selectingActivity!) } @@ -195,7 +199,9 @@ private extension ActivityManager { func makeReadArticleActivity(_ article: Article) -> NSUserActivity { let activity = NSUserActivity(activityType: ActivityType.readArticle.rawValue) activity.title = article.title - activity.userInfo = article.deepLinkUserInfo + let userInfo = article.deepLinkUserInfo + activity.userInfo = userInfo + activity.requiredUserInfoKeys = Set(userInfo.keys.map { $0 as! String }) activity.isEligibleForHandoff = true #if os(iOS)