Stop donating screen activities as Siri predictions

The Jetpack app's App Shortcuts are the modern replacement for Siri suggestions, so the prediction donation, the suggested invocation phrases, and the now-unused MobileCoreServices import are removed. The system keeps previously donated suggestions until they are explicitly deleted, so all saved user activities are deleted once at launch and upgrading users do not keep stale suggestions. The screen activities remain eligible for Spotlight search, whose index is separate and unaffected.

Author: crazytonyli

Modules/Sources/WordPressData/Swift/SearchableActivityConvertable.swift

@@ -1,7 +1,5 @@
 import UIKit
 import CoreSpotlight
-import Intents
-import MobileCoreServices
 import UniformTypeIdentifiers
 
 /// Custom NSUSerActivity types for the WPiOS. Primarily used for navigation points.
@@ -17,32 +15,6 @@ public enum WPActivityType: String {
     case notifications = "org.wordpress.notifications"
 }
 
-extension WPActivityType {
-    var suggestedInvocationPhrase: String {
-        switch self {
-        case .siteList:
-            return NSLocalizedString("My Sites in WordPress", comment: "Siri Suggestion to open My Sites")
-        case .siteDetails:
-            return NSLocalizedString("WordPress Site Details", comment: "Siri Suggestion to open My Sites")
-        case .reader:
-            return NSLocalizedString("WordPress Reader", comment: "Siri Suggestion to open My Sites")
-        case .me:
-            return NSLocalizedString("WordPress Profile", comment: "Siri Suggestion to open Me tab")
-        case .appSettings:
-            return NSLocalizedString("WordPress App Settings", comment: "Siri Suggestion to open App Settings")
-        case .notificationSettings:
-            return NSLocalizedString(
-                "WordPress Notification Settings",
-                comment: "Siri Suggestion to open Notification Settings"
-            )
-        case .support:
-            return NSLocalizedString("WordPress Help", comment: "Siri Suggestion to open Support")
-        case .notifications:
-            return NSLocalizedString("WordPress Notifications", comment: "Siri Suggestion to open Notifications")
-        }
-    }
-}
-
 /// NSUserActivity userInfo keys
 ///
 public enum WPActivityUserInfoKeys: String {
@@ -108,11 +80,6 @@ public extension SearchableActivityConvertable where Self: UIViewController {
 
         activity.isEligibleForSearch = true
         activity.isEligibleForHandoff = false
-        activity.isEligibleForPrediction = true
-
-        if let wpActivityType = WPActivityType(rawValue: activityType) {
-            activity.suggestedInvocationPhrase = wpActivityType.suggestedInvocationPhrase
-        }
 
         // Set the UIViewController's userActivity property, which is defined in UIResponder. Doing this allows
         // UIKit to automagically manage this user activity (e.g. making it current when needed)

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -109,6 +109,7 @@ public class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
 
         MemoryCache.shared.register()
         MediaImageService.migrateCacheIfNeeded()
+        purgeLegacySiriDonationsIfNeeded()
         PostCoordinator.shared.delegate = self
 
         // Start CrashLogging as soon as possible (in case a crash happens during startup)
@@ -414,6 +415,19 @@ public class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         AccountService(coreDataStack: ContextManager.shared).mergeDuplicatesIfNecessary()
     }
 
+    /// Deletes the user activities donated as Siri predictions by earlier app versions,
+    /// because the app no longer donates predictions and the system keeps the old
+    /// suggestions until they are explicitly deleted.
+    // TODO: Remove this cleanup after a few releases.
+    private func purgeLegacySiriDonationsIfNeeded() {
+        let didPurgeKey = "did-purge-legacy-siri-donations"
+        guard !UserDefaults.standard.bool(forKey: didPurgeKey) else {
+            return
+        }
+        UserDefaults.standard.set(true, forKey: didPurgeKey)
+        NSUserActivity.deleteAllSavedUserActivities {}
+    }
+
     private func setupPingHub() {
         pingHubManager = PingHubManager()
     }