From 76df1802b1597b3ae435102b3a803c60d8bea336 Mon Sep 17 00:00:00 2001
From: Michael Shafrir <mshafrir@stripe.com>
Date: Fri, 2 Aug 2019 00:20:57 -0400
Subject: [PATCH] Add Fragment support to payment confirmation/authentication
 flow

- Create `AuthActivityStarter.Host` class that represents an object
  that has `startActivityForResult`

- Updated fragments example to demonstrate starting payment auth
  flow from a fragment and receiving the result
---
 example/AndroidManifest.xml                   |   2 +-
 example/build.gradle                          |   2 +-
 ...ayout.xml => fragments_example_layout.xml} |   2 +-
 .../launch_payment_session_fragment.xml       |  26 ++
 example/res/values/strings.xml                |   5 +-
 .../activity/FragmentExampesActivity.java     | 317 ++++++++++++++++++
 .../example/activity/LauncherActivity.java    |   4 +-
 .../PaymentSessionFromFragmentActivity.java   | 164 ---------
 .../android/PaymentAuthWebViewStarter.java    |  25 +-
 .../com/stripe/android/PaymentController.java | 121 ++++---
 .../stripe/android/PaymentRelayStarter.java   |  19 +-
 .../main/java/com/stripe/android/Stripe.java  | 134 +++++++-
 .../android/Stripe3ds2CompletionStarter.java  |  26 +-
 .../android/view/AuthActivityStarter.java     |  54 +++
 .../PaymentAuthWebViewStarterTest.java        |   8 +-
 .../stripe/android/PaymentControllerTest.java |  32 +-
 .../android/PaymentRelayStarterTest.java      |   4 +-
 .../Stripe3ds2CompletionStarterTest.java      |   4 +-
 .../stripe/android/StripePaymentAuthTest.java |  27 +-
 19 files changed, 665 insertions(+), 311 deletions(-)
 rename example/res/layout/{payment_session_from_fragment_layout.xml => fragments_example_layout.xml} (100%)
 create mode 100644 example/src/main/java/com/stripe/example/activity/FragmentExampesActivity.java
 delete mode 100644 example/src/main/java/com/stripe/example/activity/PaymentSessionFromFragmentActivity.java

diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
index 27a56cd534e..504172e2445 100644
--- a/example/AndroidManifest.xml
+++ b/example/AndroidManifest.xml
@@ -97,7 +97,7 @@
             android:name=".activity.PaymentAuthActivity" />
 
         <activity
-            android:name=".activity.PaymentSessionFromFragmentActivity" />
+            android:name=".activity.FragmentExampesActivity" />
     </application>
 
 </manifest>
diff --git a/example/build.gradle b/example/build.gradle
index a44deee3802..4c5d1ad791a 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -65,7 +65,7 @@ android {
 
     buildTypes {
         debug {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
diff --git a/example/res/layout/payment_session_from_fragment_layout.xml b/example/res/layout/fragments_example_layout.xml
similarity index 100%
rename from example/res/layout/payment_session_from_fragment_layout.xml
rename to example/res/layout/fragments_example_layout.xml
index 11cc4d62dc5..55e21ba1c4f 100644
--- a/example/res/layout/payment_session_from_fragment_layout.xml
+++ b/example/res/layout/fragments_example_layout.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -9,5 +10,4 @@
     android:orientation="vertical"
     android:id="@+id/root">
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/example/res/layout/launch_payment_session_fragment.xml b/example/res/layout/launch_payment_session_fragment.xml
index 43314fb4f6a..3aeac8315f8 100644
--- a/example/res/layout/launch_payment_session_fragment.xml
+++ b/example/res/layout/launch_payment_session_fragment.xml
@@ -9,6 +9,15 @@
     android:orientation="vertical"
     android:id="@+id/root">
 
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="invisible"
+        style="?android:attr/progressBarStyleHorizontal"
+        />
+
     <Button
         android:id="@+id/launch_payment_session"
         android:enabled="false"
@@ -19,4 +28,21 @@
         android:text="@string/payment_session_select_payment"
         />
 
+    <Button
+        android:id="@+id/launch_payment_auth"
+        android:enabled="true"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/example_vertical_spacing"
+        android:text="@string/launch_payment_auth"
+        />
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:typeface="monospace"
+        android:layout_marginTop="40dp"/>
+
 </LinearLayout>
diff --git a/example/res/values/strings.xml b/example/res/values/strings.xml
index 503fd9ca6b2..9a71e1ecf28 100644
--- a/example/res/values/strings.xml
+++ b/example/res/values/strings.xml
@@ -23,7 +23,7 @@
     <string name="launch_customer_session">Customer Session</string>
     <string name="launch_pay_with_google">Pay with Google</string>
     <string name="launch_payment_session">Payment Session</string>
-    <string name="launch_payment_session_from_fragment">Payment Session from Fragment</string>
+    <string name="launch_payment_session_from_fragment">Fragment Examples</string>
     <string name="pollingSource">Polling for source changes&#8230;</string>
     <string name="save">Save</string>
     <string name="saverx">Save Rx</string>
@@ -91,7 +91,8 @@
     <string name="pay_with_google">Pay with Google</string>
 
     <!-- Payment Auth example -->
-    <string name="launch_payment_auth_example">Payment Auth Example</string>
+    <string name="payment_auth_example">Payment Auth Example</string>
+    <string name="launch_payment_auth">Launch Payment Auth Flow</string>
     <string name="buy">Buy!</string>
     <string name="setup">Buy in the Future!</string>
     <string name="payment_intent_status">PaymentIntent status: %s</string>
diff --git a/example/src/main/java/com/stripe/example/activity/FragmentExampesActivity.java b/example/src/main/java/com/stripe/example/activity/FragmentExampesActivity.java
new file mode 100644
index 00000000000..287b1f94780
--- /dev/null
+++ b/example/src/main/java/com/stripe/example/activity/FragmentExampesActivity.java
@@ -0,0 +1,317 @@
+package com.stripe.example.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.stripe.android.ApiResultCallback;
+import com.stripe.android.CustomerSession;
+import com.stripe.android.PaymentConfiguration;
+import com.stripe.android.PaymentIntentResult;
+import com.stripe.android.PaymentSession;
+import com.stripe.android.PaymentSessionConfig;
+import com.stripe.android.PaymentSessionData;
+import com.stripe.android.Stripe;
+import com.stripe.android.StripeError;
+import com.stripe.android.model.ConfirmPaymentIntentParams;
+import com.stripe.android.model.Customer;
+import com.stripe.android.model.PaymentIntent;
+import com.stripe.android.view.ShippingInfoWidget;
+import com.stripe.example.R;
+import com.stripe.example.module.RetrofitFactory;
+import com.stripe.example.service.ExampleEphemeralKeyProvider;
+import com.stripe.example.service.StripeService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+import okhttp3.ResponseBody;
+
+public class FragmentExampesActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.fragments_example_layout);
+
+        setTitle(R.string.launch_payment_session_from_fragment);
+
+        final Fragment newFragment = new LauncherFragment();
+
+        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.add(R.id.root, newFragment, LauncherFragment.class.getSimpleName())
+                .commit();
+    }
+
+    public static class LauncherFragment extends Fragment {
+        private static final String PAYMENT_METHOD_3DS2_REQUIRED = "pm_card_threeDSecure2Required";
+        private static final String RETURN_URL = "stripe://payment_auth";
+
+        @NonNull
+        private final CompositeDisposable mCompositeSubscription = new CompositeDisposable();
+
+        private Stripe mStripe;
+        private PaymentSession mPaymentSession;
+        private StripeService mStripeService;
+
+        private ProgressBar mProgressBar;
+        private Button mLaunchPaymentSessionButton;
+        private Button mLaunchPaymentAuthButton;
+        private TextView mStatusTextView;
+
+        @Override
+        public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+
+            mStripeService = RetrofitFactory.getInstance().create(StripeService.class);
+            mStripe = new Stripe(requireContext(),
+                    PaymentConfiguration.getInstance().getPublishableKey());
+            mPaymentSession = createPaymentSession(createCustomerSession());
+
+            final View rootView = Objects.requireNonNull(getView());
+            mStatusTextView = rootView.findViewById(R.id.status);
+            mProgressBar = rootView.findViewById(R.id.progress_bar);
+
+            mLaunchPaymentSessionButton = rootView.findViewById(R.id.launch_payment_session);
+            mLaunchPaymentSessionButton.setOnClickListener((l) ->
+                    mPaymentSession.presentPaymentMethodSelection());
+
+            mLaunchPaymentAuthButton = rootView.findViewById(R.id.launch_payment_auth);
+            mLaunchPaymentAuthButton.setOnClickListener((l) -> createPaymentIntent());
+        }
+
+        @Nullable
+        @Override
+        public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                                 @Nullable Bundle savedInstanceState) {
+            return getLayoutInflater().inflate(R.layout.launch_payment_session_fragment, null);
+        }
+
+        @Override
+        public void onPause() {
+            mProgressBar.setVisibility(View.INVISIBLE);
+            super.onPause();
+        }
+
+        @Override
+        public void onDestroy() {
+            mCompositeSubscription.dispose();
+            super.onDestroy();
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            super.onActivityResult(requestCode, resultCode, data);
+
+            mProgressBar.setVisibility(View.VISIBLE);
+
+            final boolean isPaymentSessionResult =
+                    mPaymentSession.handlePaymentData(requestCode, resultCode, data);
+            if (isPaymentSessionResult) {
+                Toast.makeText(
+                        requireActivity(),
+                        "Received PaymentSession result",
+                        Toast.LENGTH_SHORT)
+                        .show();
+                return;
+            }
+
+            final boolean isPaymentResult = mStripe.onPaymentResult(requestCode, data,
+                    new AuthResultListener(this));
+        }
+
+        private void createPaymentIntent() {
+            mCompositeSubscription.add(
+                    mStripeService.createPaymentIntent(createPaymentIntentParams())
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .doOnSubscribe((d) -> {
+                                mProgressBar.setVisibility(View.VISIBLE);
+                                mLaunchPaymentAuthButton.setEnabled(false);
+                                mStatusTextView.setText(R.string.creating_payment_intent);
+                            })
+                            .subscribe(this::handleCreatePaymentIntentResponse));
+        }
+
+        private void onAuthComplete() {
+            mLaunchPaymentAuthButton.setEnabled(true);
+            mProgressBar.setVisibility(View.INVISIBLE);
+        }
+
+        private void handleCreatePaymentIntentResponse(@NonNull ResponseBody responseBody) {
+            try {
+                final JSONObject responseData = new JSONObject(responseBody.string());
+                mStatusTextView.append("\n\n" +
+                        getString(R.string.payment_intent_status,
+                                responseData.getString("status")));
+                final String secret = responseData.getString("secret");
+                confirmPaymentIntent(secret);
+            } catch (IOException | JSONException e) {
+                e.printStackTrace();
+            }
+        }
+
+        @NonNull
+        private Map<String, Object> createPaymentIntentParams() {
+            final Map<String, Object> params = new HashMap<>();
+            params.put("payment_method_types[]", "card");
+            params.put("amount", 1000);
+            params.put("currency", "usd");
+            return params;
+        }
+
+        private void confirmPaymentIntent(@NonNull String paymentIntentClientSecret) {
+            mStatusTextView.append("\n\nStarting payment authentication");
+            mStripe.confirmPayment(this,
+                    ConfirmPaymentIntentParams.createWithPaymentMethodId(
+                            PAYMENT_METHOD_3DS2_REQUIRED,
+                            paymentIntentClientSecret,
+                            RETURN_URL));
+        }
+
+        @NonNull
+        private PaymentSession createPaymentSession(
+                @NonNull final CustomerSession customerSession) {
+            final PaymentSession paymentSession = new PaymentSession(this);
+            final boolean paymentSessionInitialized = paymentSession.init(
+                    new PaymentSession.PaymentSessionListener() {
+                        @Override
+                        public void onCommunicatingStateChanged(boolean isCommunicating) {
+
+                        }
+
+                        @Override
+                        public void onError(int errorCode, @NonNull String errorMessage) {
+
+                        }
+
+                        @Override
+                        public void onPaymentSessionDataChanged(@NonNull PaymentSessionData data) {
+                            customerSession.retrieveCurrentCustomer(
+                                    new CustomerSession.CustomerRetrievalListener() {
+                                        @Override
+                                        public void onCustomerRetrieved(
+                                                @NonNull Customer customer) {
+                                            mLaunchPaymentSessionButton.setEnabled(true);
+                                        }
+
+                                        @Override
+                                        public void onError(int errorCode,
+                                                            @NonNull String errorMessage,
+                                                            @Nullable StripeError stripeError) {
+
+                                        }
+                                    });
+                        }
+                    },
+                    new PaymentSessionConfig.Builder()
+                            .setHiddenShippingInfoFields(
+                                    ShippingInfoWidget.CustomizableShippingField.PHONE_FIELD,
+                                    ShippingInfoWidget.CustomizableShippingField.CITY_FIELD
+                            )
+                            .build());
+            if (paymentSessionInitialized) {
+                paymentSession.setCartTotal(2000L);
+            }
+
+            return paymentSession;
+        }
+
+        @NonNull
+        private CustomerSession createCustomerSession() {
+            CustomerSession.initCustomerSession(requireContext(),
+                    new ExampleEphemeralKeyProvider(new ProgressListenerImpl(requireActivity())));
+            final CustomerSession customerSession = CustomerSession.getInstance();
+            customerSession.retrieveCurrentCustomer(
+                    new CustomerSession.CustomerRetrievalListener() {
+                        @Override
+                        public void onCustomerRetrieved(@NonNull Customer customer) {
+
+                        }
+
+                        @Override
+                        public void onError(int errorCode, @NonNull String errorMessage,
+                                            @Nullable StripeError stripeError) {
+
+                        }
+                    }
+            );
+            return customerSession;
+        }
+
+
+        private static final class ProgressListenerImpl
+                implements ExampleEphemeralKeyProvider.ProgressListener {
+            @NonNull private final WeakReference<Activity> mActivityRef;
+
+            private ProgressListenerImpl(@NonNull Activity activity) {
+                mActivityRef = new WeakReference<>(activity);
+            }
+
+            @Override
+            public void onStringResponse(@NonNull String response) {
+                final Activity activity = mActivityRef.get();
+                if (activity != null && response.startsWith("Error: ")) {
+                    Toast.makeText(activity, response, Toast.LENGTH_LONG).show();
+                }
+            }
+        }
+
+
+        private static class AuthResultListener implements ApiResultCallback<PaymentIntentResult> {
+            @NonNull private final WeakReference<LauncherFragment> mFragmentRef;
+
+            private AuthResultListener(@NonNull LauncherFragment fragment) {
+                this.mFragmentRef = new WeakReference<>(fragment);
+            }
+
+            @Override
+            public void onSuccess(@NonNull PaymentIntentResult paymentIntentResult) {
+                final LauncherFragment fragment = mFragmentRef.get();
+                if (fragment == null) {
+                    return;
+                }
+
+                final PaymentIntent paymentIntent = paymentIntentResult.getIntent();
+                fragment.mStatusTextView.append("\n\n" +
+                        "Auth status: " + paymentIntentResult.getStatus() + "\n\n" +
+                        fragment.getString(R.string.payment_intent_status,
+                                paymentIntent.getStatus()));
+                fragment.onAuthComplete();
+            }
+
+            @Override
+            public void onError(@NonNull Exception e) {
+                final LauncherFragment fragment = mFragmentRef.get();
+                if (fragment == null) {
+                    return;
+                }
+
+                fragment.mStatusTextView.append("\n\nException: " + e.getMessage());
+                fragment.onAuthComplete();
+            }
+        }
+    }
+}
diff --git a/example/src/main/java/com/stripe/example/activity/LauncherActivity.java b/example/src/main/java/com/stripe/example/activity/LauncherActivity.java
index 276a46d481f..57eb8ecfcb6 100644
--- a/example/src/main/java/com/stripe/example/activity/LauncherActivity.java
+++ b/example/src/main/java/com/stripe/example/activity/LauncherActivity.java
@@ -55,7 +55,7 @@ private ExamplesAdapter(@NonNull Activity activity) {
                             PaymentIntentActivity.class),
                     new Item(activity.getString(R.string.launch_setup_intent_example),
                             SetupIntentActivity.class),
-                    new Item(activity.getString(R.string.launch_payment_auth_example),
+                    new Item(activity.getString(R.string.payment_auth_example),
                             PaymentAuthActivity.class),
                     new Item(activity.getString(R.string.create_card_tokens),
                             PaymentActivity.class),
@@ -68,7 +68,7 @@ private ExamplesAdapter(@NonNull Activity activity) {
                     new Item(activity.getString(R.string.launch_payment_session),
                             PaymentSessionActivity.class),
                     new Item(activity.getString(R.string.launch_payment_session_from_fragment),
-                            PaymentSessionFromFragmentActivity.class),
+                            FragmentExampesActivity.class),
                     new Item(activity.getString(R.string.launch_pay_with_google),
                             PayWithGoogleActivity.class)
             ));
diff --git a/example/src/main/java/com/stripe/example/activity/PaymentSessionFromFragmentActivity.java b/example/src/main/java/com/stripe/example/activity/PaymentSessionFromFragmentActivity.java
deleted file mode 100644
index eb51029406f..00000000000
--- a/example/src/main/java/com/stripe/example/activity/PaymentSessionFromFragmentActivity.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.stripe.example.activity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.stripe.android.CustomerSession;
-import com.stripe.android.PaymentSession;
-import com.stripe.android.PaymentSessionConfig;
-import com.stripe.android.PaymentSessionData;
-import com.stripe.android.StripeError;
-import com.stripe.android.model.Customer;
-import com.stripe.android.view.ShippingInfoWidget;
-import com.stripe.example.R;
-import com.stripe.example.service.ExampleEphemeralKeyProvider;
-
-import java.lang.ref.WeakReference;
-import java.util.Objects;
-
-public class PaymentSessionFromFragmentActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.payment_session_from_fragment_layout);
-
-        setTitle(R.string.launch_payment_session_from_fragment);
-
-        final Fragment newFragment = new PaymentSessionLauncherFragment();
-
-        final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.add(R.id.root, newFragment, PaymentSessionLauncherFragment.class.getSimpleName())
-                .commit();
-    }
-
-    public static class PaymentSessionLauncherFragment extends Fragment {
-
-        private PaymentSession mPaymentSession;
-        private Button mLaunchButton;
-
-        @Override
-        public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
-            mPaymentSession = createPaymentSession(createCustomerSession());
-
-            mLaunchButton = Objects.requireNonNull(getView())
-                    .findViewById(R.id.launch_payment_session);
-            mLaunchButton.setOnClickListener((l) ->
-                    mPaymentSession.presentPaymentMethodSelection());
-        }
-
-        @Nullable
-        @Override
-        public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                                 @Nullable Bundle savedInstanceState) {
-            return getLayoutInflater().inflate(R.layout.launch_payment_session_fragment, null);
-        }
-
-        @Override
-        public void onActivityResult(int requestCode, int resultCode, Intent data) {
-            super.onActivityResult(requestCode, resultCode, data);
-            mPaymentSession.handlePaymentData(requestCode, resultCode, data);
-        }
-
-        @NonNull
-        private PaymentSession createPaymentSession(
-                @NonNull final CustomerSession customerSession) {
-            final PaymentSession paymentSession = new PaymentSession(this);
-            final boolean paymentSessionInitialized = paymentSession.init(
-                    new PaymentSession.PaymentSessionListener() {
-                        @Override
-                        public void onCommunicatingStateChanged(boolean isCommunicating) {
-
-                        }
-
-                        @Override
-                        public void onError(int errorCode, @NonNull String errorMessage) {
-
-                        }
-
-                        @Override
-                        public void onPaymentSessionDataChanged(@NonNull PaymentSessionData data) {
-                            customerSession.retrieveCurrentCustomer(
-                                    new CustomerSession.CustomerRetrievalListener() {
-                                        @Override
-                                        public void onCustomerRetrieved(
-                                                @NonNull Customer customer) {
-                                            mLaunchButton.setEnabled(true);
-                                        }
-
-                                        @Override
-                                        public void onError(int errorCode,
-                                                            @NonNull String errorMessage,
-                                                            @Nullable StripeError stripeError) {
-
-                                        }
-                                    });
-                        }
-                    },
-                    new PaymentSessionConfig.Builder()
-                            .setHiddenShippingInfoFields(
-                                    ShippingInfoWidget.CustomizableShippingField.PHONE_FIELD,
-                                    ShippingInfoWidget.CustomizableShippingField.CITY_FIELD
-                            )
-                            .build());
-            if (paymentSessionInitialized) {
-                paymentSession.setCartTotal(2000L);
-            }
-
-            return paymentSession;
-        }
-
-        @NonNull
-        private CustomerSession createCustomerSession() {
-            CustomerSession.initCustomerSession(requireContext(),
-                    new ExampleEphemeralKeyProvider(new ProgressListenerImpl(requireActivity())));
-            final CustomerSession customerSession = CustomerSession.getInstance();
-            customerSession.retrieveCurrentCustomer(
-                    new CustomerSession.CustomerRetrievalListener() {
-                        @Override
-                        public void onCustomerRetrieved(@NonNull Customer customer) {
-
-                        }
-
-                        @Override
-                        public void onError(int errorCode, @NonNull String errorMessage,
-                                            @Nullable StripeError stripeError) {
-
-                        }
-                    }
-            );
-            return customerSession;
-        }
-
-
-        private static final class ProgressListenerImpl
-                implements ExampleEphemeralKeyProvider.ProgressListener {
-            @NonNull private final WeakReference<Activity> mActivityRef;
-
-            private ProgressListenerImpl(@NonNull Activity activity) {
-                mActivityRef = new WeakReference<>(activity);
-            }
-
-            @Override
-            public void onStringResponse(@NonNull String response) {
-                final Activity activity = mActivityRef.get();
-                if (activity != null && response.startsWith("Error: ")) {
-                    Toast.makeText(activity, response, Toast.LENGTH_LONG).show();
-                }
-            }
-        }
-    }
-}
diff --git a/stripe/src/main/java/com/stripe/android/PaymentAuthWebViewStarter.java b/stripe/src/main/java/com/stripe/android/PaymentAuthWebViewStarter.java
index 49082dc522b..8db284d8554 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentAuthWebViewStarter.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentAuthWebViewStarter.java
@@ -1,7 +1,6 @@
 package com.stripe.android;
 
-import android.app.Activity;
-import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -20,29 +19,29 @@ public class PaymentAuthWebViewStarter
     public static final String EXTRA_RETURN_URL = "return_url";
     public static final String EXTRA_UI_CUSTOMIZATION = "ui_customization";
 
-    @NonNull private final Activity mActivity;
+    @NonNull private final Host mHost;
     private final int mRequestCode;
     @Nullable private final StripeToolbarCustomization mToolbarCustomization;
 
-    PaymentAuthWebViewStarter(@NonNull Activity activity, int requestCode) {
-        this(activity, requestCode, null);
+    PaymentAuthWebViewStarter(@NonNull Host host, int requestCode) {
+        this(host, requestCode, null);
     }
 
-    PaymentAuthWebViewStarter(@NonNull Activity activity, int requestCode,
+    PaymentAuthWebViewStarter(@NonNull Host host, int requestCode,
                               @Nullable StripeToolbarCustomization toolbarCustomization) {
-        mActivity = activity;
+        mHost = host;
         mRequestCode = requestCode;
         mToolbarCustomization = toolbarCustomization;
     }
 
     public void start(@NonNull PaymentAuthWebViewStarter.Data data) {
-        final Intent intent = new Intent(mActivity, PaymentAuthWebViewActivity.class)
-                .putExtra(EXTRA_CLIENT_SECRET, data.mClientSecret)
-                .putExtra(EXTRA_AUTH_URL, data.mUrl)
-                .putExtra(EXTRA_RETURN_URL, data.mReturnUrl)
-                .putExtra(EXTRA_UI_CUSTOMIZATION, mToolbarCustomization);
+        final Bundle extras = new Bundle();
+        extras.putString(EXTRA_CLIENT_SECRET, data.mClientSecret);
+        extras.putString(EXTRA_AUTH_URL, data.mUrl);
+        extras.putString(EXTRA_RETURN_URL, data.mReturnUrl);
+        extras.putParcelable(EXTRA_UI_CUSTOMIZATION, mToolbarCustomization);
 
-        mActivity.startActivityForResult(intent, mRequestCode);
+        mHost.startActivityForResult(PaymentAuthWebViewActivity.class, extras, mRequestCode);
     }
 
     static final class Data {
diff --git a/stripe/src/main/java/com/stripe/android/PaymentController.java b/stripe/src/main/java/com/stripe/android/PaymentController.java
index 2b36d599e63..33fdee6975a 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentController.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentController.java
@@ -34,7 +34,6 @@
 import com.stripe.android.view.AuthActivityStarter;
 import com.stripe.android.view.StripeIntentResultExtras;
 
-import java.lang.ref.WeakReference;
 import java.security.cert.CertificateException;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -87,16 +86,16 @@ class PaymentController {
     /**
      * Confirm the Stripe Intent and resolve any next actions
      */
-    void startConfirmAndAuth(@NonNull Activity activity,
+    void startConfirmAndAuth(@NonNull AuthActivityStarter.Host host,
                              @NonNull ConfirmStripeIntentParams confirmStripeIntentParams,
                              @NonNull ApiRequest.Options requestOptions) {
         new ConfirmStripeIntentTask(mApiHandler, confirmStripeIntentParams, requestOptions,
-                new ConfirmStripeIntentCallback(activity, requestOptions, this,
+                new ConfirmStripeIntentCallback(host, requestOptions, this,
                         getRequestCode(confirmStripeIntentParams)))
                 .execute();
     }
 
-    void startAuth(@NonNull final Activity activity,
+    void startAuth(@NonNull final AuthActivityStarter.Host host,
                    @NonNull String clientSecret,
                    @NonNull final ApiRequest.Options requestOptions) {
         new RetrieveIntentTask(mApiHandler,
@@ -105,12 +104,12 @@ void startAuth(@NonNull final Activity activity,
                 new ApiResultCallback<StripeIntent>() {
                     @Override
                     public void onSuccess(@NonNull StripeIntent stripeIntent) {
-                        handleNextAction(activity, stripeIntent, requestOptions);
+                        handleNextAction(host, stripeIntent, requestOptions);
                     }
 
                     @Override
                     public void onError(@NonNull Exception e) {
-                        handleError(activity, PAYMENT_REQUEST_CODE, e);
+                        handleError(host, PAYMENT_REQUEST_CODE, e);
                     }
                 })
                 .execute();
@@ -226,7 +225,7 @@ String getClientSecret(@NonNull Intent data) {
      * if it is not needed.
      */
     @VisibleForTesting
-    void handleNextAction(@NonNull Activity activity,
+    void handleNextAction(@NonNull AuthActivityStarter.Host host,
                           @NonNull StripeIntent stripeIntent,
                           @NonNull ApiRequest.Options requestOptions) {
         if (stripeIntent.requiresAction()) {
@@ -247,19 +246,19 @@ void handleNextAction(@NonNull Activity activity,
                             )
                     );
                     try {
-                        begin3ds2Auth(activity, stripeIntent,
+                        begin3ds2Auth(host, stripeIntent,
                                 Stripe3ds2Fingerprint.create(sdkData),
                                 requestOptions);
                     } catch (CertificateException e) {
-                        handleError(activity, getRequestCode(stripeIntent), e);
+                        handleError(host, getRequestCode(stripeIntent), e);
                     }
                 } else if (sdkData.is3ds1()) {
-                    beginWebAuth(activity, getRequestCode(stripeIntent),
+                    beginWebAuth(host, getRequestCode(stripeIntent),
                             Objects.requireNonNull(stripeIntent.getClientSecret()),
                             Stripe3dsRedirect.create(sdkData).getUrl(), null);
                 } else {
                     // authentication type is not supported
-                    bypassAuth(activity, stripeIntent);
+                    bypassAuth(host, stripeIntent);
                 }
             } else if (StripeIntent.NextActionType.RedirectToUrl == nextActionType) {
                 mAnalyticsRequestExecutor.executeAsync(
@@ -275,17 +274,17 @@ void handleNextAction(@NonNull Activity activity,
 
                 final StripeIntent.RedirectData redirectData =
                         Objects.requireNonNull(stripeIntent.getRedirectData());
-                beginWebAuth(activity, getRequestCode(stripeIntent),
+                beginWebAuth(host, getRequestCode(stripeIntent),
                         Objects.requireNonNull(stripeIntent.getClientSecret()),
                         redirectData.url.toString(),
                         redirectData.returnUrl);
             } else {
                 // next action type is not supported, so bypass authentication
-                bypassAuth(activity, stripeIntent);
+                bypassAuth(host, stripeIntent);
             }
         } else {
             // no action required, so bypass authentication
-            bypassAuth(activity, stripeIntent);
+            bypassAuth(host, stripeIntent);
         }
     }
 
@@ -315,15 +314,21 @@ static int getRequestCode(@NonNull ConfirmStripeIntentParams params) {
         return SETUP_REQUEST_CODE;
     }
 
-    private void bypassAuth(@NonNull Activity activity, @NonNull StripeIntent stripeIntent) {
-        new PaymentRelayStarter(activity, getRequestCode(stripeIntent))
+    private void bypassAuth(@NonNull AuthActivityStarter.Host host,
+                            @NonNull StripeIntent stripeIntent) {
+        new PaymentRelayStarter(host, getRequestCode(stripeIntent))
                 .start(new PaymentRelayStarter.Data(stripeIntent));
     }
 
-    private void begin3ds2Auth(@NonNull Activity activity,
+    private void begin3ds2Auth(@NonNull AuthActivityStarter.Host host,
                                @NonNull StripeIntent stripeIntent,
                                @NonNull Stripe3ds2Fingerprint stripe3ds2Fingerprint,
                                @NonNull ApiRequest.Options requestOptions) {
+        final Activity activity = host.getActivity();
+        if (activity == null) {
+            return;
+        }
+
         final Transaction transaction =
                 mThreeDs2Service.createTransaction(stripe3ds2Fingerprint.directoryServer.id,
                         mMessageVersionRegistry.getCurrent(), stripeIntent.isLiveMode(),
@@ -353,7 +358,7 @@ private void begin3ds2Auth(@NonNull Activity activity,
         );
         mApiHandler.start3ds2Auth(authParams, StripeTextUtils.emptyIfNull(stripeIntent.getId()),
                 requestOptions,
-                new Stripe3ds2AuthCallback(activity, mApiHandler, transaction, timeout,
+                new Stripe3ds2AuthCallback(host, mApiHandler, transaction, timeout,
                         stripeIntent, stripe3ds2Fingerprint.source, requestOptions,
                         mAnalyticsRequestExecutor, mAnalyticsDataFactory));
     }
@@ -361,22 +366,21 @@ private void begin3ds2Auth(@NonNull Activity activity,
     /**
      * Start in-app WebView activity.
      *
-     * @param activity the payment authentication result will be returned as a result to this
-     *         {@link Activity}
+     * @param host the payment authentication result will be returned as a result to this view host
      */
-    private static void beginWebAuth(@NonNull Activity activity,
+    private static void beginWebAuth(@NonNull AuthActivityStarter.Host host,
                                      int requestCode,
                                      @NonNull String clientSecret,
                                      @NonNull String authUrl,
                                      @Nullable String returnUrl) {
-        new PaymentAuthWebViewStarter(activity, requestCode).start(
+        new PaymentAuthWebViewStarter(host, requestCode).start(
                 new PaymentAuthWebViewStarter.Data(clientSecret, authUrl, returnUrl));
     }
 
-    private static void handleError(@NonNull Activity activity,
+    private static void handleError(@NonNull AuthActivityStarter.Host host,
                                     int requestCode,
                                     @NonNull Exception exception) {
-        new PaymentRelayStarter(activity, requestCode)
+        new PaymentRelayStarter(host, requestCode)
                 .start(new PaymentRelayStarter.Data(exception));
     }
 
@@ -444,17 +448,17 @@ StripeIntent getResult() throws StripeException {
 
     private static final class ConfirmStripeIntentCallback
             implements ApiResultCallback<StripeIntent> {
-        @NonNull private final WeakReference<Activity> mActivityRef;
+        @NonNull private final AuthActivityStarter.Host mHost;
         @NonNull private final ApiRequest.Options mRequestOptions;
         @NonNull private final PaymentController mPaymentController;
         private final int mRequestCode;
 
         private ConfirmStripeIntentCallback(
-                @NonNull Activity activity,
+                @NonNull AuthActivityStarter.Host host,
                 @NonNull ApiRequest.Options requestOptions,
                 @NonNull PaymentController paymentController,
                 int requestCode) {
-            mActivityRef = new WeakReference<>(activity);
+            mHost = host;
             mRequestOptions = requestOptions;
             mPaymentController = paymentController;
             mRequestCode = requestCode;
@@ -462,24 +466,18 @@ private ConfirmStripeIntentCallback(
 
         @Override
         public void onSuccess(@NonNull StripeIntent stripeIntent) {
-            final Activity activity = mActivityRef.get();
-            if (activity != null) {
-                mPaymentController.handleNextAction(activity, stripeIntent, mRequestOptions);
-            }
+            mPaymentController.handleNextAction(mHost, stripeIntent, mRequestOptions);
         }
 
         @Override
         public void onError(@NonNull Exception e) {
-            final Activity activity = mActivityRef.get();
-            if (activity != null) {
-                handleError(activity, mRequestCode, e);
-            }
+            handleError(mHost, mRequestCode, e);
         }
     }
 
     static final class Stripe3ds2AuthCallback
             implements ApiResultCallback<Stripe3ds2AuthResult> {
-        @NonNull private final WeakReference<Activity> mActivityRef;
+        @NonNull private final AuthActivityStarter.Host mHost;
         @NonNull private final StripeApiHandler mApiHandler;
         @NonNull private final Transaction mTransaction;
         private final int mMaxTimeout;
@@ -492,7 +490,7 @@ static final class Stripe3ds2AuthCallback
         @NonNull private final AnalyticsDataFactory mAnalyticsDataFactory;
 
         private Stripe3ds2AuthCallback(
-                @NonNull Activity activity,
+                @NonNull AuthActivityStarter.Host host,
                 @NonNull StripeApiHandler apiHandler,
                 @NonNull Transaction transaction,
                 int maxTimeout,
@@ -501,16 +499,16 @@ private Stripe3ds2AuthCallback(
                 @NonNull ApiRequest.Options requestOptions,
                 @NonNull FireAndForgetRequestExecutor analyticsRequestExecutor,
                 @NonNull AnalyticsDataFactory analyticsDataFactory) {
-            this(activity, apiHandler, transaction, maxTimeout, stripeIntent,
+            this(host, apiHandler, transaction, maxTimeout, stripeIntent,
                     sourceId, requestOptions,
-                    new PaymentRelayStarter(activity, getRequestCode(stripeIntent)),
+                    new PaymentRelayStarter(host, getRequestCode(stripeIntent)),
                     analyticsRequestExecutor,
                     analyticsDataFactory);
         }
 
         @VisibleForTesting
         Stripe3ds2AuthCallback(
-                @NonNull Activity activity,
+                @NonNull AuthActivityStarter.Host host,
                 @NonNull StripeApiHandler apiHandler,
                 @NonNull Transaction transaction,
                 int maxTimeout,
@@ -520,7 +518,7 @@ private Stripe3ds2AuthCallback(
                 @NonNull PaymentRelayStarter paymentRelayStarter,
                 @NonNull FireAndForgetRequestExecutor analyticsRequestExecutor,
                 @NonNull AnalyticsDataFactory analyticsDataFactory) {
-            mActivityRef = new WeakReference<>(activity);
+            mHost = host;
             mApiHandler = apiHandler;
             mTransaction = transaction;
             mMaxTimeout = maxTimeout;
@@ -540,20 +538,15 @@ private Stripe3ds2AuthCallback(
 
         @Override
         public void onSuccess(@NonNull Stripe3ds2AuthResult result) {
-            final Activity activity = mActivityRef.get();
-            if (activity == null) {
-                return;
-            }
-
             final Stripe3ds2AuthResult.Ares ares = result.ares;
             if (ares != null) {
                 if (ares.shouldChallenge()) {
-                    startChallengeFlow(activity, ares);
+                    startChallengeFlow(ares);
                 } else {
                     startFrictionlessFlow();
                 }
             } else if (result.fallbackRedirectUrl != null) {
-                beginWebAuth(activity, getRequestCode(mStripeIntent),
+                beginWebAuth(mHost, getRequestCode(mStripeIntent),
                         Objects.requireNonNull(mStripeIntent.getClientSecret()),
                         result.fallbackRedirectUrl, null);
             } else {
@@ -575,10 +568,7 @@ public void onSuccess(@NonNull Stripe3ds2AuthResult result) {
 
         @Override
         public void onError(@NonNull Exception e) {
-            final Activity activity = mActivityRef.get();
-            if (activity != null) {
-                mPaymentRelayStarter.start(new PaymentRelayStarter.Data(e));
-            }
+            mPaymentRelayStarter.start(new PaymentRelayStarter.Data(e));
         }
 
         private void startFrictionlessFlow() {
@@ -595,8 +585,7 @@ private void startFrictionlessFlow() {
             mPaymentRelayStarter.start(new PaymentRelayStarter.Data(mStripeIntent));
         }
 
-        private void startChallengeFlow(@NonNull final Activity activity,
-                                        @NonNull Stripe3ds2AuthResult.Ares ares) {
+        private void startChallengeFlow(@NonNull Stripe3ds2AuthResult.Ares ares) {
             final StripeChallengeParameters challengeParameters =
                     new StripeChallengeParameters();
             challengeParameters.setAcsSignedContent(ares.acsSignedContent);
@@ -606,9 +595,13 @@ private void startChallengeFlow(@NonNull final Activity activity,
             mBackgroundHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
+                    final Activity activity = mHost.getActivity();
+                    if (activity == null) {
+                        return;
+                    }
                     mTransaction.doChallenge(activity,
                             challengeParameters,
-                            PaymentAuth3ds2ChallengeStatusReceiver.create(activity, mApiHandler,
+                            PaymentAuth3ds2ChallengeStatusReceiver.create(mHost, mApiHandler,
                                     mStripeIntent, mSourceId, mRequestOptions,
                                     mAnalyticsRequestExecutor, mAnalyticsDataFactory,
                                     mTransaction),
@@ -622,7 +615,7 @@ static final class PaymentAuth3ds2ChallengeStatusReceiver
             extends StripeChallengeStatusReceiver {
         private static final String VALUE_YES = "Y";
 
-        @NonNull private final WeakReference<Activity> mActivityRef;
+        @NonNull private final AuthActivityStarter.Host mHost;
         @NonNull private final AuthActivityStarter<Stripe3ds2CompletionStarter.StartData> mStarter;
         @NonNull private final StripeApiHandler mApiHandler;
         @NonNull private final StripeIntent mStripeIntent;
@@ -634,7 +627,7 @@ static final class PaymentAuth3ds2ChallengeStatusReceiver
 
         @NonNull
         static PaymentAuth3ds2ChallengeStatusReceiver create(
-                @NonNull Activity activity,
+                @NonNull AuthActivityStarter.Host host,
                 @NonNull StripeApiHandler apiHandler,
                 @NonNull StripeIntent stripeIntent,
                 @NonNull String sourceId,
@@ -643,8 +636,8 @@ static PaymentAuth3ds2ChallengeStatusReceiver create(
                 @NonNull AnalyticsDataFactory analyticsDataFactory,
                 @NonNull Transaction transaction) {
             return new PaymentAuth3ds2ChallengeStatusReceiver(
-                    activity,
-                    new Stripe3ds2CompletionStarter(activity, getRequestCode(stripeIntent)),
+                    host,
+                    new Stripe3ds2CompletionStarter(host, getRequestCode(stripeIntent)),
                     apiHandler,
                     stripeIntent,
                     sourceId,
@@ -655,7 +648,7 @@ static PaymentAuth3ds2ChallengeStatusReceiver create(
         }
 
         PaymentAuth3ds2ChallengeStatusReceiver(
-                @NonNull Activity activity,
+                @NonNull AuthActivityStarter.Host host,
                 @NonNull AuthActivityStarter<Stripe3ds2CompletionStarter.StartData> starter,
                 @NonNull StripeApiHandler apiHandler,
                 @NonNull StripeIntent stripeIntent,
@@ -664,7 +657,7 @@ static PaymentAuth3ds2ChallengeStatusReceiver create(
                 @NonNull FireAndForgetRequestExecutor analyticsRequestExecutor,
                 @NonNull AnalyticsDataFactory analyticsDataFactory,
                 @NonNull Transaction transaction) {
-            mActivityRef = new WeakReference<>(activity);
+            mHost = host;
             mStarter = starter;
             mApiHandler = apiHandler;
             mStripeIntent = stripeIntent;
@@ -797,12 +790,10 @@ public void onSuccess(@NonNull Boolean result) {
 
                         @Override
                         public void onError(@NonNull Exception e) {
-                            final Activity activity = mActivityRef.get();
-                            if (activity != null) {
-                                handleError(activity, getRequestCode(mStripeIntent), e);
-                            }
+                            handleError(mHost, getRequestCode(mStripeIntent), e);
                         }
                     });
         }
     }
+
 }
diff --git a/stripe/src/main/java/com/stripe/android/PaymentRelayStarter.java b/stripe/src/main/java/com/stripe/android/PaymentRelayStarter.java
index a62a6cdb93d..78394c3a053 100644
--- a/stripe/src/main/java/com/stripe/android/PaymentRelayStarter.java
+++ b/stripe/src/main/java/com/stripe/android/PaymentRelayStarter.java
@@ -1,7 +1,6 @@
 package com.stripe.android;
 
-import android.app.Activity;
-import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
@@ -16,21 +15,21 @@
  * Should only be called from {@link PaymentController}.
  */
 class PaymentRelayStarter implements AuthActivityStarter<PaymentRelayStarter.Data> {
-    @NonNull private final Activity mActivity;
+    @NonNull private final Host mHost;
     private final int mRequestCode;
 
-    PaymentRelayStarter(@NonNull Activity activity, int requestCode) {
-        mActivity = activity;
+    PaymentRelayStarter(@NonNull Host host, int requestCode) {
+        mHost = host;
         mRequestCode = requestCode;
     }
 
     @Override
     public void start(@NonNull Data data) {
-        final Intent intent = new Intent(mActivity, PaymentRelayActivity.class)
-                .putExtra(StripeIntentResultExtras.CLIENT_SECRET,
-                        data.stripeIntent != null ? data.stripeIntent.getClientSecret() : null)
-                .putExtra(StripeIntentResultExtras.AUTH_EXCEPTION, data.exception);
-        mActivity.startActivityForResult(intent, mRequestCode);
+        final Bundle extras = new Bundle();
+        extras.putString(StripeIntentResultExtras.CLIENT_SECRET,
+                        data.stripeIntent != null ? data.stripeIntent.getClientSecret() : null);
+        extras.putSerializable(StripeIntentResultExtras.AUTH_EXCEPTION, data.exception);
+        mHost.startActivityForResult(PaymentRelayActivity.class, extras, mRequestCode);
     }
 
     public static final class Data {
diff --git a/stripe/src/main/java/com/stripe/android/Stripe.java b/stripe/src/main/java/com/stripe/android/Stripe.java
index 7bb9dbbd7ae..cae9964378e 100644
--- a/stripe/src/main/java/com/stripe/android/Stripe.java
+++ b/stripe/src/main/java/com/stripe/android/Stripe.java
@@ -8,6 +8,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.Size;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.Fragment;
 
 import com.stripe.android.exception.APIConnectionException;
 import com.stripe.android.exception.APIException;
@@ -27,6 +28,7 @@
 import com.stripe.android.model.Source;
 import com.stripe.android.model.SourceParams;
 import com.stripe.android.model.Token;
+import com.stripe.android.view.AuthActivityStarter;
 
 import java.util.Locale;
 import java.util.Map;
@@ -143,8 +145,11 @@ static AppInfo getAppInfo() {
     public void confirmSetupIntent(@NonNull Activity activity,
                                    @NonNull ConfirmSetupIntentParams confirmSetupIntentParams,
                                    @NonNull String publishableKey) {
-        mPaymentController.startConfirmAndAuth(activity, confirmSetupIntentParams,
-                ApiRequest.Options.create(publishableKey, mStripeAccount));
+        mPaymentController.startConfirmAndAuth(
+                AuthActivityStarter.Host.create(activity),
+                confirmSetupIntentParams,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
     }
 
     /**
@@ -155,6 +160,29 @@ public void confirmSetupIntent(@NonNull Activity activity,
         confirmSetupIntent(activity, confirmSetupIntentParams, mDefaultPublishableKey);
     }
 
+    /**
+     * Confirm and, if necessary, authenticate a {@link SetupIntent}.
+     *
+     * @param fragment the {@link Fragment} that is launching the payment authentication flow
+     */
+    public void confirmSetupIntent(@NonNull Fragment fragment,
+                                   @NonNull ConfirmSetupIntentParams confirmSetupIntentParams,
+                                   @NonNull String publishableKey) {
+        mPaymentController.startConfirmAndAuth(
+                AuthActivityStarter.Host.create(fragment),
+                confirmSetupIntentParams,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
+    }
+
+    /**
+     * See {@link #confirmSetupIntent(Fragment, ConfirmSetupIntentParams, String)}}
+     */
+    public void confirmSetupIntent(@NonNull Fragment fragment,
+                                   @NonNull ConfirmSetupIntentParams confirmSetupIntentParams) {
+        confirmSetupIntent(fragment, confirmSetupIntentParams, mDefaultPublishableKey);
+    }
+
     /**
      * Confirm and, if necessary, authenticate a {@link PaymentIntent}. Used for <a href=
      * "https://stripe.com/docs/payments/payment-intents/quickstart#automatic-confirmation-flow">
@@ -167,8 +195,11 @@ public void confirmSetupIntent(@NonNull Activity activity,
     public void confirmPayment(@NonNull Activity activity,
                                @NonNull ConfirmPaymentIntentParams confirmPaymentIntentParams,
                                @NonNull String publishableKey) {
-        mPaymentController.startConfirmAndAuth(activity, confirmPaymentIntentParams,
-                ApiRequest.Options.create(publishableKey, mStripeAccount));
+        mPaymentController.startConfirmAndAuth(
+                AuthActivityStarter.Host.create(activity),
+                confirmPaymentIntentParams,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
     }
 
     /**
@@ -179,6 +210,33 @@ public void confirmPayment(@NonNull Activity activity,
         confirmPayment(activity, confirmPaymentIntentParams, mDefaultPublishableKey);
     }
 
+    /**
+     * Confirm and, if necessary, authenticate a {@link PaymentIntent}. Used for <a href=
+     * "https://stripe.com/docs/payments/payment-intents/quickstart#automatic-confirmation-flow">
+     * automatic confirmation</a> flow.
+     *
+     * @param fragment the {@link Fragment} that is launching the payment authentication flow
+     * @param confirmPaymentIntentParams {@link ConfirmPaymentIntentParams} used to confirm the
+     *                                   {@link PaymentIntent}
+     */
+    public void confirmPayment(@NonNull Fragment fragment,
+                               @NonNull ConfirmPaymentIntentParams confirmPaymentIntentParams,
+                               @NonNull String publishableKey) {
+        mPaymentController.startConfirmAndAuth(
+                AuthActivityStarter.Host.create(fragment),
+                confirmPaymentIntentParams,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
+    }
+
+    /**
+     * See {@link #confirmPayment(Fragment, ConfirmPaymentIntentParams, String)}}
+     */
+    public void confirmPayment(@NonNull Fragment fragment,
+                               @NonNull ConfirmPaymentIntentParams confirmPaymentIntentParams) {
+        confirmPayment(fragment, confirmPaymentIntentParams, mDefaultPublishableKey);
+    }
+
     /**
      * Authenticate a {@link PaymentIntent}. Used for <a href=
      * "https://stripe.com/docs/payments/payment-intents/quickstart#manual-confirmation-flow">
@@ -190,8 +248,11 @@ public void confirmPayment(@NonNull Activity activity,
     public void authenticatePayment(@NonNull Activity activity,
                                     @NonNull String clientSecret,
                                     @NonNull String publishableKey) {
-        mPaymentController.startAuth(activity, clientSecret,
-                ApiRequest.Options.create(publishableKey, mStripeAccount));
+        mPaymentController.startAuth(
+                AuthActivityStarter.Host.create(activity),
+                clientSecret,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
     }
 
     /**
@@ -202,6 +263,32 @@ public void authenticatePayment(@NonNull Activity activity,
         authenticatePayment(activity, clientSecret, mDefaultPublishableKey);
     }
 
+    /**
+     * Authenticate a {@link PaymentIntent}. Used for <a href=
+     * "https://stripe.com/docs/payments/payment-intents/quickstart#manual-confirmation-flow">
+     * manual confirmation</a> flow.
+     *
+     * @param fragment the {@link Activity} that is launching the payment authentication flow
+     * @param clientSecret the `client_secret` property of a confirmed {@link PaymentIntent} object
+     */
+    public void authenticatePayment(@NonNull Fragment fragment,
+                                    @NonNull String clientSecret,
+                                    @NonNull String publishableKey) {
+        mPaymentController.startAuth(
+                AuthActivityStarter.Host.create(fragment),
+                clientSecret,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
+    }
+
+    /**
+     * See {@link #authenticatePayment(Fragment, String, String)}}
+     */
+    public void authenticatePayment(@NonNull Fragment fragment,
+                                    @NonNull String clientSecret) {
+        authenticatePayment(fragment, clientSecret, mDefaultPublishableKey);
+    }
+
     /**
      * Authenticate a {@link SetupIntent}. Used for manual confirmation flow.
      *
@@ -211,8 +298,11 @@ public void authenticatePayment(@NonNull Activity activity,
     public void authenticateSetup(@NonNull Activity activity,
                                   @NonNull String clientSecret,
                                   @NonNull String publishableKey) {
-        mPaymentController.startAuth(activity, clientSecret,
-                ApiRequest.Options.create(publishableKey, mStripeAccount));
+        mPaymentController.startAuth(
+                AuthActivityStarter.Host.create(activity),
+                clientSecret,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
     }
 
     /**
@@ -224,7 +314,31 @@ public void authenticateSetup(@NonNull Activity activity,
     }
 
     /**
-     * Should be called via {@link Activity#onActivityResult(int, int, Intent)}} to handle the
+     * Authenticate a {@link SetupIntent}. Used for manual confirmation flow.
+     *
+     * @param fragment     the {@link Fragment} that is launching the payment authentication flow
+     * @param clientSecret the `client_secret` property of a confirmed {@link SetupIntent} object
+     */
+    public void authenticateSetup(@NonNull Fragment fragment,
+                                  @NonNull String clientSecret,
+                                  @NonNull String publishableKey) {
+        mPaymentController.startAuth(
+                AuthActivityStarter.Host.create(fragment),
+                clientSecret,
+                ApiRequest.Options.create(publishableKey, mStripeAccount)
+        );
+    }
+
+    /**
+     * See {@link #authenticateSetup(Fragment, String, String)}}
+     */
+    public void authenticateSetup(@NonNull Fragment fragment,
+                                  @NonNull String clientSecret) {
+        authenticateSetup(fragment, clientSecret, mDefaultPublishableKey);
+    }
+
+    /**
+     * Should be called via <code>Activity#onActivityResult(int, int, Intent)}}</code> to handle the
      * result of a PaymentIntent automatic confirmation
      * (see {@link #confirmPayment(Activity, ConfirmPaymentIntentParams, String)}) or manual
      * confirmation (see {@link #authenticatePayment(Activity, String, String)}})
@@ -253,7 +367,7 @@ public boolean onPaymentResult(int requestCode, @Nullable Intent data,
     }
 
     /**
-     * Should be called via {@link Activity#onActivityResult(int, int, Intent)}} to handle the
+     * Should be called via <code>Activity#onActivityResult(int, int, Intent)}}</code> to handle the
      * result of a SetupIntent confirmation
      * (see {@link #confirmSetupIntent(Activity, ConfirmSetupIntentParams)})
      */
diff --git a/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.java b/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.java
index fcdf3da5887..658aa518d5e 100644
--- a/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.java
+++ b/stripe/src/main/java/com/stripe/android/Stripe3ds2CompletionStarter.java
@@ -1,7 +1,6 @@
 package com.stripe.android;
 
-import android.app.Activity;
-import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,31 +13,24 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.ref.WeakReference;
 
 class Stripe3ds2CompletionStarter
         implements AuthActivityStarter<Stripe3ds2CompletionStarter.StartData> {
-    @NonNull private final WeakReference<Activity> mActivityRef;
+    @NonNull private final Host mHost;
     private final int mRequestCode;
 
-    Stripe3ds2CompletionStarter(@NonNull Activity activity, int requestCode) {
-        mActivityRef = new WeakReference<>(activity);
+    Stripe3ds2CompletionStarter(@NonNull Host host, int requestCode) {
+        mHost = host;
         mRequestCode = requestCode;
     }
 
     @Override
     public void start(@NonNull StartData data) {
-        final Activity activity = mActivityRef.get();
-        if (activity == null) {
-            return;
-        }
-
-        final Intent intent = new Intent(activity, PaymentRelayActivity.class)
-                .putExtra(StripeIntentResultExtras.CLIENT_SECRET,
-                        data.mStripeIntent.getClientSecret())
-                .putExtra(StripeIntentResultExtras.AUTH_STATUS,
-                        data.getAuthStatus());
-        activity.startActivityForResult(intent, mRequestCode);
+        final Bundle extras = new Bundle();
+        extras.putString(StripeIntentResultExtras.CLIENT_SECRET,
+                data.mStripeIntent.getClientSecret());
+        extras.putInt(StripeIntentResultExtras.AUTH_STATUS, data.getAuthStatus());
+        mHost.startActivityForResult(PaymentRelayActivity.class, extras, mRequestCode);
     }
 
     @IntDef({ChallengeFlowOutcome.COMPLETE_SUCCESSFUL, ChallengeFlowOutcome.COMPLETE_UNSUCCESSFUL,
diff --git a/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.java b/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.java
index b00ae3c0e9d..9f9db1b82dc 100644
--- a/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.java
+++ b/stripe/src/main/java/com/stripe/android/view/AuthActivityStarter.java
@@ -1,7 +1,61 @@
 package com.stripe.android.view;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+
+import java.lang.ref.WeakReference;
 
 public interface AuthActivityStarter<StartDataType> {
     void start(@NonNull StartDataType data);
+
+    /**
+     * A representation of an object (i.e. Activity or Fragment) that can start an activity.
+     */
+    final class Host {
+        @NonNull private final WeakReference<Activity> mActivityRef;
+        @Nullable private final WeakReference<Fragment> mFragmentRef;
+
+        @NonNull
+        public static Host create(@NonNull Fragment fragment) {
+            return new Host(fragment.requireActivity(), fragment);
+        }
+
+        public static Host create(@NonNull Activity activity) {
+            return new Host(activity, null);
+        }
+
+        private Host(@NonNull Activity activity, @Nullable Fragment fragment) {
+            this.mActivityRef = new WeakReference<>(activity);
+            this.mFragmentRef = fragment != null ? new WeakReference<>(fragment) : null;
+        }
+
+        @Nullable
+        public Activity getActivity() {
+            return mActivityRef.get();
+        }
+
+        public void startActivityForResult(@NonNull Class target,
+                                           @NonNull Bundle extras,
+                                           int requestCode) {
+            final Activity activity = mActivityRef.get();
+            if (activity == null) {
+                return;
+            }
+
+            final Intent intent = new Intent(activity, target).putExtras(extras);
+
+            if (mFragmentRef != null) {
+                final Fragment fragment = mFragmentRef.get();
+                if (fragment != null) {
+                    fragment.startActivityForResult(intent, requestCode);
+                }
+            } else {
+                activity.startActivityForResult(intent, requestCode);
+            }
+        }
+    }
 }
diff --git a/stripe/src/test/java/com/stripe/android/PaymentAuthWebViewStarterTest.java b/stripe/src/test/java/com/stripe/android/PaymentAuthWebViewStarterTest.java
index 1f22f5f3bbc..f3d9ccca9fb 100644
--- a/stripe/src/test/java/com/stripe/android/PaymentAuthWebViewStarterTest.java
+++ b/stripe/src/test/java/com/stripe/android/PaymentAuthWebViewStarterTest.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 
 import com.stripe.android.stripe3ds2.init.ui.StripeToolbarCustomization;
+import com.stripe.android.view.AuthActivityStarter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,14 +36,17 @@ public class PaymentAuthWebViewStarterTest {
     @Captor private ArgumentCaptor<Intent> mIntentArgumentCaptor;
     @Captor private ArgumentCaptor<Integer> mRequestCodeCaptor;
 
+    private AuthActivityStarter.Host mHost;
+
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
+        mHost = AuthActivityStarter.Host.create(mActivity);
     }
 
     @Test
     public void start_startsWithCorrectIntentAndRequestCode() {
-        new PaymentAuthWebViewStarter(mActivity, 50000).start(DATA);
+        new PaymentAuthWebViewStarter(mHost, 50000).start(DATA);
         verify(mActivity).startActivityForResult(mIntentArgumentCaptor.capture(),
                 mRequestCodeCaptor.capture());
 
@@ -57,7 +61,7 @@ public void start_startsWithCorrectIntentAndRequestCode() {
 
     @Test
     public void start_startsWithCorrectIntentAndRequestCodeAndCustomization() {
-        new PaymentAuthWebViewStarter(mActivity, 50000,
+        new PaymentAuthWebViewStarter(mHost, 50000,
                 new StripeToolbarCustomization()).start(DATA);
         verify(mActivity).startActivityForResult(mIntentArgumentCaptor.capture(),
                 mRequestCodeCaptor.capture());
diff --git a/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java b/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
index 5beb7d26109..60dbcb41b5e 100644
--- a/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
+++ b/stripe/src/test/java/com/stripe/android/PaymentControllerTest.java
@@ -74,6 +74,7 @@ public class PaymentControllerTest {
 
     private PaymentController mController;
     private AnalyticsDataFactory mAnalyticsDataFactory;
+    private AuthActivityStarter.Host mHost;
 
     @Mock private Activity mActivity;
     @Mock private StripeThreeDs2Service mThreeDs2Service;
@@ -93,6 +94,7 @@ public class PaymentControllerTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
+        mHost = AuthActivityStarter.Host.create(mActivity);
         mAnalyticsDataFactory =
                 new AnalyticsDataFactory(ApplicationProvider.getApplicationContext());
         when(mTransaction.getAuthenticationRequestParameters())
@@ -127,7 +129,7 @@ public void handleNextAction_withMastercardAnd3ds2() throws CertificateException
                 eq(dsPublicKey),
                 eq("7c4debe3f4af7f9d1569a2ffea4343c2566826ee")))
                 .thenReturn(mTransaction);
-        mController.handleNextAction(mActivity, paymentIntent, REQUEST_OPTIONS);
+        mController.handleNextAction(mHost, paymentIntent, REQUEST_OPTIONS);
         verify(mThreeDs2Service).createTransaction(
                 eq(Stripe3ds2Fingerprint.DirectoryServer.Mastercard.id),
                 eq(MESSAGE_VERSION),
@@ -166,7 +168,7 @@ public void handleNextAction_withAmexAnd3ds2() {
                 eq(Stripe3ds2FingerprintTest.DS_RSA_PUBLIC_KEY),
                 eq(PaymentIntentFixtures.KEY_ID)))
                 .thenReturn(mTransaction);
-        mController.handleNextAction(mActivity, PaymentIntentFixtures.PI_REQUIRES_AMEX_3DS2,
+        mController.handleNextAction(mHost, PaymentIntentFixtures.PI_REQUIRES_AMEX_3DS2,
                 REQUEST_OPTIONS);
         verify(mThreeDs2Service).createTransaction(
                 eq(Stripe3ds2Fingerprint.DirectoryServer.Amex.id),
@@ -189,7 +191,7 @@ public void handleNextAction_withAmexAnd3ds2() {
 
     @Test
     public void handleNextAction_whenSdk3ds1() {
-        mController.handleNextAction(mActivity, PaymentIntentFixtures.PI_REQUIRES_3DS1,
+        mController.handleNextAction(mHost, PaymentIntentFixtures.PI_REQUIRES_3DS1,
                 REQUEST_OPTIONS);
         verify(mActivity).startActivityForResult(mIntentArgumentCaptor.capture(),
                 eq(PaymentController.PAYMENT_REQUEST_CODE));
@@ -203,7 +205,7 @@ public void handleNextAction_whenSdk3ds1() {
 
     @Test
     public void handleNextAction_whenBrowser3ds1() {
-        mController.handleNextAction(mActivity, PaymentIntentFixtures.PI_REQUIRES_REDIRECT,
+        mController.handleNextAction(mHost, PaymentIntentFixtures.PI_REQUIRES_REDIRECT,
                 REQUEST_OPTIONS);
         verify(mActivity).startActivityForResult(mIntentArgumentCaptor.capture(),
                 eq(PaymentController.PAYMENT_REQUEST_CODE));
@@ -227,7 +229,7 @@ public void handleNextAction_whenBrowser3ds1() {
 
     @Test
     public void handleNextAction_when3dsRedirectWithSetupIntent() {
-        mController.handleNextAction(mActivity, SetupIntentFixtures.SI_NEXT_ACTION_REDIRECT,
+        mController.handleNextAction(mHost, SetupIntentFixtures.SI_NEXT_ACTION_REDIRECT,
                 REQUEST_OPTIONS);
         verify(mActivity).startActivityForResult(any(Intent.class),
                 eq(PaymentController.SETUP_REQUEST_CODE));
@@ -271,7 +273,7 @@ public String getTransactionStatus() {
 
         when(mTransaction.getInitialChallengeUiType()).thenReturn("04");
 
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123", REQUEST_OPTIONS,
                 mFireAndForgetRequestExecutor, mAnalyticsDataFactory, mTransaction)
@@ -296,7 +298,7 @@ public String getTransactionStatus() {
 
     @Test
     public void test3ds2Receiver_whenTimedout_shouldFireAnalyticsRequest() {
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123",
                 ApiRequest.Options.create(ApiKeyFixtures.FAKE_PUBLISHABLE_KEY),
@@ -319,7 +321,7 @@ public void test3ds2Receiver_whenTimedout_shouldFireAnalyticsRequest() {
 
     @Test
     public void test3ds2Receiver_whenCanceled_shouldFireAnalyticsRequest() {
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123",
                 ApiRequest.Options.create(ApiKeyFixtures.FAKE_PUBLISHABLE_KEY),
@@ -357,7 +359,7 @@ public String getErrorMessage() {
             }
         };
 
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123",
                 ApiRequest.Options.create(ApiKeyFixtures.FAKE_PUBLISHABLE_KEY),
@@ -421,7 +423,7 @@ public String getErrorDetails() {
             }
         };
 
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123",
                 ApiRequest.Options.create(ApiKeyFixtures.FAKE_PUBLISHABLE_KEY),
@@ -450,7 +452,7 @@ public String getErrorDetails() {
 
     @Test
     public void test3ds2Completion_whenCanceled_shouldCallStarterWithCancelStatus() {
-        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mActivity,
+        new PaymentController.PaymentAuth3ds2ChallengeStatusReceiver(mHost,
                 m3ds2Starter, mApiHandler, PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2,
                 "src_123",
                 ApiRequest.Options.create(ApiKeyFixtures.FAKE_PUBLISHABLE_KEY),
@@ -525,7 +527,7 @@ public void handleSetupResult_shouldCallbackOnSuccess()
     @Test
     public void authCallback_withChallengeFlow_shouldNotStartRelayActivity() {
         final PaymentController.Stripe3ds2AuthCallback authCallback =
-                new PaymentController.Stripe3ds2AuthCallback(mActivity, mApiHandler,
+                new PaymentController.Stripe3ds2AuthCallback(mHost, mApiHandler,
                         mTransaction, MAX_TIMEOUT,
                         PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2, SOURCE_ID,
                         REQUEST_OPTIONS, mPaymentRelayStarter,
@@ -538,7 +540,7 @@ public void authCallback_withChallengeFlow_shouldNotStartRelayActivity() {
     @Test
     public void authCallback_withFrictionlessFlow_shouldStartRelayActivityWithPaymentIntent() {
         final PaymentController.Stripe3ds2AuthCallback authCallback =
-                new PaymentController.Stripe3ds2AuthCallback(mActivity, mApiHandler,
+                new PaymentController.Stripe3ds2AuthCallback(mHost, mApiHandler,
                         mTransaction, MAX_TIMEOUT,
                         PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2, SOURCE_ID,
                         REQUEST_OPTIONS,
@@ -563,7 +565,7 @@ public void authCallback_withFrictionlessFlow_shouldStartRelayActivityWithPaymen
     @Test
     public void authCallback_withFallbackRedirectUrl_shouldStartAuthWebView() {
         final PaymentController.Stripe3ds2AuthCallback authCallback =
-                new PaymentController.Stripe3ds2AuthCallback(mActivity, mApiHandler,
+                new PaymentController.Stripe3ds2AuthCallback(mHost, mApiHandler,
                         mTransaction, MAX_TIMEOUT,
                         PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2, SOURCE_ID,
                         REQUEST_OPTIONS,
@@ -584,7 +586,7 @@ public void authCallback_withFallbackRedirectUrl_shouldStartAuthWebView() {
     @Test
     public void authCallback_withError_shouldStartRelayActivityWithException() {
         final PaymentController.Stripe3ds2AuthCallback authCallback =
-                new PaymentController.Stripe3ds2AuthCallback(mActivity, mApiHandler,
+                new PaymentController.Stripe3ds2AuthCallback(mHost, mApiHandler,
                         mTransaction, MAX_TIMEOUT,
                         PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2, SOURCE_ID,
                         REQUEST_OPTIONS, mPaymentRelayStarter,
diff --git a/stripe/src/test/java/com/stripe/android/PaymentRelayStarterTest.java b/stripe/src/test/java/com/stripe/android/PaymentRelayStarterTest.java
index c00c305247b..8b5c551849c 100644
--- a/stripe/src/test/java/com/stripe/android/PaymentRelayStarterTest.java
+++ b/stripe/src/test/java/com/stripe/android/PaymentRelayStarterTest.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 
 import com.stripe.android.model.PaymentIntentFixtures;
+import com.stripe.android.view.AuthActivityStarter;
 import com.stripe.android.view.StripeIntentResultExtras;
 
 import org.junit.Before;
@@ -31,7 +32,8 @@ public class PaymentRelayStarterTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        mStarter = new PaymentRelayStarter(mActivity, 500);
+        mStarter = new PaymentRelayStarter(
+                AuthActivityStarter.Host.create(mActivity), 500);
     }
 
     @Test
diff --git a/stripe/src/test/java/com/stripe/android/Stripe3ds2CompletionStarterTest.java b/stripe/src/test/java/com/stripe/android/Stripe3ds2CompletionStarterTest.java
index 9ac8412cebf..49fc5450533 100644
--- a/stripe/src/test/java/com/stripe/android/Stripe3ds2CompletionStarterTest.java
+++ b/stripe/src/test/java/com/stripe/android/Stripe3ds2CompletionStarterTest.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 
 import com.stripe.android.model.PaymentIntentFixtures;
+import com.stripe.android.view.AuthActivityStarter;
 import com.stripe.android.view.StripeIntentResultExtras;
 
 import org.junit.Before;
@@ -31,7 +32,8 @@ public class Stripe3ds2CompletionStarterTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        mStarter = new Stripe3ds2CompletionStarter(mActivity, 500);
+        mStarter = new Stripe3ds2CompletionStarter(
+                AuthActivityStarter.Host.create(mActivity), 500);
     }
 
     @Test
diff --git a/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java b/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
index cc9cea67d14..b3f9846d6f2 100644
--- a/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
+++ b/stripe/src/test/java/com/stripe/android/StripePaymentAuthTest.java
@@ -11,16 +11,20 @@
 import com.stripe.android.model.ConfirmSetupIntentParams;
 import com.stripe.android.model.PaymentIntentFixtures;
 import com.stripe.android.model.SetupIntentFixtures;
+import com.stripe.android.view.AuthActivityStarter;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.Objects;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -37,6 +41,7 @@ public class StripePaymentAuthTest {
     @Mock private PaymentController mPaymentController;
     @Mock private ApiResultCallback<PaymentIntentResult> mPaymentCallback;
     @Mock private ApiResultCallback<SetupIntentResult> mSetupCallback;
+    @Captor private ArgumentCaptor<AuthActivityStarter.Host> mHostArgumentCaptor;
 
     @Before
     public void setup() {
@@ -53,8 +58,12 @@ public void confirmPayment_shouldConfirmAndAuth() {
                         "client_secret",
                         "yourapp://post-authentication-return-url");
         stripe.confirmPayment(mActivity, confirmPaymentIntentParams);
-        verify(mPaymentController).startConfirmAndAuth(eq(mActivity),
-                eq(confirmPaymentIntentParams), eq(REQUEST_OPTIONS));
+        verify(mPaymentController).startConfirmAndAuth(
+                mHostArgumentCaptor.capture(),
+                eq(confirmPaymentIntentParams),
+                eq(REQUEST_OPTIONS)
+        );
+        assertEquals(mActivity, mHostArgumentCaptor.getValue().getActivity());
     }
 
     @Test
@@ -66,8 +75,12 @@ public void confirmSetupIntent_shouldConfirmAndAuth() {
                         "client_secret",
                         "yourapp://post-authentication-return-url");
         stripe.confirmSetupIntent(mActivity, confirmSetupIntentParams);
-        verify(mPaymentController).startConfirmAndAuth(eq(mActivity),
-                eq(confirmSetupIntentParams), eq(REQUEST_OPTIONS));
+        verify(mPaymentController).startConfirmAndAuth(
+                mHostArgumentCaptor.capture(),
+                eq(confirmSetupIntentParams),
+                eq(REQUEST_OPTIONS)
+        );
+        assertEquals(mActivity, mHostArgumentCaptor.getValue().getActivity());
     }
 
     @Test
@@ -76,10 +89,11 @@ public void authenticatePayment_shouldAuth() {
         final String clientSecret = PaymentIntentFixtures.PI_REQUIRES_MASTERCARD_3DS2.getClientSecret();
         stripe.authenticatePayment(mActivity, Objects.requireNonNull(clientSecret));
         verify(mPaymentController).startAuth(
-                eq(mActivity),
+                mHostArgumentCaptor.capture(),
                 eq(clientSecret),
                 eq(REQUEST_OPTIONS)
         );
+        assertEquals(mActivity, mHostArgumentCaptor.getValue().getActivity());
     }
 
     @Test
@@ -88,10 +102,11 @@ public void authenticateSetup_shouldAuth() {
         final String clientSecret = SetupIntentFixtures.SI_NEXT_ACTION_REDIRECT.getClientSecret();
         stripe.authenticateSetup(mActivity, Objects.requireNonNull(clientSecret));
         verify(mPaymentController).startAuth(
-                eq(mActivity),
+                mHostArgumentCaptor.capture(),
                 eq(clientSecret),
                 eq(REQUEST_OPTIONS)
         );
+        assertEquals(mActivity, mHostArgumentCaptor.getValue().getActivity());
     }
 
     @Test