From b7a4f369f6389b0a034ed9ddd97df488134c98d2 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 13 Mar 2022 21:12:33 -0400 Subject: [PATCH] Make user activity helpers consistent --- Reader/SceneDelegate.swift | 4 ++-- Reader/UserActivities.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Reader/SceneDelegate.swift b/Reader/SceneDelegate.swift index 28c7432..6664156 100644 --- a/Reader/SceneDelegate.swift +++ b/Reader/SceneDelegate.swift @@ -125,7 +125,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { case NSUserActivity.readAllType: split.showItemList(.all) case NSUserActivity.readFeedType: - guard let feedID = activity.feedID() else { + guard let feedID = activity.feedID else { break } let req = Feed.fetchRequest() @@ -134,7 +134,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { split.showItemList(.feed(feed)) } case NSUserActivity.readGroupType: - guard let groupID = activity.groupID() else { + guard let groupID = activity.groupID else { break } let req = Group.fetchRequest() diff --git a/Reader/UserActivities.swift b/Reader/UserActivities.swift index 51d26af..c16975a 100644 --- a/Reader/UserActivities.swift +++ b/Reader/UserActivities.swift @@ -32,7 +32,7 @@ extension NSUserActivity { } } - func feedID() -> String? { + var feedID: String? { if activityType == NSUserActivity.readFeedType { return userInfo?["feedID"] as? String } else { @@ -40,7 +40,7 @@ extension NSUserActivity { } } - func groupID() -> String? { + var groupID: String? { if activityType == NSUserActivity.readGroupType { return userInfo?["groupID"] as? String } else {