diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeClient.java b/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeClient.java index 83ba81aeb8..ad2f889884 100644 --- a/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeClient.java +++ b/BraintreeCore/src/main/java/com/braintreepayments/api/BraintreeClient.java @@ -301,15 +301,30 @@ BrowserSwitchResult getBrowserSwitchResult(@NonNull FragmentActivity activity) { return browserSwitchClient.getResult(activity); } + /** + * Deliver a browser switch result from an Activity's pending deep link intent url. + * If {@link BraintreeClient#launchesBrowserSwitchAsNewTask(boolean)} is set to true, + * use {@link BraintreeClient#deliverBrowserSwitchResultFromNewTask(Context)} instead. + * + * @param activity + * @return {@link BrowserSwitchResult} + */ public BrowserSwitchResult deliverBrowserSwitchResult(@NonNull FragmentActivity activity) { return browserSwitchClient.deliverResult(activity); } - BrowserSwitchResult getBrowserSwitchResultFromCache(@NonNull Context context) { + BrowserSwitchResult getBrowserSwitchResultFromNewTask(@NonNull Context context) { return browserSwitchClient.getResultFromCache(context); } - BrowserSwitchResult deliverBrowserSwitchResultFromCache(@NonNull Context context) { + /** + * Deliver pending browser switch result received by {@link BraintreeDeepLinkActivity} when + * {@link BraintreeClient#launchesBrowserSwitchAsNewTask(boolean)} is set to true. + * + * @param context + * @return {@link BrowserSwitchResult} + */ + public BrowserSwitchResult deliverBrowserSwitchResultFromNewTask(@NonNull Context context) { return browserSwitchClient.deliverResultFromCache(context); } diff --git a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.java b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.java index 9dcf632ad7..c5a7e00627 100644 --- a/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.java +++ b/BraintreeCore/src/test/java/com/braintreepayments/api/BraintreeClientUnitTest.java @@ -431,6 +431,17 @@ public void deliverBrowserSwitchResult_forwardsInvocationToBrowserSwitchClient() verify(browserSwitchClient).deliverResult(activity); } + @Test + public void deliverBrowserSwitchResultFromNewTask_forwardsInvocationToBrowserSwitchClient() { + Context context = mock(Context.class); + + BraintreeClientParams params = createDefaultParams(configurationLoader, authorizationLoader); + BraintreeClient sut = new BraintreeClient(params); + + sut.deliverBrowserSwitchResultFromNewTask(context); + verify(browserSwitchClient).deliverResultFromCache(context); + } + @Test public void assertCanPerformBrowserSwitch_assertsBrowserSwitchIsPossible() throws BrowserSwitchException { BraintreeClientParams params = createDefaultParams(configurationLoader, authorizationLoader); diff --git a/CHANGELOG.md b/CHANGELOG.md index 46d625f7b6..fffdfae278 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ * Fixes a bug where an error was not thrown inside `PayPalNativeCheckoutClient` when no PayPal response was received from the API +* BraintreeCore + * Add `BraintreeClient#deliverBrowserSwitchResultFromNewTask()` method to allow browser switch results to be captured manually when `BraintreeClient#launchesBrowserSwitchAsNewTask()` is set to true. * SharedUtils * Replace EncryptedSharedPreferences with SharedPreferences for internal persistent data storage for all payment flows * Deprecate `BraintreeSharedPreferencesException` diff --git a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentClient.java b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentClient.java index 5f35110793..ab9a5f6a94 100644 --- a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentClient.java +++ b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentClient.java @@ -230,12 +230,12 @@ BrowserSwitchResult deliverBrowserSwitchResult(FragmentActivity activity) { return braintreeClient.deliverBrowserSwitchResult(activity); } - BrowserSwitchResult getBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.getBrowserSwitchResultFromCache(activity); + BrowserSwitchResult getBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.getBrowserSwitchResultFromNewTask(activity); } - BrowserSwitchResult deliverBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.deliverBrowserSwitchResultFromCache(activity); + BrowserSwitchResult deliverBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.deliverBrowserSwitchResultFromNewTask(activity); } /** diff --git a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentLifecycleObserver.java b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentLifecycleObserver.java index f3db086b39..16994fb693 100644 --- a/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentLifecycleObserver.java +++ b/LocalPayment/src/main/java/com/braintreepayments/api/LocalPaymentLifecycleObserver.java @@ -64,10 +64,10 @@ public void run() { } BrowserSwitchResult pendingResultFromCache = - localPaymentClient.getBrowserSwitchResultFromCache(finalActivity); + localPaymentClient.getBrowserSwitchResultFromNewTask(finalActivity); if (pendingResultFromCache != null && pendingResultFromCache.getRequestCode() == LOCAL_PAYMENT) { resultToDeliver = - localPaymentClient.deliverBrowserSwitchResultFromCache(finalActivity); + localPaymentClient.deliverBrowserSwitchResultFromNewTask(finalActivity); } if (resultToDeliver != null) { diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentClientUnitTest.java b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentClientUnitTest.java index 8a3b30e648..6571eab067 100644 --- a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentClientUnitTest.java +++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentClientUnitTest.java @@ -682,19 +682,19 @@ public void deliverBrowserSwitchResult_forwardsInvocationToBraintreeClient() { @Test public void getBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient() { BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); - when(braintreeClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); LocalPaymentClient sut = new LocalPaymentClient(activity, lifecycle, braintreeClient, payPalDataCollector, localPaymentApi); - assertSame(browserSwitchResult, sut.getBrowserSwitchResultFromCache(activity)); + assertSame(browserSwitchResult, sut.getBrowserSwitchResultFromNewTask(activity)); } @Test - public void deliverBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient() { + public void deliverBrowserSwitchResultFromNewTask_forwardsInvocationToBraintreeClient() { BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); - when(braintreeClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); LocalPaymentClient sut = new LocalPaymentClient(activity, lifecycle, braintreeClient, payPalDataCollector, localPaymentApi); - assertSame(browserSwitchResult, sut.deliverBrowserSwitchResultFromCache(activity)); + assertSame(browserSwitchResult, sut.deliverBrowserSwitchResultFromNewTask(activity)); } private LocalPaymentRequest getIdealLocalPaymentRequest() { diff --git a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java index 7e7a6cb65a..da8ad5cf8b 100644 --- a/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java +++ b/LocalPayment/src/test/java/com/braintreepayments/api/LocalPaymentLifecycleObserverUnitTest.java @@ -68,8 +68,8 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultF when(browserSwitchResult.getRequestCode()).thenReturn(LOCAL_PAYMENT); LocalPaymentClient localPaymentClient = mock(LocalPaymentClient.class); - when(localPaymentClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(localPaymentClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(localPaymentClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(localPaymentClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient); @@ -86,8 +86,8 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultF when(browserSwitchResult.getRequestCode()).thenReturn(LOCAL_PAYMENT); LocalPaymentClient localPaymentClient = mock(LocalPaymentClient.class); - when(localPaymentClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(localPaymentClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(localPaymentClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(localPaymentClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient); @@ -121,7 +121,7 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotLocalP when(browserSwitchResult.getRequestCode()).thenReturn(PAYPAL); LocalPaymentClient localPaymentClient = mock(LocalPaymentClient.class); - when(localPaymentClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(localPaymentClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); LocalPaymentLifecycleObserver sut = new LocalPaymentLifecycleObserver(localPaymentClient); diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalClient.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalClient.java index fd5a5c0f09..b0696f36e9 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalClient.java +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalClient.java @@ -307,12 +307,12 @@ BrowserSwitchResult deliverBrowserSwitchResult(FragmentActivity activity) { return braintreeClient.deliverBrowserSwitchResult(activity); } - BrowserSwitchResult getBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.getBrowserSwitchResultFromCache(activity); + BrowserSwitchResult getBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.getBrowserSwitchResultFromNewTask(activity); } - BrowserSwitchResult deliverBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.deliverBrowserSwitchResultFromCache(activity); + BrowserSwitchResult deliverBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.deliverBrowserSwitchResultFromNewTask(activity); } /** diff --git a/PayPal/src/main/java/com/braintreepayments/api/PayPalLifeCycleObserver.java b/PayPal/src/main/java/com/braintreepayments/api/PayPalLifeCycleObserver.java index 240755f3ed..08c579430b 100644 --- a/PayPal/src/main/java/com/braintreepayments/api/PayPalLifeCycleObserver.java +++ b/PayPal/src/main/java/com/braintreepayments/api/PayPalLifeCycleObserver.java @@ -65,10 +65,10 @@ public void run() { } BrowserSwitchResult pendingResultFromCache = - payPalClient.getBrowserSwitchResultFromCache(finalActivity); + payPalClient.getBrowserSwitchResultFromNewTask(finalActivity); if (pendingResultFromCache != null && pendingResultFromCache.getRequestCode() == PAYPAL) { resultToDeliver = - payPalClient.deliverBrowserSwitchResultFromCache(finalActivity); + payPalClient.deliverBrowserSwitchResultFromNewTask(finalActivity); } if (resultToDeliver != null) { diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java index 2ad1769246..195fa94171 100644 --- a/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java +++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalClientUnitTest.java @@ -778,25 +778,25 @@ public void getBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient( BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); BraintreeClient braintreeClient = mock(BraintreeClient.class); - when(braintreeClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); PayPalClient sut = new PayPalClient(activity, lifecycle, braintreeClient, payPalInternalClient); - BrowserSwitchResult result = sut.getBrowserSwitchResultFromCache(activity); + BrowserSwitchResult result = sut.getBrowserSwitchResultFromNewTask(activity); assertSame(browserSwitchResult, result); } @Test - public void deliverBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient() { + public void deliverBrowserSwitchResultFromNewTask_forwardsInvocationToBraintreeClient() { PayPalInternalClient payPalInternalClient = new MockPayPalInternalClientBuilder().build(); BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); BraintreeClient braintreeClient = mock(BraintreeClient.class); - when(braintreeClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); PayPalClient sut = new PayPalClient(activity, lifecycle, braintreeClient, payPalInternalClient); - BrowserSwitchResult result = sut.deliverBrowserSwitchResultFromCache(activity); + BrowserSwitchResult result = sut.deliverBrowserSwitchResultFromNewTask(activity); assertSame(browserSwitchResult, result); } } \ No newline at end of file diff --git a/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java b/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java index 8bab833912..81edbe8b6b 100644 --- a/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java +++ b/PayPal/src/test/java/com/braintreepayments/api/PayPalLifecycleObserverUnitTest.java @@ -68,8 +68,8 @@ public void onResume_whenLifeCycleObserverIsFragment_payPalClientDeliversResultF when(browserSwitchResult.getRequestCode()).thenReturn(PAYPAL); PayPalClient payPalClient = mock(PayPalClient.class); - when(payPalClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(payPalClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(payPalClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(payPalClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient); @@ -86,8 +86,8 @@ public void onResume_whenLifeCycleObserverIsActivity_payPalClientDeliversResultF when(browserSwitchResult.getRequestCode()).thenReturn(PAYPAL); PayPalClient payPalClient = mock(PayPalClient.class); - when(payPalClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(payPalClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(payPalClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(payPalClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient); @@ -122,7 +122,7 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotPayPal when(browserSwitchResult.getRequestCode()).thenReturn(THREE_D_SECURE); PayPalClient payPalClient = mock(PayPalClient.class); - when(payPalClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(payPalClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); PayPalLifecycleObserver sut = new PayPalLifecycleObserver(payPalClient); diff --git a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureClient.java b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureClient.java index 92dfa04e12..df2a1dcee0 100644 --- a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureClient.java +++ b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureClient.java @@ -620,12 +620,12 @@ BrowserSwitchResult deliverBrowserSwitchResult(FragmentActivity activity) { return braintreeClient.deliverBrowserSwitchResult(activity); } - BrowserSwitchResult getBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.getBrowserSwitchResultFromCache(activity); + BrowserSwitchResult getBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.getBrowserSwitchResultFromNewTask(activity); } - BrowserSwitchResult deliverBrowserSwitchResultFromCache(FragmentActivity activity) { - return braintreeClient.deliverBrowserSwitchResultFromCache(activity); + BrowserSwitchResult deliverBrowserSwitchResultFromNewTask(FragmentActivity activity) { + return braintreeClient.deliverBrowserSwitchResultFromNewTask(activity); } // endregion diff --git a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureLifecycleObserver.java b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureLifecycleObserver.java index d7cd533ae3..0580a0e1ff 100644 --- a/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureLifecycleObserver.java +++ b/ThreeDSecure/src/main/java/com/braintreepayments/api/ThreeDSecureLifecycleObserver.java @@ -88,10 +88,10 @@ public void run() { } BrowserSwitchResult pendingResultFromCache = - threeDSecureClient.getBrowserSwitchResultFromCache(finalActivity); + threeDSecureClient.getBrowserSwitchResultFromNewTask(finalActivity); if (pendingResultFromCache != null && pendingResultFromCache.getRequestCode() == THREE_D_SECURE) { resultToDeliver = - threeDSecureClient.deliverBrowserSwitchResultFromCache(finalActivity); + threeDSecureClient.deliverBrowserSwitchResultFromNewTask(finalActivity); } if (resultToDeliver != null) { diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureClientUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureClientUnitTest.java index fedb7ba5db..3128d10882 100644 --- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureClientUnitTest.java +++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureClientUnitTest.java @@ -706,25 +706,25 @@ public void getBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient( BraintreeClient braintreeClient = mock(BraintreeClient.class); BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); - when(braintreeClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); ThreeDSecureClient sut = new ThreeDSecureClient(activity, lifecycle, braintreeClient, cardinalClient, browserSwitchHelper, threeDSecureAPI); - BrowserSwitchResult result = sut.getBrowserSwitchResultFromCache(activity); + BrowserSwitchResult result = sut.getBrowserSwitchResultFromNewTask(activity); assertSame(browserSwitchResult, result); } @Test - public void deliverBrowserSwitchResultFromCache_forwardsInvocationToBraintreeClient() { + public void deliverBrowserSwitchResultFromNewTask_forwardsInvocationToBraintreeClient() { CardinalClient cardinalClient = new MockCardinalClientBuilder().build(); BraintreeClient braintreeClient = mock(BraintreeClient.class); BrowserSwitchResult browserSwitchResult = mock(BrowserSwitchResult.class); - when(braintreeClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(braintreeClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); ThreeDSecureClient sut = new ThreeDSecureClient(activity, lifecycle, braintreeClient, cardinalClient, browserSwitchHelper, threeDSecureAPI); - BrowserSwitchResult result = sut.deliverBrowserSwitchResultFromCache(activity); + BrowserSwitchResult result = sut.deliverBrowserSwitchResultFromNewTask(activity); assertSame(browserSwitchResult, result); } } diff --git a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java index 71ec31a5d1..ea4bfa3270 100644 --- a/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java +++ b/ThreeDSecure/src/test/java/com/braintreepayments/api/ThreeDSecureLifecycleObserverUnitTest.java @@ -132,8 +132,8 @@ public void onResume_whenLifeCycleObserverIsFragment_threeDSecureClientDeliversR when(browserSwitchResult.getRequestCode()).thenReturn(THREE_D_SECURE); ThreeDSecureClient threeDSecureClient = mock(ThreeDSecureClient.class); - when(threeDSecureClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(threeDSecureClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(threeDSecureClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(threeDSecureClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient); @@ -151,8 +151,8 @@ public void onResume_whenLifeCycleObserverIsActivity_threeDSecureClientDeliversR when(browserSwitchResult.getRequestCode()).thenReturn(THREE_D_SECURE); ThreeDSecureClient threeDSecureClient = mock(ThreeDSecureClient.class); - when(threeDSecureClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); - when(threeDSecureClient.deliverBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(threeDSecureClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); + when(threeDSecureClient.deliverBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient); @@ -189,7 +189,7 @@ public void onResume_whenCachedBrowserSwitchResultExists_andRequestCodeNotThreeD when(browserSwitchResult.getRequestCode()).thenReturn(PAYPAL); ThreeDSecureClient threeDSecureClient = mock(ThreeDSecureClient.class); - when(threeDSecureClient.getBrowserSwitchResultFromCache(activity)).thenReturn(browserSwitchResult); + when(threeDSecureClient.getBrowserSwitchResultFromNewTask(activity)).thenReturn(browserSwitchResult); ThreeDSecureLifecycleObserver sut = new ThreeDSecureLifecycleObserver(activityResultRegistry, threeDSecureClient);