Remove temporary pixel to measure expired account restore while purchasing Privacy Pro

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt

@@ -271,7 +271,6 @@ class RealSubscriptionsManager @Inject constructor(
     private var purchaseStateJob: Job? = null
 
     private var removeExpiredSubscriptionOnCancelledPurchase: Boolean = false
-    private var purchaseFlowStartedUsingRestoredAccount: Boolean = false
 
     // Indicates whether the user is part of any FE experiment at the time of purchase
     private var experimentAssigned: Experiment? = null
@@ -474,11 +473,6 @@ class RealSubscriptionsManager @Inject constructor(
                 }
                 pixelSender.reportPurchaseSuccess()
                 pixelSender.reportSubscriptionActivated()
-                if (purchaseFlowStartedUsingRestoredAccount) {
-                    purchaseFlowStartedUsingRestoredAccount = false
-                    val hasEmail = !authRepository.getAccount()?.email.isNullOrBlank()
-                    pixelSender.reportPurchaseWithRestoredAccount(hasEmail)
-                }
                 emitEntitlementsValues()
                 _currentPurchaseState.emit(CurrentPurchase.Success)
             } else {
@@ -494,7 +488,6 @@ class RealSubscriptionsManager @Inject constructor(
     }
 
     private suspend fun handlePurchaseFailed() {
-        purchaseFlowStartedUsingRestoredAccount = false
         authRepository.purchaseToWaitingStatus()
         pixelSender.reportPurchaseFailureBackend()
         _currentPurchaseState.emit(CurrentPurchase.Waiting)
@@ -834,20 +827,16 @@ class RealSubscriptionsManager @Inject constructor(
                 isSignedInV1() -> fetchAndStoreAllData()
             }
 
-            var restoredAccount = false
-
             if (!isSignedIn()) {
                 recoverSubscriptionFromStore()
-                restoredAccount = isSignedIn()
             } else {
                 authRepository.getSubscription()?.run {
                     if (status.isExpired() && platform == "google") {
                         // re-authenticate in case previous subscription was bought using different google account
                         val accountId = authRepository.getAccount()?.externalId
                         recoverSubscriptionFromStore()
-                        val accountIdChanged = accountId != null && accountId != authRepository.getAccount()?.externalId
-                        removeExpiredSubscriptionOnCancelledPurchase = accountIdChanged
-                        restoredAccount = accountIdChanged
+                        removeExpiredSubscriptionOnCancelledPurchase =
+                            accountId != null && accountId != authRepository.getAccount()?.externalId
                     }
                 }
             }
@@ -874,8 +863,6 @@ class RealSubscriptionsManager @Inject constructor(
                 Experiment(experimentName, experimentCohort)
             }
 
-            purchaseFlowStartedUsingRestoredAccount = restoredAccount
-
             logcat { "Subs: external id is ${authRepository.getAccount()!!.externalId}" }
             _currentPurchaseState.emit(CurrentPurchase.PreFlowFinished)
             playBillingManager.launchBillingFlow(
@@ -889,7 +876,6 @@ class RealSubscriptionsManager @Inject constructor(
             logcat(ERROR) { "Subs: $error" }
             pixelSender.reportPurchaseFailureOther()
             _currentPurchaseState.emit(CurrentPurchase.Failure(error))
-            purchaseFlowStartedUsingRestoredAccount = false
         }
     }
 

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/pixels/SubscriptionPixel.kt

@@ -201,11 +201,6 @@ enum class SubscriptionPixel(
         type = Count,
         includedParameters = setOf(ATB, APP_VERSION),
     ),
-    SUBSCRIPTION_PURCHASE_WITH_RESTORED_ACCOUNT(
-        baseName = "m_privacy-pro_app_purchase_with_restored_account",
-        type = Count,
-        includedParameters = setOf(APP_VERSION),
-    ),
     AUTH_V2_INVALID_REFRESH_TOKEN_DETECTED(
         baseName = "m_privacy-pro_auth_invalid_refresh_token_detected",
         types = setOf(Count, Daily()),

subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/pixels/SubscriptionPixelSender.kt

@@ -18,7 +18,6 @@ package com.duckduckgo.subscriptions.impl.pixels
 
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
-import com.duckduckgo.common.utils.extensions.toBinaryString
 import com.duckduckgo.common.utils.extensions.toSanitizedLanguageTag
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.subscriptions.impl.freetrial.FreeTrialPrivacyProPixelsPlugin
@@ -67,7 +66,6 @@ import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_O
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_PRICE_MONTHLY_CLICK
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_PRICE_YEARLY_CLICK
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_PRIVACY_PRO_REDIRECT
-import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_PURCHASE_WITH_RESTORED_ACCOUNT
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_SETTINGS_CHANGE_PLAN_OR_BILLING_CLICK
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_SETTINGS_REMOVE_FROM_DEVICE_CLICK
 import com.duckduckgo.subscriptions.impl.pixels.SubscriptionPixel.SUBSCRIPTION_SETTINGS_SHOWN
@@ -109,7 +107,6 @@ interface SubscriptionPixelSender {
     fun reportOnboardingFaqClick()
     fun reportAddEmailSuccess()
     fun reportPrivacyProRedirect()
-    fun reportPurchaseWithRestoredAccount(hasEmail: Boolean)
     fun reportAuthV2InvalidRefreshTokenDetected()
     fun reportAuthV2InvalidRefreshTokenSignedOut()
     fun reportAuthV2InvalidRefreshTokenRecovered()
@@ -242,9 +239,6 @@ class SubscriptionPixelSenderImpl @Inject constructor(
     override fun reportPrivacyProRedirect() =
         fire(SUBSCRIPTION_PRIVACY_PRO_REDIRECT)
 
-    override fun reportPurchaseWithRestoredAccount(hasEmail: Boolean) =
-        fire(SUBSCRIPTION_PURCHASE_WITH_RESTORED_ACCOUNT, mapOf("hasEmail" to hasEmail.toBinaryString()))
-
     override fun reportAuthV2InvalidRefreshTokenDetected() {
         fire(AUTH_V2_INVALID_REFRESH_TOKEN_DETECTED)
     }

subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/RealSubscriptionsManagerTest.kt

@@ -1184,39 +1184,6 @@ class RealSubscriptionsManagerTest(private val authApiV2Enabled: Boolean) {
         }
     }
 
-    @Test
-    fun whenPurchaseIsSuccessfulAndAccountWasRestoredThenPixelIsSent() = runTest {
-        givenUserIsNotSignedIn()
-        givenPurchaseStored()
-        givenStoreLoginSucceeds()
-        givenSubscriptionSucceedsWithoutEntitlements(status = EXPIRED.statusName)
-        givenConfirmPurchaseSucceeds()
-        givenAccessTokenSucceeds()
-        givenV2AccessTokenRefreshSucceeds()
-
-        val purchaseState = MutableSharedFlow<PurchaseState>()
-        whenever(playBillingManager.purchaseState).thenReturn(purchaseState)
-
-        subscriptionsManager.currentPurchaseState.test {
-            purchase()
-            assertTrue(awaitItem() is CurrentPurchase.PreFlowInProgress)
-            assertTrue(awaitItem() is CurrentPurchase.PreFlowFinished)
-
-            purchaseState.emit(PurchaseState.Purchased("any", "any"))
-            givenSubscriptionSucceedsWithEntitlements()
-
-            assertTrue(awaitItem() is CurrentPurchase.InProgress)
-            assertTrue(awaitItem() is CurrentPurchase.Success)
-
-            verify(pixelSender).reportPurchaseSuccess()
-            verify(pixelSender).reportPurchaseWithRestoredAccount(any())
-            verify(pixelSender).reportSubscriptionActivated()
-            verifyNoMoreInteractions(pixelSender)
-
-            cancelAndConsumeRemainingEvents()
-        }
-    }
-
     @Test
     fun whenPurchaseFailsThenPixelIsSent() = runTest {
         givenUserIsSignedIn()