Additional Privacy Pro RMF changes (#2911)

Task/Issue URL: https://app.asana.com/0/414235014887631/1207409447873013/f Tech Design URL: CC: Description: This PR adds support for new RMF attributes and placeholder image for Privacy Pro.
duckduckgo · Jun 3, 2024 · 04106bf · 04106bf
1 parent c642979
commit 04106bf
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9778,7 +9778,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 149.0.0;
+				version = 150.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "cd7850dd115f4c896095f410c1049fc32bdf7b16",
-        "version" : "149.0.0"
+        "revision" : "03e6b719671c5baaa2afa474d447b707bf595820",
+        "version" : "150.0.0"
       }
     },
     {

diff --git a/...MessageVPNAnnounce.imageset/Contents.json → ...eMessagePrivacyPro.imageset/Contents.json b/...MessageVPNAnnounce.imageset/Contents.json → ...eMessagePrivacyPro.imageset/Contents.json
@@ -1,12 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "RemoteMessageVPNAnnounce.pdf",
+      "filename" : "RemoteMessagePrivacyPro.pdf",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
   }
 }
diff --git a/...ssage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/RemoteMessagePrivacyPro.pdf b/...ssage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/RemoteMessagePrivacyPro.pdf
diff --git a/...age.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/RemoteMessageVPNAnnounce.pdf b/...age.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/RemoteMessageVPNAnnounce.pdf
diff --git a/DuckDuckGo/RemoteMessaging.swift b/DuckDuckGo/RemoteMessaging.swift
@@ -161,6 +161,20 @@ struct RemoteMessaging {
             let daysSinceNetworkProtectionEnabled = activationDateStore.daysSinceActivation() ?? -1
             let surveyActionMapper = DefaultRemoteMessagingSurveyURLBuilder(statisticsStore: statisticsStore)
 
+            var privacyProDaysSinceSubscribed: Int = -1
+            var privacyProDaysUntilExpiry: Int = -1
+
+            if let accessToken = AppDependencyProvider.shared.subscriptionManager.accountManager.accessToken {
+                let subscriptionResult = await AppDependencyProvider.shared.subscriptionManager.subscriptionService.getSubscription(
+                    accessToken: accessToken
+                )
+
+                if case let .success(subscription) = subscriptionResult {
+                    privacyProDaysSinceSubscribed = Calendar.current.numberOfDaysBetween(subscription.startedAt, and: Date()) ?? -1
+                    privacyProDaysUntilExpiry = Calendar.current.numberOfDaysBetween(Date(), and: subscription.expiresOrRenewsAt) ?? -1
+                }
+            }
+
             let remoteMessagingConfigMatcher = RemoteMessagingConfigMatcher(
                 appAttributeMatcher: AppAttributeMatcher(statisticsStore: statisticsStore,
                                                          variantManager: variantManager,
@@ -173,7 +187,9 @@ struct RemoteMessaging {
                                                            isWidgetInstalled: isWidgetInstalled,
                                                            daysSinceNetPEnabled: daysSinceNetworkProtectionEnabled,
                                                            isPrivacyProEligibleUser: canPurchase,
-                                                           isPrivacyProSubscriber: isPrivacyProSubscriber),
+                                                           isPrivacyProSubscriber: isPrivacyProSubscriber,
+                                                           privacyProDaysSinceSubscribed: privacyProDaysSinceSubscribed,
+                                                           privacyProDaysUntilExpiry: privacyProDaysUntilExpiry),
                 percentileStore: RemoteMessagingPercentileUserDefaultsStore(userDefaults: .standard),
                 surveyActionMapper: surveyActionMapper,
                 dismissedMessageIds: remoteMessagingStore.fetchDismissedRemoteMessageIds()

diff --git a/DuckDuckGoTests/RemoteMessagingStoreTests.swift b/DuckDuckGoTests/RemoteMessagingStoreTests.swift
@@ -143,7 +143,9 @@ class RemoteMessagingStoreTests: XCTestCase {
                                                            isWidgetInstalled: false,
                                                            daysSinceNetPEnabled: -1,
                                                            isPrivacyProEligibleUser: false,
-                                                           isPrivacyProSubscriber: false),
+                                                           isPrivacyProSubscriber: false,
+                                                           privacyProDaysSinceSubscribed: -1,
+                                                           privacyProDaysUntilExpiry: -1),
                 percentileStore: RemoteMessagingPercentileUserDefaultsStore(userDefaults: self.defaults),
                 surveyActionMapper: MockRemoteMessagingSurveyActionMapper(),
                 dismissedMessageIds: []