Privacy Pro Rebranding (#6464)

Task/Issue URL:
https://app.asana.com/1/137249556945/task/1210832122593774?focus=true

### Description
Implement all copy changes for Privacy Pro rebranding under a feature
flag

### Steps to test this PR
_Pre steps_
- [ ] Apply patch attached on
https://app.asana.com/1/137249556945/project/1209991789468715/task/1210448620621729?focus=true
- [ ] Open
https://app.asana.com/1/137249556945/project/1201632632419011/task/1210789040363833?focus=true
and
https://app.asana.com/1/137249556945/task/1210879129186147?focus=true
for checking copy updates

_Onboarding_
- [ ] Fresh install
- [ ] Go through onboarding and after End Dialog, make sure DuckDuckGo
subscription dialog have the updated copy

_App Settings screen_
- [ ] Go to App Settings
- [ ] Check App Settings Privacy Pro text is updated

_App Settings > About_
- [ ] Go to About option
- [ ] Check content is updated

_AppTP_
- [ ] Go to Settings > App Tracking Protection
- [ ] Go through AppTP onboarding
- [ ] Check message CTA description is updated

_I Have a Subscription_
- [ ] Go to Settings > I Have a Subscription
- [ ] Check content is updated

_Subscription WebView Page_
- [ ] Go to Settings > Privacy Pro
- [ ] Check toolbar title is updated with 'DuckDuckGo Subscription'

_Subscription Settings_
- [ ] Purchase a plan
- [ ] Go to App Settings > Subscription Settings
- [ ] Check content is updated

_VPN_
- [ ] Enable VPN
- [ ] Cancel Subscription
- [ ] Wait until subscription is expired
- If VPN disconnected alert doesn't shows up, do the following:
- [ ] Close and open app again
- [ ] Go to Settings
- [ ] Check VPN disconnected dialog appears and content is updated

_Expired Subscription_
- [ ] Go to App Settings
- [ ] Check You see updated content for Subscription Settings secondary
text
- [ ] Go to Subscription Settings
- [ ] Check content is updated

_FF Disabled (Optional)_
- [ ] Fresh install
- [ ] Go to Settings > Feature Flag Inventory
- [ ] Disable privacyPro > subscriptionRebranding FF
- [ ] Check all previous rebranding updates are not showing

### UI changes
Check
https://app.asana.com/1/137249556945/task/1210879129186147?focus=true

Author: nalcalag

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/view/message/PProUpsellBannerPlugin.kt

@@ -56,15 +56,12 @@ class PProUpsellBannerPlugin @Inject constructor(
     ): View? {
         val isEligible = runBlocking { subscriptions.isUpsellEligible() && !vpnStore.isPproUpsellBannerDismised() }
         return if (isEligible) {
-            val subtitle: String
             val actionText: String
             runBlocking {
-                if (subscriptions.isFreeTrialEligible() && appTPStateMessageToggle.freeTrialCopy().isEnabled()) {
-                    subtitle = context.getString(R.string.apptp_PproUpsellBannerMessage_freeTrial)
-                    actionText = context.getString(R.string.apptp_PproUpsellBannerAction_freeTrial)
+                actionText = if (subscriptions.isFreeTrialEligible() && appTPStateMessageToggle.freeTrialCopy().isEnabled()) {
+                    context.getString(R.string.apptp_PproUpsellBannerAction_freeTrial)
                 } else {
-                    subtitle = context.getString(R.string.apptp_PproUpsellBannerMessage)
-                    actionText = context.getString(R.string.apptp_PproUpsellBannerAction)
+                    context.getString(R.string.apptp_PproUpsellBannerAction)
                 }
             }
             MessageCta(context)
@@ -73,7 +70,7 @@ class PProUpsellBannerPlugin @Inject constructor(
                         Message(
                             topIllustration = com.duckduckgo.mobile.android.R.drawable.ic_privacy_pro,
                             title = context.getString(R.string.apptp_PproUpsellBannerTitle),
-                            subtitle = subtitle,
+                            subtitle = context.getString(R.string.apptp_PproUpsellBannerMessage_freeTrial),
                             action = actionText,
                             messageType = REMOTE_MESSAGE,
                         ),

app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoActivity.kt

@@ -40,6 +40,7 @@ import com.duckduckgo.app.about.AboutDuckDuckGoViewModel.Command.LaunchWebViewWi
 import com.duckduckgo.app.about.AboutDuckDuckGoViewModel.Command.LaunchWebViewWithPPROUrl
 import com.duckduckgo.app.about.AboutDuckDuckGoViewModel.Command.LaunchWebViewWithPrivacyPolicyUrl
 import com.duckduckgo.app.about.AboutDuckDuckGoViewModel.Command.LaunchWebViewWithVPNUrl
+import com.duckduckgo.app.about.AboutDuckDuckGoViewModel.ViewState
 import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.ActivityAboutDuckDuckGoBinding
@@ -86,23 +87,26 @@ class AboutDuckDuckGoActivity : DuckDuckGoActivity() {
 
         configureUiEventHandlers()
         observeViewModel()
-        configureClickableLinks()
     }
 
     override fun onResume() {
         super.onResume()
         viewModel.resetEasterEggCounter()
     }
 
-    private fun configureClickableLinks() {
+    private fun configureClickableLinks(viewState: ViewState) {
         with(binding.includeContent.aboutText) {
-            text = addClickableLinks()
+            text = addClickableLinks(viewState)
             movementMethod = LinkMovementMethod.getInstance()
         }
     }
 
-    private fun addClickableLinks(): SpannableString {
-        val fullText = getText(R.string.aboutDescriptionBrandUpdate2025) as SpannedString
+    private fun addClickableLinks(viewState: ViewState): SpannableString {
+        val fullText = if (viewState.rebrandingEnabled) {
+            getText(R.string.aboutDescriptionBrandUpdate2025Rebranding) as SpannedString
+        } else {
+            getText(R.string.aboutDescriptionBrandUpdate2025) as SpannedString
+        }
 
         val spannableString = SpannableString(fullText)
         val annotations = fullText.getSpans(0, fullText.length, Annotation::class.java)
@@ -190,6 +194,7 @@ class AboutDuckDuckGoActivity : DuckDuckGoActivity() {
             .onEach { viewState ->
                 viewState.let {
                     binding.includeContent.aboutVersion.setSecondaryText(it.version)
+                    configureClickableLinks(viewState)
                 }
             }.launchIn(lifecycleScope)
 

app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoViewModel.kt

@@ -26,6 +26,7 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.DDG_SETTINGS
+import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import javax.inject.Inject
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
@@ -42,10 +43,12 @@ class AboutDuckDuckGoViewModel @Inject constructor(
     private val appBuildConfig: AppBuildConfig,
     private val pixel: Pixel,
     private val privacyProUnifiedFeedback: PrivacyProUnifiedFeedback,
+    private val subscriptionRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle,
 ) : ViewModel() {
 
     data class ViewState(
         val version: String = "",
+        val rebrandingEnabled: Boolean = false,
     )
 
     sealed class Command {
@@ -69,6 +72,7 @@ class AboutDuckDuckGoViewModel @Inject constructor(
             viewState.emit(
                 currentViewState().copy(
                     version = obtainVersion(),
+                    rebrandingEnabled = subscriptionRebrandingFeatureToggle.isSubscriptionRebrandingEnabled(),
                 ),
             )
         }

app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt

@@ -262,11 +262,7 @@ class CtaViewModel @Inject constructor(
             // Privacy Pro
             canShowPrivacyProCta() && !onboardingDesignExperimentToggles.buckOnboarding().isEnabled() -> {
                 val titleRes: Int = R.string.onboardingPrivacyProDaxDialogTitle
-                val descriptionRes: Int = if (freeTrialCopyAvailable()) {
-                    R.string.onboardingPrivacyProDaxDialogFreeTrialDescription
-                } else {
-                    R.string.onboardingPrivacyProDaxDialogDescription
-                }
+                val descriptionRes: Int = R.string.onboardingPrivacyProDaxDialogDescriptionRebranding
                 val primaryCtaRes: Int = if (freeTrialCopyAvailable()) {
                     R.string.onboardingPrivacyProDaxDialogFreeTrialOkButton
                 } else {

app/src/main/res/values/donottranslate.xml

@@ -65,4 +65,9 @@
 
     <!-- Section in main app settings -->
     <string name="settingsHeadingCompleteSetup">Complete Your Setup</string>
+
+    <!-- Privacy Pro Rebranding-->
+    <string name="aboutDescriptionBrandUpdate2025Rebranding">Welcome to the Duck Side!\n\nDuckDuckGo is the independent online protection company for anyone who wants to take back control of their personal information.\n\nWe believe the best way to protect your personal information from hackers, scammers, and privacy-invasive companies is to stop it from being collected at all. That\'s why millions of people <annotation type="chart_comparison">choose DuckDuckGo over Chrome and other browsers</annotation> to search and browse online. Our built-in search engine is like Google but never tracks your searches. And our browsing protections, such as ad tracker blocking and cookie blocking, help stop other companies from collecting your data. Oh, and our browser is free — we make money from <annotation type="privacy_respecting_ads">privacy-respecting search ads</annotation>, not by exploiting your data.\n\nIn addition, we also offer <annotation type="ppro_help_page">DuckDuckGo subscription</annotation> integrated into our browser. Subscribers get even more privacy protection with a fast and simple <annotation type="vpn_help_page">VPN</annotation> that helps secure your online activity, access to advanced AI models in our private AI chat service Duck.ai, a service that finds and removes your personal information from people-finder sites, and a service that restores your identity should it be stolen.\n\nTake back control of your personal information with the browser designed for data protection, not data collection.</string>
+    <string name="onboardingPrivacyProDaxDialogDescriptionRebranding"><![CDATA[DuckDuckGo also has an <b>optional paid subscription</b>, with a secure <b>VPN</b> and advanced, private AI.]]></string>
+
 </resources>

app/src/test/java/com/duckduckgo/app/about/AboutDuckDuckGoViewModelTest.kt

@@ -25,6 +25,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback
+import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -58,6 +59,9 @@ internal class AboutDuckDuckGoViewModelTest {
     @Mock
     private lateinit var privacyProUnifiedFeedback: PrivacyProUnifiedFeedback
 
+    @Mock
+    private lateinit var mockSubscriptionRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle
+
     @Before
     fun before() {
         MockitoAnnotations.openMocks(this)
@@ -69,6 +73,7 @@ internal class AboutDuckDuckGoViewModelTest {
             mockAppBuildConfig,
             mockPixel,
             privacyProUnifiedFeedback,
+            mockSubscriptionRebrandingFeatureToggle,
         )
     }
 

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/notification/NetPDisabledNotificationBuilder.kt

@@ -32,6 +32,7 @@ import com.duckduckgo.networkprotection.impl.R
 import com.duckduckgo.networkprotection.impl.subscription.NetpSubscriptionManager
 import com.duckduckgo.networkprotection.impl.subscription.isActive
 import com.duckduckgo.networkprotection.impl.subscription.isExpired
+import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import com.squareup.anvil.annotations.ContributesBinding
 import java.text.DateFormat
 import java.text.SimpleDateFormat
@@ -58,6 +59,7 @@ class RealNetPDisabledNotificationBuilder @Inject constructor(
     private val netPNotificationActions: NetPNotificationActions,
     private val globalActivityStarter: GlobalActivityStarter,
     private val netpSubscriptionManager: NetpSubscriptionManager,
+    private val subscriptionRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle,
 ) : NetPDisabledNotificationBuilder {
     private val defaultDateTimeFormatter = SimpleDateFormat.getTimeInstance(DateFormat.SHORT)
 
@@ -183,14 +185,19 @@ class RealNetPDisabledNotificationBuilder @Inject constructor(
             addNextIntentWithParentStack(intent)
             getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
         }
+        val notificationDescriptionRes = if (subscriptionRebrandingFeatureToggle.isSubscriptionRebrandingEnabled()) {
+            R.string.netpNotificationVpnAccessRevokedRebranding
+        } else {
+            R.string.netpNotificationVpnAccessRevoked
+        }
 
         return NotificationCompat.Builder(context, NETP_ALERTS_CHANNEL_ID)
             .setSmallIcon(com.duckduckgo.mobile.android.R.drawable.notification_logo)
             .setContentIntent(pendingIntent)
-            .setContentText(context.getString(R.string.netpNotificationVpnAccessRevoked))
+            .setContentText(context.getString(notificationDescriptionRes))
             .setStyle(
                 NotificationCompat.BigTextStyle().bigText(
-                    context.getString(R.string.netpNotificationVpnAccessRevoked),
+                    context.getString(notificationDescriptionRes),
                 ),
             )
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/revoked/AccessRevokedDialog.kt

@@ -28,6 +28,7 @@ import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.networkprotection.impl.R
 import com.duckduckgo.networkprotection.impl.pixels.NetworkProtectionPixels
+import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
 import com.duckduckgo.subscriptions.api.SubscriptionScreens.SubscriptionPurchase
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject
@@ -60,6 +61,7 @@ class RealAccessRevokedDialog @Inject constructor(
     private val globalActivityStarter: GlobalActivityStarter,
     private val networkProtectionPixels: NetworkProtectionPixels,
     private val sharedPreferencesProvider: SharedPreferencesProvider,
+    private val subscriptionRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle,
 ) : AccessRevokedDialog {
 
     private val preferences: SharedPreferences by lazy {
@@ -90,10 +92,15 @@ class RealAccessRevokedDialog @Inject constructor(
         if (boundActivity == activity) return
 
         boundActivity = activity
+        val messageRes = if (subscriptionRebrandingFeatureToggle.isSubscriptionRebrandingEnabled()) {
+            R.string.netpDialogVpnAccessRevokedBodyRebranding
+        } else {
+            R.string.netpDialogVpnAccessRevokedBody
+        }
 
         TextAlertDialogBuilder(activity)
             .setTitle(R.string.netpDialogVpnAccessRevokedTitle)
-            .setMessage(R.string.netpDialogVpnAccessRevokedBody)
+            .setMessage(messageRes)
             .setPositiveButton(R.string.netpDialogVpnAccessRevokedPositiveAction)
             .setNegativeButton(R.string.netpDialogVpnAccessRevokedNegativeAction)
             .addEventListener(

network-protection/network-protection-impl/src/main/res/values/donottranslate.xml

@@ -14,4 +14,8 @@
   ~ limitations under the License.
   -->
 
-<resources></resources>
+<resources>
+    <!-- Privacy Pro Rebranding-->
+    <string name="netpNotificationVpnAccessRevokedRebranding">VPN disconnected due to expired subscription. Subscribe to DuckDuckGo to reconnect the VPN.</string>
+    <string name="netpDialogVpnAccessRevokedBodyRebranding">Subscribe to DuckDuckGo to reconnect the VPN.</string>
+</resources>

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/settings/plugins/SubsSettingsPlugins.kt

@@ -37,10 +37,10 @@ class ProSettingsTitle @Inject constructor(
 ) : ProSettingsPlugin {
     override fun getView(context: Context): View {
         return SectionHeaderListItem(context).apply {
-            if (subscriptionRebrandingFeatureToggle.isSubscriptionRebrandingEnabled()) {
-                primaryText = context.getString(R.string.subscriptionSettingSectionTitle)
+            primaryText = if (subscriptionRebrandingFeatureToggle.isSubscriptionRebrandingEnabled()) {
+                context.getString(R.string.subscriptionSettingSectionTitle)
             } else {
-                primaryText = context.getString(R.string.privacyPro)
+                context.getString(R.string.privacyPro)
             }
         }
     }