Update Settings: Address Ppro Issues (#5460)

Task/Issue URL:
https://app.asana.com/0/1207908166761516/1209138029097313/f

### Description

Address Ship Review comments regarding not being able to see Ppro
settings items when subscriptions expired.

It was necessary to consider available Products ([you may see these
referred to as "features" internally in the subscription
module](https://app.asana.com/0/414730916066338/1209117572597478/f))
when a user's subscription has expired or they are in a waiting state,
as their entitlements would end up being empty.

Now we know what Products are available to the user, we can display them
correctly in their disabled state to match the new Settings design.

### Steps to test this PR

Prerequisite: `newSettings` feature flag is enabled

Follow these
[instructions](https://app.asana.com/0/1142021229838617/1208861246073828/f)
to install Play Billing Lab so you can test US and ROW subscription
plans

**US**

Prerequisite: Country/Region is set to US in Play Billing Lab 

_New Settings Top Level_
- [x] Open Settings screen 
- [x] Verify items displayed match design Not Subscribed state

_Subscribed State_
- [ ] Tap "Get Privacy Pro"
- [ ] Purchase Ppro monthly
- [ ] One Purchase is completed return to top level settings screen
- [ ] Verify VPN, PIR, ITR and Settings items are displayed, matching
design Subscribed state
- [ ] Turn on VPN
- [ ] Return to top level settings screen
- [ ] Ensure VPN status indicator is on
- [ ] Turn VPN off
- [ ] Return to top level settings screen
- [ ] Ensure VPN status is off

_Expired State_
- [ ] Tap "Subscription Settings"
- [ ] Click "Update Plan or Cancel" item
- [ ] Cancel the Subscription
- [ ] Wait 5 mins
- [ ] Return to top level settings screen
- [ ] Verify VPN, PIR, ITR are in a disabled state like designs
- [ ] Verify VPN, PIR, ITR are not clickable
- [ ] Verify Settings item is in expired state 

_Remove subscription_
- [ ] Re-purchase Ppro
- [ ] From the Subscription Settings screen click "Remove From this
Device"
- [ ] Return to top level settings screen
- [ ] Verify you're in the Not Subscribed state

_Activating State_

Prerequisite: Apply patch in
[task](https://app.asana.com/0/1207908166761516/1209138029097313/f) as
this is hard to reproduce via device

- [ ] Apply patch
- [ ] Open settings
- [ ] Verify Ppro is in Activating state like designs
- [ ] Verify VPN, PIR, ITR are not clickable
- [ ] Re-purchase Ppro
- [ ] From the Subscription Settings screen click "Remove From this
Device"
- [ ] Return to top level settings screen
- [ ] Verify you're in the Not Subscribed state

**ROW**

Prerequisite: Country/Region is set to UK in Play Billing Lab 

_New Settings Top Level_
- [ ] Open Settings screen 
- [ ] Verify items displayed match design Not Subscribed state

_Subscribed State_
- [ ] Tap "Get Privacy Pro"
- [ ] Purchase Ppro monthly
- [ ] One Purchase is completed return to top level settings screen
- [ ] Verify only VPN, ITR and Settings items are displayed and match
design Subscribed state
- [ ] Turn on VPN
- [ ] Return to top level settings screen
- [ ] Ensure VPN status indicator is on
- [ ] Turn VPN off
- [ ] Return to top level settings screen
- [ ] Ensure VPN status is off

_Expired State_
- [ ] Tap "Subscription Settings"
- [ ] Click "Update Plan or Cancel" item
- [ ] Cancel the Subscription
- [ ] Wait 5 mins
- [ ] Return to top level settings screen
- [ ] Verify only VPN, ITR are in a disabled state like designs
- [ ] Verify VPN, ITR are not clickable
- [ ] Verify Settings item is in expired state 

_Remove subscription_
- [ ] Re-purchase Ppro
- [ ] From the Subscription Settings screen click "Remove From this
Device"
- [ ] Return to top level settings screen
- [ ] Verify you're in the Not Subscribed state

### UI changes

No UI changes but it's helpful to see the
[designs](https://www.figma.com/design/CjH849hL53lhsPlf6Ufeo4/%E2%9A%99%EF%B8%8F-Browser-Settings-Documentation-(All-Platforms)?node-id=7605-431390&t=RdmuNULWUyR1cMH7-4)
to remember our new states

Author: mikescamell

.github/workflows/build-ad-hoc.yml

@@ -7,6 +7,17 @@ on:
         description: 'Ref to build APK from (branch, tag, commit)'
         required: true
         default: 'develop'
+      build-variant:
+        description: 'Android build variant'
+        required: true
+        default: 'playRelease'
+        type: choice
+        options:
+          - fdroidRelease
+          - internalDebug
+          - internalRelease
+          - playDebug
+          - playRelease
 
 env:
   ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
@@ -52,15 +63,15 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
 
-      - name: Assemble release APK
-        run: ./gradlew assemblePlayRelease -Pforce-default-variant
+      - name: Assemble APK
+        run: ./gradlew assemble${{github.event.inputs.build-variant}} -Pforce-default-variant
 
       - name: Move APK to new folder
-        run: find . -name "*.apk"  -exec mv '{}' apk/release.apk \;
+        run: find . -name "*.apk"  -exec mv '{}' apk/release${{github.event.inputs.build-variant}}.apk \;
 
       - name: Upload debug apk
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: release
-          path: apk/release.apk
+          path: apk/release${{github.event.inputs.build-variant}}.apk

.github/workflows/release_upload_play_store.yml

@@ -2,6 +2,10 @@ name: Release - Production Release to Play Store and Github
 
 on:
   workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Ref to build APK from (branch, tag, commit)'
+        required: true
 
 env:
   ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
@@ -20,6 +24,7 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.GT_DAXMOBILE }}
+          ref: ${{ github.event.inputs.ref }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt

@@ -27,6 +27,9 @@ import com.duckduckgo.app.browser.session.WebViewSessionInMemoryStorage
 import com.duckduckgo.app.browser.weblocalstorage.WebLocalStorageManager
 import com.duckduckgo.app.global.file.FileDeleter
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
+import com.duckduckgo.appbuildconfig.api.AppBuildConfig
+import com.duckduckgo.appbuildconfig.api.BuildFlavor.INTERNAL
+import com.duckduckgo.appbuildconfig.api.BuildFlavor.PLAY
 import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.cookies.api.DuckDuckGoCookieManager
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
@@ -41,6 +44,7 @@ import org.junit.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 
 @Suppress("RemoveExplicitTypeArguments")
@@ -52,8 +56,9 @@ class WebViewDataManagerTest {
     private val context = InstrumentationRegistry.getInstrumentation().targetContext
     private val mockFileDeleter: FileDeleter = mock()
     private val mockWebViewHttpAuthStore: WebViewHttpAuthStore = mock()
-    private val webLocalStorageManager: WebLocalStorageManager = mock()
+    private val mockWebLocalStorageManager: WebLocalStorageManager = mock()
     private val mockCrashLogger: CrashLogger = mock()
+    private val mockAppBuildConfig: AppBuildConfig = mock()
     private val feature = FakeFeatureToggleFactory.create(AndroidBrowserConfigFeature::class.java)
 
     private val testee = WebViewDataManager(
@@ -63,10 +68,11 @@ class WebViewDataManagerTest {
         mockFileDeleter,
         mockWebViewHttpAuthStore,
         feature,
-        webLocalStorageManager,
+        mockWebLocalStorageManager,
         mockCrashLogger,
         TestScope(),
         CoroutineTestRule().testDispatcherProvider,
+        mockAppBuildConfig,
     )
 
     @Test
@@ -96,29 +102,50 @@ class WebViewDataManagerTest {
         }
     }
 
+    @SuppressLint("DenyListedApi")
     @Test
     fun whenDataClearedThenWebViewWebStorageCleared() = runTest {
         withContext(Dispatchers.Main) {
+            feature.webLocalStorage().setRawStoredState(State(enable = true))
             val webView = TestWebView(context)
             testee.clearData(webView, mockStorage)
-            verify(webLocalStorageManager).clearWebLocalStorage()
+            verify(mockWebLocalStorageManager).clearWebLocalStorage()
             verify(mockStorage, never()).deleteAllData()
         }
     }
 
+    @SuppressLint("DenyListedApi")
     @Test
-    fun whenDataClearedAndThrowsExceptionThenSendCrashPixelAndDeleteAllData() = runTest {
+    fun whenDataClearedAndThrowsExceptionAndInternalThenSendCrashPixelAndDeleteAllData() = runTest {
         withContext(Dispatchers.Main) {
+            feature.webLocalStorage().setRawStoredState(State(enable = true))
             val exception = RuntimeException("test")
             val webView = TestWebView(context)
-            whenever(webLocalStorageManager.clearWebLocalStorage()).thenThrow(exception)
+            whenever(mockAppBuildConfig.flavor).thenReturn(INTERNAL)
+            whenever(mockWebLocalStorageManager.clearWebLocalStorage()).thenThrow(exception)
             testee.clearData(webView, mockStorage)
-            verify(webLocalStorageManager).clearWebLocalStorage()
+            verify(mockWebLocalStorageManager).clearWebLocalStorage()
             verify(mockCrashLogger).logCrash(CrashLogger.Crash(shortName = "web_storage_on_clear_error", t = exception))
             verify(mockStorage).deleteAllData()
         }
     }
 
+    @SuppressLint("DenyListedApi")
+    @Test
+    fun whenDataClearedAndThrowsExceptionAndNotInternalThenDoNotSendCrashPixelAndDeleteAllData() = runTest {
+        withContext(Dispatchers.Main) {
+            feature.webLocalStorage().setRawStoredState(State(enable = true))
+            val exception = RuntimeException("test")
+            val webView = TestWebView(context)
+            whenever(mockAppBuildConfig.flavor).thenReturn(PLAY)
+            whenever(mockWebLocalStorageManager.clearWebLocalStorage()).thenThrow(exception)
+            testee.clearData(webView, mockStorage)
+            verify(mockWebLocalStorageManager).clearWebLocalStorage()
+            verifyNoInteractions(mockCrashLogger)
+            verify(mockStorage).deleteAllData()
+        }
+    }
+
     @Test
     fun whenDataClearedThenWebViewAuthCredentialsCleared() = runTest {
         withContext(Dispatchers.Main) {
@@ -173,6 +200,7 @@ class WebViewDataManagerTest {
                 File(context.applicationInfo.dataDir, "app_webview/Default"),
                 listOf("Cookies"),
             )
+            verifyNoInteractions(mockWebLocalStorageManager)
         }
     }
 
@@ -189,6 +217,7 @@ class WebViewDataManagerTest {
                 File(context.applicationInfo.dataDir, "app_webview/Default"),
                 listOf("Cookies", "Local Storage"),
             )
+            verify(mockWebLocalStorageManager).clearWebLocalStorage()
         }
     }
 

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -44,10 +44,8 @@ import com.duckduckgo.app.privacy.model.TestEntity
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Count
-import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Unique
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.model.TabRepository
-import com.duckduckgo.app.trackerdetection.blocklist.BlockList.Cohorts.CONTROL
 import com.duckduckgo.app.trackerdetection.model.Entity
 import com.duckduckgo.app.trackerdetection.model.TrackerStatus
 import com.duckduckgo.app.trackerdetection.model.TrackerType
@@ -794,7 +792,6 @@ class CtaViewModelTest {
         val site = site(url = privacyProUrl)
 
         val value = testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = true, site = site)
-        verify(mockPixel, never()).fire(eq(ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE), any(), any(), eq(Unique()))
         assertNull(value)
     }
 
@@ -813,36 +810,6 @@ class CtaViewModelTest {
         assertNull(value)
     }
 
-    @Test
-    fun givenDuckPlayerSiteWhenRefreshCtaWhileBrowsingThenFireSkipMajorNetworkPixel() = runTest {
-        givenDaxOnboardingActive()
-        val site = site(url = "duck://player/12345", entity = TestEntity("Google", "Google", 9.0))
-
-        whenever(mockDuckPlayer.isDuckPlayerUri(any())).thenReturn(true)
-        whenever(mockDuckPlayer.getDuckPlayerState()).thenReturn(ENABLED)
-        whenever(mockDuckPlayer.getUserPreferences()).thenReturn(UserPreferences(false, AlwaysAsk))
-        whenever(mockDuckPlayer.isYouTubeUrl(any())).thenReturn(false)
-        whenever(mockDuckPlayer.isSimulatedYoutubeNoCookie(any())).thenReturn(false)
-
-        testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = true, site = site)
-        verify(mockPixel).fire(eq(ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE), any(), any(), eq(Unique()))
-    }
-
-    @Test
-    fun givenDuckPlayerSiteWhenRefreshCtaWhileBrowsingAndTrackersDialogAlreadyShownThenDontSentSkipMajorNetworkPixel() = runTest {
-        givenDaxOnboardingActive()
-        val site = site(url = "duck://player/12345", entity = TestEntity("Google", "Google", 9.0))
-
-        whenever(mockDuckPlayer.isDuckPlayerUri(any())).thenReturn(true)
-        whenever(mockDuckPlayer.getDuckPlayerState()).thenReturn(ENABLED)
-        whenever(mockDuckPlayer.getUserPreferences()).thenReturn(UserPreferences(false, AlwaysAsk))
-        whenever(mockDuckPlayer.isYouTubeUrl(any())).thenReturn(false)
-        whenever(mockDuckPlayer.isSimulatedYoutubeNoCookie(any())).thenReturn(false)
-
-        testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = true, site = site)
-        verify(mockPixel).fire(eq(ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE), any(), any(), eq(Unique()))
-    }
-
     @Test
     fun givenHighlightsExperimentWhenRefreshCtaOnHomeTabAndIntroCtaWasNotPreviouslyShownThenExperimentIntroCtaShown() = runTest {
         givenDaxOnboardingActive()

app/src/main/java/com/duckduckgo/app/browser/WebDataManager.kt

@@ -26,6 +26,8 @@ import com.duckduckgo.app.browser.weblocalstorage.WebLocalStorageManager
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.global.file.FileDeleter
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
+import com.duckduckgo.appbuildconfig.api.AppBuildConfig
+import com.duckduckgo.appbuildconfig.api.isInternalBuild
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.cookies.api.DuckDuckGoCookieManager
 import com.duckduckgo.di.scopes.AppScope
@@ -61,6 +63,7 @@ class WebViewDataManager @Inject constructor(
     private val crashLogger: CrashLogger,
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
     private val dispatcherProvider: DispatcherProvider,
+    private val appBuildConfig: AppBuildConfig,
 ) : WebDataManager {
 
     override suspend fun clearData(
@@ -86,13 +89,20 @@ class WebViewDataManager @Inject constructor(
 
     private suspend fun clearWebStorage(webStorage: WebStorage) {
         suspendCoroutine { continuation ->
-            kotlin.runCatching {
-                webLocalStorageManager.clearWebLocalStorage()
-                continuation.resume(Unit)
-            }.onFailure { e ->
-                Timber.e(e, "WebDataManager: Could not selectively clear web storage")
-                sendCrashPixel(e)
-                // fallback, if we crash we delete everything
+            if (androidBrowserConfigFeature.webLocalStorage().isEnabled()) {
+                kotlin.runCatching {
+                    webLocalStorageManager.clearWebLocalStorage()
+                    continuation.resume(Unit)
+                }.onFailure { e ->
+                    Timber.e(e, "WebDataManager: Could not selectively clear web storage")
+                    if (appBuildConfig.isInternalBuild()) {
+                        sendCrashPixel(e)
+                    }
+                    // fallback, if we crash we delete everything
+                    webStorage.deleteAllData()
+                    continuation.resume(Unit)
+                }
+            } else {
                 webStorage.deleteAllData()
                 continuation.resume(Unit)
             }

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

@@ -42,11 +42,9 @@ import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.testPrivacyProOn
 import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.testPrivacyProOnboardingSecondaryButtonMetricPixel
 import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.testPrivacyProOnboardingShownMetricPixel
 import com.duckduckgo.app.pixels.AppPixelName
-import com.duckduckgo.app.pixels.AppPixelName.ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE
 import com.duckduckgo.app.privacy.db.UserAllowListRepository
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.pixels.Pixel
-import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Unique
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import com.duckduckgo.brokensite.api.BrokenSitePrompt
@@ -486,15 +484,6 @@ class CtaViewModel @Inject constructor(
                         duckPlayer.isDuckPlayerUri(site.url) || duckPlayer.isSimulatedYoutubeNoCookie(uri)
                     )
 
-        if (isDuckPlayerUrl) { // temporary pixel
-            val isMayorNetwork = !daxDialogNetworkShown() && !daxDialogTrackersFoundShown() && OnboardingDaxDialogCta.mainTrackerNetworks.any {
-                site.entity?.displayName?.contains(it) ?: false
-            }
-            if (isMayorNetwork) {
-                pixel.fire(pixel = ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE, type = Unique())
-            }
-        }
-
         return isDuckPlayerUrl
     }
 

app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt

@@ -16,13 +16,17 @@
 
 package com.duckduckgo.app.feedback.ui.initial
 
+import android.app.UiModeManager
 import android.os.Bundle
+import androidx.core.content.ContextCompat.getSystemService
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.ContentFeedbackBinding
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
-import com.duckduckgo.common.ui.DuckDuckGoTheme
+import com.duckduckgo.common.ui.DuckDuckGoTheme.DARK
+import com.duckduckgo.common.ui.DuckDuckGoTheme.LIGHT
+import com.duckduckgo.common.ui.DuckDuckGoTheme.SYSTEM_DEFAULT
 import com.duckduckgo.common.ui.store.ThemingDataStore
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.FragmentScope
@@ -50,15 +54,29 @@ class InitialFeedbackFragment : FeedbackFragment(R.layout.content_feedback) {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        if (themingDataStore.theme == DuckDuckGoTheme.LIGHT) {
-            binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
-            binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
-        } else {
-            binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
-            binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
+        when (themingDataStore.theme) {
+            SYSTEM_DEFAULT -> {
+                val uiManager = getSystemService(requireContext(), UiModeManager::class.java)
+                when (uiManager?.nightMode) {
+                    UiModeManager.MODE_NIGHT_YES -> renderDarkButtons()
+                    else -> renderLightButtons()
+                }
+            }
+            DARK -> renderDarkButtons()
+            LIGHT -> renderLightButtons()
         }
     }
 
+    private fun renderLightButtons() {
+        binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
+        binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
+    }
+
+    private fun renderDarkButtons() {
+        binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
+        binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
+    }
+
     override fun configureViewModelObservers() {
         viewModel.command.observe(this) {
             when (it) {

app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt

@@ -49,7 +49,6 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName {
     ONBOARDING_DAX_ALL_CTA_HIDDEN("m_odc_h"),
     ONBOARDING_DAX_CTA_OK_BUTTON("m_odc_ok"),
     ONBOARDING_DAX_CTA_CANCEL_BUTTON("m_onboarding_dax_cta_cancel"),
-    ONBOARDING_SKIP_MAJOR_NETWORK_UNIQUE("m_onboarding_skip_major_network_unique"),
     ONBOARDING_VISIT_SITE_CTA_SHOWN("onboarding_visit_site_cta_shown"),
 
     BROWSER_MENU_ALLOWLIST_ADD("mb_wla"),

app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt

@@ -71,6 +71,7 @@ import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreen
 import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.view.gone
+import com.duckduckgo.common.ui.view.listitem.DaxListItem.IconSize.Small
 import com.duckduckgo.common.ui.view.listitem.TwoLineListItem
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -201,6 +202,7 @@ class NewSettingsActivity : DuckDuckGoActivity() {
         with(viewsOther) {
             aboutSetting.setOnClickListener { viewModel.onAboutSettingClicked() }
             shareFeedbackSetting.setOnClickListener { viewModel.onShareFeedbackClicked() }
+            ddgOnOtherPlatformsSetting.setTrailingIconSize(Small)
             ddgOnOtherPlatformsSetting.setOnClickListener { viewModel.onDdgOnOtherPlatformsClicked() }
         }
     }