Instantiate BraintreeClient Within Clients

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

@@ -3,6 +3,7 @@
 import android.net.Uri;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import org.json.JSONException;
 
@@ -16,7 +17,15 @@ public class AmericanExpressClient {
 
     private final BraintreeClient braintreeClient;
 
-    public AmericanExpressClient(@NonNull BraintreeClient braintreeClient) {
+    /**
+     * Initializes a new {@link AmericanExpressClient} instance
+     * @param clientParams configurable {@link ClientParams}
+     */
+    public AmericanExpressClient(@NonNull ClientParams clientParams) {
+        this.braintreeClient = new BraintreeClient(clientParams);
+    }
+
+    @VisibleForTesting AmericanExpressClient(@NonNull BraintreeClient braintreeClient) {
         this.braintreeClient = braintreeClient;
     }
 

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

@@ -13,6 +13,7 @@ import com.braintreepayments.api.IntegrationType.Integration
  * Core Braintree class that handles network requests.
  */
 @Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 open class BraintreeClient @VisibleForTesting internal constructor(
 
     /**
@@ -63,6 +64,13 @@ 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
      */
@@ -76,6 +84,7 @@ open class BraintreeClient @VisibleForTesting internal constructor(
      * @param authorization The tokenization key or client token to use. If an invalid authorization
      * is provided, a [BraintreeException] will be returned via callback.
      */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     constructor(context: Context, authorization: String) :
             this(BraintreeOptions(context = context, initialAuthString = authorization))
 
@@ -86,6 +95,7 @@ open class BraintreeClient @VisibleForTesting internal constructor(
      * @param clientTokenProvider An implementation of [ClientTokenProvider] that [BraintreeClient]
      * will use to fetch a client token on demand.
      */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     constructor(context: Context, clientTokenProvider: ClientTokenProvider) :
             this(BraintreeOptions(context = context, clientTokenProvider = clientTokenProvider))
 
@@ -104,7 +114,8 @@ open class BraintreeClient @VisibleForTesting internal constructor(
      * authorization is provided, a [BraintreeException] will be returned via callback.
      * @param returnUrlScheme A custom return url to use for browser and app switching
      */
-    constructor (context: Context, authorization: String, returnUrlScheme: String) : this(
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    constructor (context: Context, authorization: String, returnUrlScheme: String?) : this(
         BraintreeOptions(
             context = context,
             initialAuthString = authorization,
@@ -127,6 +138,7 @@ open class BraintreeClient @VisibleForTesting internal constructor(
      * will use to fetch a client token on demand.
      * @param returnUrlScheme     A custom return url to use for browser and app switching
      */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     constructor(
         context: Context,
         clientTokenProvider: ClientTokenProvider,

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

@@ -0,0 +1,10 @@
+package com.braintreepayments.api
+
+import android.content.Context
+
+data class ClientParams(val context: Context,
+                        val authorization: String,
+                        val returnUrlScheme: String?) {
+
+    constructor(context: Context, authorization: String) : this(context, authorization, null)
+}

CHANGELOG.md

@@ -6,6 +6,8 @@
   * All Modules
     * Bump `minSdkVersion` to API 23
     * Bump target Java version to Java 11
+    * Remove `BraintreeClient` public constructors
+    * Add `ClientParams` for instantiating payment method clients
   * UnionPay
     * Remove `union-pay` module
       * UnionPay cards can now be processed as regular cards (through the `card` module) due to their partnership with Discover

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

@@ -17,7 +17,16 @@ public class CardClient {
     private final BraintreeClient braintreeClient;
     private final ApiClient apiClient;
 
-    public CardClient(@NonNull BraintreeClient braintreeClient) {
+    /**
+     * Initializes a new {@link CardClient} instance
+     * @param clientParams configurable {@link ClientParams}
+     */
+    public CardClient(@NonNull ClientParams clientParams) {
+        this(new BraintreeClient(clientParams));
+    }
+
+    @VisibleForTesting
+    CardClient(@NonNull BraintreeClient braintreeClient) {
         this(braintreeClient, new ApiClient(braintreeClient));
     }
 

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

@@ -22,7 +22,16 @@ public class DataCollector {
     private final UUIDHelper uuidHelper;
     private final BraintreeClient braintreeClient;
 
-    public DataCollector(@NonNull BraintreeClient braintreeClient) {
+    /**
+     * Initializes a new {@link DataCollector} instance
+     * @param clientParams configurable {@link ClientParams}
+     */
+    public DataCollector(@NonNull ClientParams clientParams) {
+        this(new BraintreeClient(clientParams));
+    }
+
+    @VisibleForTesting
+    DataCollector(@NonNull BraintreeClient braintreeClient) {
         this(braintreeClient, new MagnesInternalClient(), new UUIDHelper());
     }
 

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

@@ -9,6 +9,8 @@
 import com.braintreepayments.api.BraintreeClient;
 import com.braintreepayments.api.PaymentMethodNonce;
 
+import java.util.Objects;
+
 public abstract class BaseFragment extends Fragment {
 
     @CallSuper
@@ -54,4 +56,15 @@ protected BraintreeClient getBraintreeClient() {
         }
         return null;
     }
+
+    protected void fetchAuthorization(BraintreeAuthorizationCallback callback) {
+        DemoActivity demoActivity = getDemoActivity();
+        if (demoActivity != null) {
+            demoActivity.fetchAuthorization(callback);
+        }
+    }
+
+    String getAuthStringArg() {
+        return Objects.requireNonNull(requireArguments().getString("authString"));
+    }
 }

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

@@ -0,0 +1,10 @@
+package com.braintreepayments.demo;
+
+import androidx.annotation.NonNull;
+
+import com.braintreepayments.api.Authorization;
+import com.braintreepayments.api.BraintreeClient;
+
+public interface BraintreeAuthorizationCallback {
+    void onResult(@NonNull String authString);
+}

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

@@ -7,7 +7,5 @@
 // TODO: remove when AuthorizationProvider is released
 public class BraintreeClientFactory {
 
-    static public BraintreeClient createBraintreeClientWithAuthorizationProvider(Context context) {
-        return new BraintreeClient(context, new DemoClientTokenProvider(context));
-    }
+
 }

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

@@ -21,6 +21,7 @@
 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;
@@ -71,12 +72,12 @@ public class CardFragment extends BaseFragment implements OnCardFormSubmitListen
     public void onCreate(Bundle onSaveInstanceState) {
         super.onCreate(onSaveInstanceState);
 
-        BraintreeClient braintreeClient = getBraintreeClient();
-        americanExpressClient = new AmericanExpressClient(braintreeClient);
-        cardClient = new CardClient(braintreeClient);
-        threeDSecureClient = new ThreeDSecureClient(braintreeClient);
+        ClientParams clientParams = new ClientParams(requireContext(), super.getAuthStringArg());
+        americanExpressClient = new AmericanExpressClient(clientParams);
+        cardClient = new CardClient(clientParams);
+        threeDSecureClient = new ThreeDSecureClient(clientParams);
 
-        dataCollector = new DataCollector(braintreeClient);
+        dataCollector = new DataCollector(clientParams);
 
         if (onSaveInstanceState != null) {
             threeDSecureRequested = onSaveInstanceState.getBoolean(EXTRA_THREE_D_SECURE_REQUESTED);
@@ -126,26 +127,20 @@ public void onSaveInstanceState(Bundle outState) {
 
     private void configureCardForm() {
         final AppCompatActivity activity = (AppCompatActivity) getActivity();
-        BraintreeClient braintreeClient = getBraintreeClient();
-
-        braintreeClient.getConfiguration((configuration, configError) -> {
-            if (configuration != null) {
-                cardForm.cardRequired(true)
-                        .expirationRequired(true)
-                        .cvvRequired(configuration.isCvvChallengePresent())
-                        .postalCodeRequired(configuration.isPostalCodeChallengePresent())
-                        .mobileNumberRequired(false)
-                        .actionLabel(cardFormActionLabel)
-                        .setup(activity);
-
-                if (getArguments().getBoolean(MainFragment.EXTRA_COLLECT_DEVICE_DATA, false)) {
-                    dataCollector.collectDeviceData(activity,
-                            (deviceData, e) -> this.deviceData = deviceData);
-                }
-            } else {
-                handleError(configError);
-            }
-        });
+
+        // TODO: Configure card form via settings
+        cardForm.cardRequired(true)
+                .expirationRequired(true)
+                .cvvRequired(true)
+                .postalCodeRequired(true)
+                .mobileNumberRequired(false)
+                .actionLabel(cardFormActionLabel)
+                .setup(activity);
+
+        if (getArguments().getBoolean(MainFragment.EXTRA_COLLECT_DEVICE_DATA, false)) {
+            dataCollector.collectDeviceData(activity,
+                    (deviceData, e) -> this.deviceData = deviceData);
+        }
     }
 
     @Override

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

@@ -9,6 +9,7 @@
 import android.view.Window;
 import android.widget.ArrayAdapter;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -30,13 +31,16 @@ public class DemoActivity extends AppCompatActivity implements ActivityCompat.On
     private BraintreeClient braintreeClient;
     private AppBarConfiguration appBarConfiguration;
 
+    private DemoClientTokenProvider clientTokenProvider;
+
     private SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.activity_demo);
+        clientTokenProvider = new DemoClientTokenProvider(this);
 
         setupActionBar();
         setProgressBarIndeterminateVisibility(true);
@@ -46,16 +50,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public BraintreeClient getBraintreeClient() {
         // lazily instantiate braintree client in case the demo has been reset
-        if (braintreeClient == null) {
-            if (Settings.useTokenizationKey(this)) {
-                String tokenizationKey = Settings.getTokenizationKey(this);
-                braintreeClient = new BraintreeClient(this, tokenizationKey);
-            } else {
-                braintreeClient =
-                    BraintreeClientFactory.createBraintreeClientWithAuthorizationProvider(this);
-            }
-        }
-        return braintreeClient;
+        return null;
+    }
+
+    public void fetchAuthorization(BraintreeAuthorizationCallback callback) {
+        clientTokenProvider.getClientToken(callback);
     }
 
     @Override

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

@@ -11,7 +11,7 @@
 import com.braintreepayments.demo.R;
 import com.braintreepayments.demo.Settings;
 
-public class DemoClientTokenProvider implements ClientTokenProvider {
+public class DemoClientTokenProvider  {
 
     private final Merchant merchant;
     private final Context appContext;
@@ -21,15 +21,14 @@ public DemoClientTokenProvider(Context context) {
         appContext = context.getApplicationContext();
     }
 
-    @Override
-    public void getClientToken(@NonNull ClientTokenCallback callback) {
+    public void getClientToken(@NonNull BraintreeAuthorizationCallback callback) {
         String authType = Settings.getAuthorizationType(appContext);
         if (authType.equals(getString(appContext, R.string.client_token))) {
             merchant.fetchClientToken(appContext, (clientToken, error) -> {
                 if (clientToken != null) {
-                    callback.onSuccess(clientToken);
+                    callback.onResult(clientToken);
                 } else if (error != null) {
-                    callback.onFailure(error);
+                    callback.onResult(null);
                 }
             });
         }

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

@@ -13,6 +13,7 @@
 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;
@@ -22,10 +23,11 @@
 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;
-    private BraintreeClient braintreeClient;
     private GooglePayClient googlePayClient;
     private GooglePayLauncher googlePayLauncher;
 
@@ -38,8 +40,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         googlePayButton = view.findViewById(R.id.google_pay_button);
         googlePayButton.setOnClickListener(this::launchGooglePay);
 
-        braintreeClient = getBraintreeClient();
-        googlePayClient = new GooglePayClient(braintreeClient);
+        googlePayClient = new GooglePayClient(new ClientParams(requireContext(), super.getAuthStringArg()));
         googlePayLauncher = new GooglePayLauncher(this,
                 paymentAuthResult -> googlePayClient.tokenize(paymentAuthResult,
                         (paymentMethodNonce, error) -> {
@@ -57,27 +58,13 @@ public View onCreateView(@NonNull LayoutInflater inflater,
     public void onResume() {
         super.onResume();
 
-        braintreeClient.getConfiguration((configuration, error) -> {
-            if (configuration == null) {
-                return;
-            }
-
-            if (GooglePayCapabilities.isGooglePayEnabled(requireActivity(), configuration)) {
-
-                googlePayClient.isReadyToPay(requireActivity(), (isReadyToPay, e) -> {
-                    if (isReadyToPay) {
-                        googlePayButton.setVisibility(View.VISIBLE);
-                    } else {
-                        showDialog(
-                                "Google Payments are not available. The following issues could be the cause:\n\n" +
-                                        "No user is logged in to the device.\n\n" +
-                                        "Google Play Services is missing or out of date.");
-                    }
-                });
+        googlePayClient.isReadyToPay(requireActivity(), (isReadyToPay, e) -> {
+            if (isReadyToPay) {
+                googlePayButton.setVisibility(View.VISIBLE);
             } else {
                 showDialog(
                         "Google Payments are not available. The following issues could be the cause:\n\n" +
-                                "Google Payments are not enabled for the current merchant.\n\n" +
+                                "No user is logged in to the device.\n\n" +
                                 "Google Play Services is missing or out of date.");
             }
         });