Remove old analytic events lingering from v4 (#1093)

braintree · Aug 5, 2024 · c3d4859 · c3d4859
1 parent 0a1c56d
commit c3d4859
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 51 deletions.
diff --git a/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalClient.kt b/PayPal/src/main/java/com/braintreepayments/api/paypal/PayPalClient.kt
@@ -19,7 +19,6 @@ import org.json.JSONObject
 /**
  * Used to tokenize PayPal accounts. For more information see the [documentation](https://developer.paypal.com/braintree/docs/guides/paypal/overview/android/v4)
  */
-@Suppress("TooManyFunctions")
 class PayPalClient @VisibleForTesting internal constructor(
     private val braintreeClient: BraintreeClient,
     private val internalPayPalClient: PayPalInternalClient = PayPalInternalClient(braintreeClient),
@@ -65,55 +64,9 @@ class PayPalClient @VisibleForTesting internal constructor(
         payPalRequest: PayPalRequest,
         callback: PayPalPaymentAuthCallback
     ) {
-        braintreeClient.sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_STARTED)
-        if (payPalRequest is PayPalCheckoutRequest) {
-            isVaultRequest = false
-            sendCheckoutRequest(context, payPalRequest, callback)
-        } else if (payPalRequest is PayPalVaultRequest) {
-            isVaultRequest = true
-            sendVaultRequest(context, payPalRequest, callback)
-        }
-    }
-
-    private fun sendCheckoutRequest(
-        context: Context,
-        payPalCheckoutRequest: PayPalCheckoutRequest,
-        callback: PayPalPaymentAuthCallback
-    ) {
-        braintreeClient.sendAnalyticsEvent("paypal.single-payment.selected", analyticsParams)
-        if (payPalCheckoutRequest.shouldOfferPayLater) {
-            braintreeClient.sendAnalyticsEvent(
-                "paypal.single-payment.paylater.offered",
-                analyticsParams
-            )
-        }
-
-        braintreeClient.getConfiguration { configuration: Configuration?, error: Exception? ->
-            if (error != null) {
-                callbackCreatePaymentAuthFailure(callback, PayPalPaymentAuthRequest.Failure(error))
-            } else if (payPalConfigInvalid(configuration)) {
-                callbackCreatePaymentAuthFailure(
-                    callback,
-                    PayPalPaymentAuthRequest.Failure(createPayPalError())
-                )
-            } else {
-                sendPayPalRequest(context, payPalCheckoutRequest, callback)
-            }
-        }
-    }
+        isVaultRequest = payPalRequest is PayPalVaultRequest
 
-    private fun sendVaultRequest(
-        context: Context,
-        payPalVaultRequest: PayPalVaultRequest,
-        callback: PayPalPaymentAuthCallback
-    ) {
-        braintreeClient.sendAnalyticsEvent("paypal.billing-agreement.selected", analyticsParams)
-        if (payPalVaultRequest.shouldOfferCredit) {
-            braintreeClient.sendAnalyticsEvent(
-                "paypal.billing-agreement.credit.offered",
-                analyticsParams
-            )
-        }
+        braintreeClient.sendAnalyticsEvent(PayPalAnalytics.TOKENIZATION_STARTED, analyticsParams)
 
         braintreeClient.getConfiguration { configuration: Configuration?, error: Exception? ->
             if (error != null) {
@@ -124,7 +77,7 @@ class PayPalClient @VisibleForTesting internal constructor(
                     PayPalPaymentAuthRequest.Failure(createPayPalError())
                 )
             } else {
-                sendPayPalRequest(context, payPalVaultRequest, callback)
+                sendPayPalRequest(context, payPalRequest, callback)
             }
         }
     }

diff --git a/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/paypal/PayPalClientUnitTest.java
@@ -100,7 +100,7 @@ public void createPaymentAuthRequest_callsBackPayPalResponse_sendsStartedAnalyti
 
         verify(braintreeClient).sendAnalyticsEvent(
             PayPalAnalytics.TOKENIZATION_STARTED,
-            new AnalyticsEventParams(null, null, false, null, null, null)
+            new AnalyticsEventParams(null, null, true, null, null, null)
         );
     }