Remove ClientParams

AmericanExpress/src/main/java/com/braintreepayments/api/AmericanExpressClient.java

@@ -1,5 +1,6 @@
 package com.braintreepayments.api;
 
+import android.content.Context;
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
@@ -19,10 +20,12 @@ public class AmericanExpressClient {
 
     /**
      * Initializes a new {@link AmericanExpressClient} instance
-     * @param clientParams configurable {@link ClientParams}
+     *
+     * @param context
+     * @param authorization
      */
-    public AmericanExpressClient(@NonNull ClientParams clientParams) {
-        this.braintreeClient = new BraintreeClient(clientParams);
+    public AmericanExpressClient(@NonNull Context context, @NonNull String authorization) {
+        this.braintreeClient = new BraintreeClient(context, authorization);
     }
 
     @VisibleForTesting AmericanExpressClient(@NonNull BraintreeClient braintreeClient) {

BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeClient.kt

@@ -64,13 +64,6 @@ open class BraintreeClient @VisibleForTesting internal constructor(
         braintreeDeepLinkReturnUrlScheme = params.braintreeReturnUrlScheme
     )
 
-    /**
-     * @suppress
-     */
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    constructor(clientParams: ClientParams) :
-        this(clientParams.context, clientParams.authorization, clientParams.returnUrlScheme)
-
     /**
      * @suppress
      */

Card/src/main/java/com/braintreepayments/api/CardClient.java

@@ -1,5 +1,7 @@
 package com.braintreepayments.api;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -21,8 +23,8 @@ public class CardClient {
      * Initializes a new {@link CardClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public CardClient(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public CardClient(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting

DataCollector/src/main/java/com/braintreepayments/api/DataCollector.java

@@ -26,8 +26,8 @@ public class DataCollector {
      * Initializes a new {@link DataCollector} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public DataCollector(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public DataCollector(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting

Demo/src/main/java/com/braintreepayments/demo/CardFragment.java

@@ -17,11 +17,9 @@
 
 import com.braintreepayments.api.AmericanExpressClient;
 import com.braintreepayments.api.AmericanExpressRewardsBalance;
-import com.braintreepayments.api.BraintreeClient;
 import com.braintreepayments.api.Card;
 import com.braintreepayments.api.CardClient;
 import com.braintreepayments.api.CardNonce;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.DataCollector;
 import com.braintreepayments.api.PaymentMethodNonce;
 import com.braintreepayments.api.ThreeDSecureAdditionalInformation;
@@ -72,12 +70,11 @@ public class CardFragment extends BaseFragment implements OnCardFormSubmitListen
     public void onCreate(Bundle onSaveInstanceState) {
         super.onCreate(onSaveInstanceState);
 
-        ClientParams clientParams = new ClientParams(requireContext(), super.getAuthStringArg());
-        americanExpressClient = new AmericanExpressClient(clientParams);
-        cardClient = new CardClient(clientParams);
-        threeDSecureClient = new ThreeDSecureClient(clientParams);
+        americanExpressClient = new AmericanExpressClient(requireContext(), super.getAuthStringArg());
+        cardClient = new CardClient(requireContext(), super.getAuthStringArg());
+        threeDSecureClient = new ThreeDSecureClient(requireContext(), super.getAuthStringArg());
 
-        dataCollector = new DataCollector(clientParams);
+        dataCollector = new DataCollector(requireContext(), super.getAuthStringArg());
 
         if (onSaveInstanceState != null) {
             threeDSecureRequested = onSaveInstanceState.getBoolean(EXTRA_THREE_D_SECURE_REQUESTED);

Demo/src/main/java/com/braintreepayments/demo/GooglePayFragment.java

@@ -12,9 +12,6 @@
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
-import com.braintreepayments.api.GooglePayCapabilities;
 import com.braintreepayments.api.GooglePayClient;
 import com.braintreepayments.api.GooglePayLauncher;
 import com.braintreepayments.api.GooglePayRequest;
@@ -23,8 +20,6 @@
 import com.google.android.gms.wallet.TransactionInfo;
 import com.google.android.gms.wallet.WalletConstants;
 
-import java.util.Objects;
-
 public class GooglePayFragment extends BaseFragment {
 
     private ImageButton googlePayButton;
@@ -40,7 +35,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         googlePayButton = view.findViewById(R.id.google_pay_button);
         googlePayButton.setOnClickListener(this::launchGooglePay);
 
-        googlePayClient = new GooglePayClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        googlePayClient = new GooglePayClient(requireContext(), super.getAuthStringArg());
         googlePayLauncher = new GooglePayLauncher(this,
                 paymentAuthResult -> googlePayClient.tokenize(paymentAuthResult,
                         (paymentMethodNonce, error) -> {

Demo/src/main/java/com/braintreepayments/demo/LocalPaymentFragment.java

@@ -10,8 +10,6 @@
 import androidx.annotation.Nullable;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.LocalPaymentClient;
 import com.braintreepayments.api.LocalPaymentLauncher;
 import com.braintreepayments.api.LocalPaymentNonce;
@@ -32,7 +30,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         Button mIdealButton = view.findViewById(R.id.ideal_button);
         mIdealButton.setOnClickListener(this::launchIdeal);
 
-        localPaymentClient = new LocalPaymentClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        localPaymentClient = new LocalPaymentClient(requireContext(), super.getAuthStringArg());
         localPaymentLauncher = new LocalPaymentLauncher(
                 localPaymentResult -> localPaymentClient.tokenize(requireContext(),
                         localPaymentResult,

Demo/src/main/java/com/braintreepayments/demo/PayPalFragment.java

@@ -14,8 +14,6 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.DataCollector;
 import com.braintreepayments.api.PayPalClient;
 import com.braintreepayments.api.PayPalLauncher;
@@ -43,7 +41,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         billingAgreementButton.setOnClickListener(this::launchBillingAgreement);
         singlePaymentButton.setOnClickListener(this::launchSinglePayment);
 
-        payPalClient = new PayPalClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        payPalClient = new PayPalClient(requireContext(), super.getAuthStringArg());
         payPalLauncher = new PayPalLauncher(
                 paymentAuthResult -> payPalClient.tokenize(
                         paymentAuthResult, (payPalAccountNonce, error) -> {
@@ -76,7 +74,7 @@ private void launchPayPal(boolean isBillingAgreement) {
         FragmentActivity activity = getActivity();
         activity.setProgressBarIndeterminateVisibility(true);
 
-        dataCollector = new DataCollector(new ClientParams(requireContext(), super.getAuthStringArg()));
+        dataCollector = new DataCollector(requireContext(), super.getAuthStringArg());
 
         if (Settings.shouldCollectDeviceData(requireActivity())) {
             dataCollector.collectDeviceData(requireActivity(), (deviceDataResult, error) -> {

Demo/src/main/java/com/braintreepayments/demo/PayPalNativeCheckoutFragment.java

@@ -4,23 +4,20 @@
 import static com.braintreepayments.demo.PayPalNativeCheckoutRequestFactory.createPayPalVaultRequest;
 
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.navigation.fragment.NavHostFragment;
-
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.navigation.fragment.NavHostFragment;
+
 import com.braintreepayments.api.DataCollector;
 import com.braintreepayments.api.PayPalNativeCheckoutAccountNonce;
-import com.braintreepayments.api.PayPalNativeCheckoutListener;
 import com.braintreepayments.api.PayPalNativeCheckoutClient;
+import com.braintreepayments.api.PayPalNativeCheckoutListener;
 import com.braintreepayments.api.PaymentMethodNonce;
 
 public class PayPalNativeCheckoutFragment extends BaseFragment implements PayPalNativeCheckoutListener {
@@ -48,7 +45,7 @@ public View onCreateView(
         launchPayPalNativeCheckoutButton.setOnClickListener(v -> launchPayPalNativeCheckout(false));
         launchPayPalNativeVaultCheckoutButton = view.findViewById(R.id.paypal_native_checkout_vault_launch);
         launchPayPalNativeVaultCheckoutButton.setOnClickListener(v -> launchPayPalNativeCheckout(true));
-        payPalClient = new PayPalNativeCheckoutClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        payPalClient = new PayPalNativeCheckoutClient(requireContext(), super.getAuthStringArg());
         payPalClient.setListener(this);
         return view;
     }
@@ -57,7 +54,7 @@ private void launchPayPalNativeCheckout(boolean isBillingAgreement) {
         FragmentActivity activity = getActivity();
         activity.setProgressBarIndeterminateVisibility(true);
 
-        dataCollector = new DataCollector(new ClientParams(requireContext(), super.getAuthStringArg()));
+        dataCollector = new DataCollector(requireContext(), super.getAuthStringArg());
 
         if (Settings.shouldCollectDeviceData(requireActivity())) {
             dataCollector.collectDeviceData(requireActivity(), (deviceDataResult, error) -> {

Demo/src/main/java/com/braintreepayments/demo/SEPADirectDebitFragment.java

@@ -9,8 +9,6 @@
 import androidx.annotation.NonNull;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.PostalAddress;
 import com.braintreepayments.api.SEPADirectDebitClient;
 import com.braintreepayments.api.SEPADirectDebitLauncher;
@@ -31,7 +29,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         Button button = view.findViewById(R.id.sepa_direct_debit_button);
         button.setOnClickListener(this::launchSEPADirectDebit);
 
-        sepaDirectDebitClient = new SEPADirectDebitClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        sepaDirectDebitClient = new SEPADirectDebitClient(requireContext(), super.getAuthStringArg());
 
         sepaDirectDebitLauncher = new SEPADirectDebitLauncher(sepaDirectDebitBrowserSwitchResult ->
             sepaDirectDebitClient.tokenize(sepaDirectDebitBrowserSwitchResult, (sepaDirectDebitNonce, error) -> {

Demo/src/main/java/com/braintreepayments/demo/SamsungPayFragment.java

@@ -11,13 +11,11 @@
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.SamsungPayClient;
 import com.braintreepayments.api.SamsungPayError;
 import com.braintreepayments.api.SamsungPayException;
-import com.braintreepayments.api.SamsungPayNonce;
 import com.braintreepayments.api.SamsungPayListener;
+import com.braintreepayments.api.SamsungPayNonce;
 import com.samsung.android.sdk.samsungpay.v2.SpaySdk;
 import com.samsung.android.sdk.samsungpay.v2.payment.CardInfo;
 import com.samsung.android.sdk.samsungpay.v2.payment.CustomSheetPaymentInfo;
@@ -45,7 +43,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     @Override
     public void onResume() {
         super.onResume();
-        samsungPayClient = new SamsungPayClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        samsungPayClient = new SamsungPayClient(requireContext(), super.getAuthStringArg());
         setupSamsungPayButton();
     }
 

Demo/src/main/java/com/braintreepayments/demo/VenmoFragment.java

@@ -13,16 +13,15 @@
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.UserCanceledException;
 import com.braintreepayments.api.VenmoAccountNonce;
 import com.braintreepayments.api.VenmoClient;
 import com.braintreepayments.api.VenmoLauncher;
 import com.braintreepayments.api.VenmoLineItem;
 import com.braintreepayments.api.VenmoPaymentAuthRequest;
 import com.braintreepayments.api.VenmoPaymentMethodUsage;
-import com.braintreepayments.api.VenmoResult;
 import com.braintreepayments.api.VenmoRequest;
+import com.braintreepayments.api.VenmoResult;
 
 import java.util.ArrayList;
 
@@ -65,7 +64,7 @@ private void handleVenmoAccountNonce(VenmoAccountNonce venmoAccountNonce) {
     public void launchVenmo(View v) {
         getActivity().setProgressBarIndeterminateVisibility(true);
         if (venmoClient == null) {
-            venmoClient = new VenmoClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+            venmoClient = new VenmoClient(requireContext(), super.getAuthStringArg());
         }
 
         FragmentActivity activity = getActivity();

Demo/src/main/java/com/braintreepayments/demo/VisaCheckoutFragment.java

@@ -9,8 +9,6 @@
 import androidx.annotation.Nullable;
 import androidx.navigation.fragment.NavHostFragment;
 
-import com.braintreepayments.api.BraintreeClient;
-import com.braintreepayments.api.ClientParams;
 import com.braintreepayments.api.PaymentMethodNonce;
 import com.braintreepayments.api.VisaCheckoutClient;
 import com.visa.checkout.CheckoutButton;
@@ -32,7 +30,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         View view = inflater.inflate(R.layout.fragment_visa_checkout, container, false);
         checkoutButton = view.findViewById(R.id.visa_checkout_button);
 
-        visaCheckoutClient = new VisaCheckoutClient(new ClientParams(requireContext(), super.getAuthStringArg()));
+        visaCheckoutClient = new VisaCheckoutClient(requireContext(), super.getAuthStringArg());
         visaCheckoutClient.createProfileBuilder((profileBuilder, error) -> {
             if (profileBuilder != null) {
                 setupVisaCheckoutButton(profileBuilder);

GooglePay/src/main/java/com/braintreepayments/api/GooglePayClient.java

@@ -1,5 +1,6 @@
 package com.braintreepayments.api;
 
+import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.text.TextUtils;
 
@@ -50,8 +51,8 @@ public class GooglePayClient {
      * Initializes a new {@link GooglePayClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public GooglePayClient(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public GooglePayClient(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting

LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentClient.java

@@ -27,8 +27,8 @@ public class LocalPaymentClient {
      * Initializes a new {@link LocalPaymentClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public LocalPaymentClient(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public LocalPaymentClient(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
    @VisibleForTesting

PayPal/src/main/java/com/braintreepayments/api/PayPalClient.java

@@ -25,8 +25,8 @@ public class PayPalClient {
      * Initializes a new {@link PayPalClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public PayPalClient(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public PayPalClient(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting

PayPalNativeCheckout/src/main/java/com/braintreepayments/api/PayPalNativeCheckoutClient.java

@@ -1,5 +1,7 @@
 package com.braintreepayments.api;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
@@ -33,8 +35,8 @@ public class PayPalNativeCheckoutClient {
      * Initializes a new {@link PayPalNativeCheckoutClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public PayPalNativeCheckoutClient(@NonNull ClientParams clientParams) {
-        this(new BraintreeClient(clientParams));
+    public PayPalNativeCheckoutClient(@NonNull Context context, @NonNull String authorization) {
+        this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting

SEPADirectDebit/src/main/java/com/braintreepayments/api/SEPADirectDebitClient.java

@@ -29,8 +29,8 @@ public class SEPADirectDebitClient {
      * Initializes a new {@link SEPADirectDebitClient} instance
      * @param clientParams configurable {@link ClientParams}
      */
-    public SEPADirectDebitClient(@NonNull ClientParams clientParams) {
-       this(new BraintreeClient(clientParams));
+    public SEPADirectDebitClient(@NonNull Context context, @NonNull String authorization) {
+       this(new BraintreeClient(context, authorization));
     }
 
     @VisibleForTesting