Merge branch 'main' into fcappelli/subscription_refactoring_2

DuckDuckGo/AppDelegate.swift

@@ -429,6 +429,7 @@ import WebKit
         }
     }
 
+    // swiftlint:disable:next function_body_length
     func applicationDidBecomeActive(_ application: UIApplication) {
         guard !testing else { return }
 
@@ -476,7 +477,10 @@ import WebKit
         checkWaitlists()
         syncService.scheduler.notifyAppLifecycleEvent()
         fireFailedCompilationsPixelIfNeeded()
-        refreshShortcuts()
+
+        Task {
+            await refreshShortcuts()
+        }
 
 #if NETWORK_PROTECTION
         widgetRefreshModel.refreshVPNWidget()
@@ -549,7 +553,9 @@ import WebKit
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
-        refreshShortcuts()
+        Task {
+            await refreshShortcuts()
+        }
     }
 
     private func fireAppLaunchPixel() {
@@ -879,22 +885,27 @@ import WebKit
         return window?.rootViewController as? MainViewController
     }
 
-    func refreshShortcuts() {
+    @MainActor
+    func refreshShortcuts() async {
 #if NETWORK_PROTECTION
         guard AppDependencyProvider.shared.vpnFeatureVisibility.shouldShowVPNShortcut() else {
             UIApplication.shared.shortcutItems = nil
             return
         }
 
-        let items = [
-            UIApplicationShortcutItem(type: ShortcutKey.openVPNSettings,
-                                      localizedTitle: UserText.netPOpenVPNQuickAction,
-                                      localizedSubtitle: nil,
-                                      icon: UIApplicationShortcutIcon(templateImageName: "VPN-16"),
-                                      userInfo: nil)
-        ]
+        if case .success(true) = await AccountManager().hasEntitlement(for: .networkProtection, cachePolicy: .returnCacheDataDontLoad) {
+            let items = [
+                UIApplicationShortcutItem(type: ShortcutKey.openVPNSettings,
+                                          localizedTitle: UserText.netPOpenVPNQuickAction,
+                                          localizedSubtitle: nil,
+                                          icon: UIApplicationShortcutIcon(templateImageName: "VPN-16"),
+                                          userInfo: nil)
+            ]
 
-        UIApplication.shared.shortcutItems = items
+            UIApplication.shared.shortcutItems = items
+        } else {
+            UIApplication.shared.shortcutItems = nil
+        }
 #endif
     }
 

package.json

@@ -17,6 +17,6 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "@duckduckgo/autoconsent": "^10.6.1"
+    "@duckduckgo/autoconsent": "^10.8.0"
   }
 }