From 04106bf2f0523e96b84aea56b267748869e90646 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Mon, 3 Jun 2024 06:27:18 -0700
Subject: [PATCH] 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.xcodeproj/project.pbxproj          |   2 +-
 .../xcshareddata/swiftpm/Package.resolved     |   4 ++--
 .../Contents.json                             |   5 ++++-
 .../RemoteMessagePrivacyPro.pdf               | Bin 0 -> 14556 bytes
 .../RemoteMessageVPNAnnounce.pdf              | Bin 15349 -> 0 bytes
 DuckDuckGo/RemoteMessaging.swift              |  18 +++++++++++++++++-
 .../RemoteMessagingStoreTests.swift           |   4 +++-
 7 files changed, 27 insertions(+), 6 deletions(-)
 rename DuckDuckGo/HomeMessage.xcassets/RemoteMessage/{RemoteMessageVPNAnnounce.imageset => RemoteMessagePrivacyPro.imageset}/Contents.json (50%)
 create mode 100644 DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/RemoteMessagePrivacyPro.pdf
 delete mode 100644 DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/RemoteMessageVPNAnnounce.pdf

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 9b62f03e26..a4655b86ae 100644
--- 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
index 82f656887d..ca2f0dca4b 100644
--- 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/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/Contents.json b/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/Contents.json
similarity index 50%
rename from DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/Contents.json
rename to DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/Contents.json
index cbe62e069c..04c63ce202 100644
--- a/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/Contents.json
+++ b/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.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/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/RemoteMessagePrivacyPro.pdf b/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessagePrivacyPro.imageset/RemoteMessagePrivacyPro.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..18085b7a093a947728b9d5bf2e5100cac4e649b1
GIT binary patch
literal 14556
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

literal 0
HcmV?d00001

diff --git a/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/RemoteMessageVPNAnnounce.pdf b/DuckDuckGo/HomeMessage.xcassets/RemoteMessage/RemoteMessageVPNAnnounce.imageset/RemoteMessageVPNAnnounce.pdf
deleted file mode 100644
index 2e31d6e5ae561f6dee47d54a3eec79ec0e4d5458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15349
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
SBE!6KT@OF|*=N7|)&Bw;x74u!

diff --git a/DuckDuckGo/RemoteMessaging.swift b/DuckDuckGo/RemoteMessaging.swift
index a7ebf8dc4b..494010a7ad 100644
--- 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
index 191ae48b11..ecf4c0edb7 100644
--- 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: []