Payment Method Support

stripe/AndroidManifest.xml

@@ -7,7 +7,7 @@
 
     <application>
         <activity
-            android:name=".view.AddSourceActivity"
+            android:name=".view.AddPaymentMethodActivity"
             android:theme="@style/StripeDefaultTheme"
             android:windowSoftInputMode="stateVisible" />
 

stripe/src/androidTest/java/com/stripe/android/AddSourceActivityTest.java → stripe/src/androidTest/java/com/stripe/android/AddPaymentMethodActivityTest.java

@@ -2,7 +2,7 @@
 
 import android.support.test.runner.AndroidJUnit4;
 
-import com.stripe.android.view.AddSourceActivity;
+import com.stripe.android.view.AddPaymentMethodActivity;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -14,11 +14,11 @@
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 @RunWith(AndroidJUnit4.class)
-public class AddSourceActivityTest {
+public class AddPaymentMethodActivityTest {
 
     @Rule
-    public ActivityTestRule<AddSourceActivity> mActivityRule =
-            new ActivityTestRule(AddSourceActivity.class);
+    public ActivityTestRule<AddPaymentMethodActivity> mActivityRule =
+            new ActivityTestRule(AddPaymentMethodActivity.class);
 
     @Test
     public void titleRenders() {

stripe/src/main/java/com/stripe/android/CustomerSession.java

@@ -19,6 +19,9 @@
 import com.stripe.android.model.PaymentMethod;
 import com.stripe.android.model.ShippingInformation;
 import com.stripe.android.model.Source;
+import com.stripe.android.view.AddPaymentMethodActivity;
+import com.stripe.android.view.PaymentFlowActivity;
+import com.stripe.android.view.PaymentMethodsActivity;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -57,14 +60,16 @@ public class CustomerSession {
     private static final String KEY_SOURCE = "source";
     private static final String KEY_SOURCE_TYPE = "source_type";
     private static final String KEY_SHIPPING_INFO = "shipping_info";
-    private static final String TOKEN_PAYMENT_SESSION = "PaymentSession";
+
     private static final Set<String> VALID_TOKENS =
-            new HashSet<>(Arrays.asList("AddSourceActivity",
-                    "PaymentMethodsActivity",
-                    "PaymentFlowActivity",
-                    TOKEN_PAYMENT_SESSION,
-                    "ShippingInfoScreen",
-                    "ShippingMethodScreen"));
+            new HashSet<>(Arrays.asList(
+                    AddPaymentMethodActivity.TOKEN_ADD_PAYMENT_METHOD_ACTIVITY,
+                    PaymentMethodsActivity.TOKEN_PAYMENT_METHODS_ACTIVITY,
+                    PaymentFlowActivity.TOKEN_PAYMENT_FLOW_ACTIVITY,
+                    PaymentSession.TOKEN_PAYMENT_SESSION,
+                    PaymentFlowActivity.TOKEN_SHIPPING_INFO_SCREEN,
+                    PaymentFlowActivity.TOKEN_SHIPPING_METHOD_SCREEN
+            ));
 
     @IntDef({
             MessageCode.ERROR,
@@ -401,8 +406,8 @@ public void detachPaymentMethod(
     /**
      * Gets a Customer's PaymentMethods
      */
-    void getPaymentMethods(@NonNull PaymentMethod.Type paymentMethodType,
-                           @NonNull PaymentMethodsRetrievalListener listener) {
+    public void getPaymentMethods(@NonNull PaymentMethod.Type paymentMethodType,
+                                  @NonNull PaymentMethodsRetrievalListener listener) {
         final Map<String, String> arguments = new HashMap<>();
         arguments.put(KEY_PAYMENT_METHOD_TYPE, paymentMethodType.code);
 
@@ -918,6 +923,24 @@ protected A getActivity() {
         }
     }
 
+    /**
+     * Abstract implementation of {@link PaymentMethodsRetrievalListener} that holds a
+     * {@link WeakReference} to an {@link Activity} object.
+     */
+    public abstract static class ActivityPaymentMethodsRetrievalListener<A extends Activity>
+            implements PaymentMethodsRetrievalListener {
+        @NonNull private final WeakReference<A> mActivityRef;
+
+        public ActivityPaymentMethodsRetrievalListener(@NonNull A activity) {
+            this.mActivityRef = new WeakReference<>(activity);
+        }
+
+        @Nullable
+        protected A getActivity() {
+            return mActivityRef.get();
+        }
+    }
+
     private abstract static class CustomerSessionRunnable<T> implements Runnable {
         @NonNull private final Handler mUiThreadHandler;
         @NonNull private final LocalBroadcastManager mLocalBroadcastManager;

stripe/src/main/java/com/stripe/android/PaymentMethodCallback.java

@@ -0,0 +1,25 @@
+package com.stripe.android;
+
+import android.support.annotation.NonNull;
+
+import com.stripe.android.model.PaymentMethod;
+
+/**
+ * An interface representing a callback to be notified about the results of
+ * {@link PaymentMethod} creation.
+ */
+public interface PaymentMethodCallback {
+    /**
+     * Error callback method.
+     *
+     * @param error the error that occurred.
+     */
+    void onError(@NonNull Exception error);
+
+    /**
+     * Success callback method.
+     *
+     * @param paymentMethod the {@link PaymentMethod} that was found or created.
+     */
+    void onSuccess(@NonNull PaymentMethod paymentMethod);
+}

stripe/src/main/java/com/stripe/android/Stripe.java

@@ -40,20 +40,6 @@
  */
 public class Stripe {
 
-    @NonNull
-    private final SourceCreator mSourceCreator = new SourceCreator() {
-        @Override
-        public void create(
-                @NonNull final SourceParams sourceParams,
-                @NonNull final String publishableKey,
-                @Nullable final String stripeAccount,
-                @Nullable Executor executor,
-                @NonNull final SourceCallback sourceCallback) {
-            executeTask(executor, new CreateSourceTask(mApiHandler, sourceParams,
-                    publishableKey, stripeAccount, sourceCallback));
-        }
-    };
-
     @VisibleForTesting
     TokenCreator mTokenCreator = new TokenCreator() {
         @Override
@@ -307,7 +293,43 @@ public void createSource(
         if (apiKey == null) {
             return;
         }
-        mSourceCreator.create(sourceParams, apiKey, mStripeAccount, executor, callback);
+        executeTask(executor,
+                new CreateSourceTask(mApiHandler, sourceParams, publishableKey, mStripeAccount,
+                        callback));
+    }
+
+    /**
+     * Create a {@link PaymentMethod} using an {@link AsyncTask} on the default {@link Executor}
+     * with a publishable api key that has already been set on this {@link Stripe} instance.
+     *
+     * @param paymentMethodCreateParams the {@link PaymentMethodCreateParams} to be used
+     * @param callback a {@link PaymentMethodCallback} to receive a result or an error message
+     */
+    public void createPaymentMethod(@NonNull PaymentMethodCreateParams paymentMethodCreateParams,
+                                    @NonNull PaymentMethodCallback callback) {
+        createPaymentMethod(paymentMethodCreateParams, callback, null, null);
+    }
+
+    /**
+     * Create a {@link PaymentMethod} using an {@link AsyncTask}.
+     *
+     * @param paymentMethodCreateParams the {@link PaymentMethodCreateParams} to be used
+     * @param callback a {@link PaymentMethodCallback} to receive a result or an error message
+     * @param publishableKey the publishable api key to be used
+     * @param executor an {@link Executor} on which to execute the task, or {@link null} for default
+     */
+    public void createPaymentMethod(
+            @NonNull PaymentMethodCreateParams paymentMethodCreateParams,
+            @NonNull PaymentMethodCallback callback,
+            @Nullable String publishableKey,
+            @Nullable Executor executor) {
+        final String apiKey = publishableKey == null ? mDefaultPublishableKey : publishableKey;
+        if (apiKey == null) {
+            return;
+        }
+
+        executeTask(executor, new CreatePaymentMethodTask(mApiHandler, paymentMethodCreateParams,
+                apiKey, mStripeAccount, callback));
     }
 
     /**
@@ -878,47 +900,29 @@ private void validateKey(@NonNull @Size(min = 1) String publishableKey) {
     }
 
     private void executeTask(@Nullable Executor executor,
-                             @NonNull AsyncTask<Void, Void, ResponseWrapper> task) {
+                             @NonNull AsyncTask<Void, Void, ?> task) {
         if (executor != null) {
             task.executeOnExecutor(executor);
         } else {
             task.execute();
         }
     }
 
-    private static class ResponseWrapper {
-        @Nullable final Source source;
-        @Nullable final Token token;
+    private static class ResponseWrapper<T> {
+        @Nullable final T result;
         @Nullable final Exception error;
 
-        private ResponseWrapper(@Nullable Token token) {
-            this.token = token;
-            this.source = null;
-            this.error = null;
-        }
-
-        private ResponseWrapper(@Nullable Source source) {
-            this.source = source;
+        private ResponseWrapper(@Nullable T result) {
+            this.result = result;
             this.error = null;
-            this.token = null;
         }
 
         private ResponseWrapper(@NonNull Exception error) {
             this.error = error;
-            this.source = null;
-            this.token = null;
+            this.result = null;
         }
     }
 
-    interface SourceCreator {
-        void create(
-                @NonNull SourceParams params,
-                @NonNull String publishableKey,
-                @Nullable String stripeAccount,
-                @Nullable Executor executor,
-                @NonNull SourceCallback sourceCallback);
-    }
-
     @VisibleForTesting
     interface TokenCreator {
         void create(Map<String, Object> params,
@@ -929,7 +933,7 @@ void create(Map<String, Object> params,
                     TokenCallback callback);
     }
 
-    private static class CreateSourceTask extends AsyncTask<Void, Void, ResponseWrapper> {
+    private static class CreateSourceTask extends AsyncTask<Void, Void, ResponseWrapper<Source>> {
         @NonNull private final StripeApiHandler mApiHandler;
         @NonNull private final SourceParams mSourceParams;
         @NonNull private final String mPublishableKey;
@@ -949,30 +953,74 @@ private static class CreateSourceTask extends AsyncTask<Void, Void, ResponseWrap
         }
 
         @Override
-        protected ResponseWrapper doInBackground(Void... params) {
+        protected ResponseWrapper<Source> doInBackground(Void... params) {
             try {
                 final Source source = mApiHandler.createSource(
                         mSourceParams,
                         mPublishableKey,
                         mStripeAccount
                 );
-                return new ResponseWrapper(source);
+                return new ResponseWrapper<>(source);
             } catch (StripeException stripeException) {
-                return new ResponseWrapper(stripeException);
+                return new ResponseWrapper<>(stripeException);
             }
         }
 
         @Override
-        protected void onPostExecute(@NonNull ResponseWrapper responseWrapper) {
-            if (responseWrapper.source != null) {
-                mSourceCallback.onSuccess(responseWrapper.source);
+        protected void onPostExecute(@NonNull ResponseWrapper<Source> responseWrapper) {
+            if (responseWrapper.result != null) {
+                mSourceCallback.onSuccess(responseWrapper.result);
             } else if (responseWrapper.error != null) {
                 mSourceCallback.onError(responseWrapper.error);
             }
         }
     }
 
-    private static class CreateTokenTask extends AsyncTask<Void, Void, ResponseWrapper> {
+    private static class CreatePaymentMethodTask extends AsyncTask<Void, Void,
+            ResponseWrapper<PaymentMethod>> {
+        @NonNull private final StripeApiHandler mApiHandler;
+        @NonNull private final PaymentMethodCreateParams mPaymentMethodCreateParams;
+        @NonNull private final String mPublishableKey;
+        @Nullable private final String mStripeAccount;
+        @NonNull private final PaymentMethodCallback mPaymentMethodCallback;
+
+        CreatePaymentMethodTask(@NonNull StripeApiHandler apiHandler,
+                                @NonNull PaymentMethodCreateParams paymentMethodCreateParams,
+                                @NonNull String publishableKey,
+                                @Nullable String stripeAccount,
+                                @NonNull PaymentMethodCallback paymentMethodCallback) {
+            mApiHandler = apiHandler;
+            mPaymentMethodCreateParams = paymentMethodCreateParams;
+            mPublishableKey = publishableKey;
+            mStripeAccount = stripeAccount;
+            mPaymentMethodCallback = paymentMethodCallback;
+        }
+
+        @Override
+        protected ResponseWrapper<PaymentMethod> doInBackground(Void... params) {
+            try {
+                final PaymentMethod paymentMethod = mApiHandler.createPaymentMethod(
+                        mPaymentMethodCreateParams,
+                        mPublishableKey,
+                        mStripeAccount
+                );
+                return new ResponseWrapper<>(paymentMethod);
+            } catch (StripeException stripeException) {
+                return new ResponseWrapper<>(stripeException);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(@NonNull ResponseWrapper<PaymentMethod> responseWrapper) {
+            if (responseWrapper.result != null) {
+                mPaymentMethodCallback.onSuccess(responseWrapper.result);
+            } else if (responseWrapper.error != null) {
+                mPaymentMethodCallback.onError(responseWrapper.error);
+            }
+        }
+    }
+
+    private static class CreateTokenTask extends AsyncTask<Void, Void, ResponseWrapper<Token>> {
         @NonNull private final StripeApiHandler mApiHandler;
         @NonNull private final Map<String, Object> mTokenParams;
         @NonNull private final String mPublishableKey;
@@ -996,7 +1044,7 @@ private static class CreateTokenTask extends AsyncTask<Void, Void, ResponseWrapp
         }
 
         @Override
-        protected ResponseWrapper doInBackground(Void... params) {
+        protected ResponseWrapper<Token> doInBackground(Void... params) {
             try {
                 final RequestOptions requestOptions = RequestOptions.builder(mPublishableKey,
                         mStripeAccount, RequestOptions.TYPE_QUERY).build();
@@ -1005,22 +1053,18 @@ protected ResponseWrapper doInBackground(Void... params) {
                         requestOptions,
                         mTokenType
                 );
-                return new ResponseWrapper(token);
+                return new ResponseWrapper<>(token);
             } catch (StripeException e) {
-                return new ResponseWrapper(e);
+                return new ResponseWrapper<>(e);
             }
         }
 
         @Override
-        protected void onPostExecute(@NonNull ResponseWrapper result) {
-            tokenTaskPostExecution(result);
-        }
-
-        private void tokenTaskPostExecution(@NonNull ResponseWrapper result) {
-            if (result.token != null) {
-                mCallback.onSuccess(result.token);
-            } else if (result.error != null) {
-                mCallback.onError(result.error);
+        protected void onPostExecute(@NonNull ResponseWrapper<Token> response) {
+            if (response.result != null) {
+                mCallback.onSuccess(response.result);
+            } else if (response.error != null) {
+                mCallback.onError(response.error);
             } else {
                 mCallback.onError(new RuntimeException(
                         "Somehow got neither a token response or an error response"));