From f15f433490a9f7f0ce85656ba77904246a3eacbb Mon Sep 17 00:00:00 2001 From: Carlos Munoz Date: Thu, 31 Mar 2022 11:31:39 -0700 Subject: [PATCH 1/4] Moves exceptions to core. --- .../main/java/com/stripe/android/PaymentController.kt | 2 +- .../src/main/java/com/stripe/android/Stripe.kt | 2 +- .../src/main/java/com/stripe/android/StripeKtx.kt | 2 +- .../java/com/stripe/android/StripePaymentController.kt | 2 +- .../android/exception/MaxRetryReachedException.kt | 9 --------- .../stripe/android/networking/StripeApiRepository.kt | 6 +++--- .../com/stripe/android/networking/StripeRepository.kt | 2 +- .../android/payments/PaymentFlowResultProcessor.kt | 2 +- .../java/com/stripe/android/PaymentRelayStarterTest.kt | 2 +- .../src/test/java/com/stripe/android/StripeKtxTest.kt | 2 +- .../src/test/java/com/stripe/android/StripeTest.java | 2 +- .../payments/PaymentIntentFlowResultProcessorTest.kt | 2 +- .../stripe/android/view/PaymentRelayActivityTest.kt | 2 +- .../android/core}/exception/AuthenticationException.kt | 6 +++--- .../android/core/exception/MaxRetryReachedException.kt | 10 ++++++++++ .../android/core}/exception/PermissionException.kt | 3 +-- .../android/core}/exception/RateLimitException.kt | 3 +-- 17 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 payments-core/src/main/java/com/stripe/android/exception/MaxRetryReachedException.kt rename {payments-core/src/main/java/com/stripe/android => stripe-core/src/main/java/com/stripe/android/core}/exception/AuthenticationException.kt (65%) create mode 100644 stripe-core/src/main/java/com/stripe/android/core/exception/MaxRetryReachedException.kt rename {payments-core/src/main/java/com/stripe/android => stripe-core/src/main/java/com/stripe/android/core}/exception/PermissionException.kt (80%) rename {payments-core/src/main/java/com/stripe/android => stripe-core/src/main/java/com/stripe/android/core}/exception/RateLimitException.kt (83%) diff --git a/payments-core/src/main/java/com/stripe/android/PaymentController.kt b/payments-core/src/main/java/com/stripe/android/PaymentController.kt index 3256a8a7ed8..79bfc6b07c1 100644 --- a/payments-core/src/main/java/com/stripe/android/PaymentController.kt +++ b/payments-core/src/main/java/com/stripe/android/PaymentController.kt @@ -10,7 +10,7 @@ import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.ConfirmPaymentIntentParams import com.stripe.android.model.ConfirmStripeIntentParams import com.stripe.android.model.PaymentIntent diff --git a/payments-core/src/main/java/com/stripe/android/Stripe.kt b/payments-core/src/main/java/com/stripe/android/Stripe.kt index b2b1c196d6b..2c0b400c53b 100644 --- a/payments-core/src/main/java/com/stripe/android/Stripe.kt +++ b/payments-core/src/main/java/com/stripe/android/Stripe.kt @@ -19,7 +19,7 @@ import com.stripe.android.core.exception.StripeException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.version.StripeSdkVersion -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.AccountParams import com.stripe.android.model.BankAccount diff --git a/payments-core/src/main/java/com/stripe/android/StripeKtx.kt b/payments-core/src/main/java/com/stripe/android/StripeKtx.kt index 6a538af7f56..64f53b1f1f0 100644 --- a/payments-core/src/main/java/com/stripe/android/StripeKtx.kt +++ b/payments-core/src/main/java/com/stripe/android/StripeKtx.kt @@ -8,7 +8,7 @@ import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.exception.StripeException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.AccountParams import com.stripe.android.model.BankAccountTokenParams diff --git a/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt b/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt index 89ed23471c0..912f081af12 100644 --- a/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt +++ b/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt @@ -16,7 +16,7 @@ import com.stripe.android.core.networking.AnalyticsRequestExecutor import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.networking.DefaultAnalyticsRequestExecutor import com.stripe.android.core.networking.RetryDelaySupplier -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.ConfirmPaymentIntentParams import com.stripe.android.model.ConfirmSetupIntentParams import com.stripe.android.model.ConfirmStripeIntentParams diff --git a/payments-core/src/main/java/com/stripe/android/exception/MaxRetryReachedException.kt b/payments-core/src/main/java/com/stripe/android/exception/MaxRetryReachedException.kt deleted file mode 100644 index 19b1dd67f25..00000000000 --- a/payments-core/src/main/java/com/stripe/android/exception/MaxRetryReachedException.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.stripe.android.exception - -import com.stripe.android.core.exception.StripeException - -/** - * An [Exception] that represents max retry is reached when making a request. - */ -internal class MaxRetryReachedException(message: String? = null) : - StripeException(message = message) diff --git a/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt b/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt index 2e82c653f6a..f41542ece55 100644 --- a/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt +++ b/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt @@ -32,10 +32,10 @@ import com.stripe.android.core.networking.StripeNetworkClient import com.stripe.android.core.networking.StripeResponse import com.stripe.android.core.networking.responseJson import com.stripe.android.core.version.StripeSdkVersion -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException -import com.stripe.android.exception.PermissionException -import com.stripe.android.exception.RateLimitException +import com.stripe.android.core.exception.PermissionException +import com.stripe.android.core.exception.RateLimitException import com.stripe.android.model.BankConnectionsLinkedAccountSession import com.stripe.android.model.BankStatuses import com.stripe.android.model.CardMetadata diff --git a/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt b/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt index f35f4077294..2247f1e81f5 100644 --- a/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt +++ b/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt @@ -7,7 +7,7 @@ import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.BankConnectionsLinkedAccountSession import com.stripe.android.model.BankStatuses diff --git a/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt b/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt index 8307a1846bd..af82c6e91d5 100644 --- a/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt +++ b/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt @@ -12,7 +12,7 @@ import com.stripe.android.core.injection.IOContext import com.stripe.android.core.injection.PUBLISHABLE_KEY import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.networking.RetryDelaySupplier -import com.stripe.android.exception.MaxRetryReachedException +import com.stripe.android.core.exception.MaxRetryReachedException import com.stripe.android.model.PaymentIntent import com.stripe.android.model.SetupIntent import com.stripe.android.model.StripeIntent diff --git a/payments-core/src/test/java/com/stripe/android/PaymentRelayStarterTest.kt b/payments-core/src/test/java/com/stripe/android/PaymentRelayStarterTest.kt index 5dd22dd87cb..f8fcabc9cb3 100644 --- a/payments-core/src/test/java/com/stripe/android/PaymentRelayStarterTest.kt +++ b/payments-core/src/test/java/com/stripe/android/PaymentRelayStarterTest.kt @@ -5,7 +5,7 @@ import androidx.activity.ComponentActivity import com.google.common.truth.Truth.assertThat import com.stripe.android.core.exception.APIException import com.stripe.android.core.exception.InvalidRequestException -import com.stripe.android.exception.PermissionException +import com.stripe.android.core.exception.PermissionException import com.stripe.android.model.PaymentIntentFixtures import com.stripe.android.model.SetupIntentFixtures import com.stripe.android.model.SourceFixtures diff --git a/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt b/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt index 262850b3a33..dad48f0d8d1 100644 --- a/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt +++ b/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt @@ -5,7 +5,7 @@ import com.google.common.truth.Truth.assertThat import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.exception.AuthenticationException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.PaymentIntent import com.stripe.android.model.SetupIntent import com.stripe.android.model.Source diff --git a/payments-core/src/test/java/com/stripe/android/StripeTest.java b/payments-core/src/test/java/com/stripe/android/StripeTest.java index f70cd82bf7b..3e22955584c 100644 --- a/payments-core/src/test/java/com/stripe/android/StripeTest.java +++ b/payments-core/src/test/java/com/stripe/android/StripeTest.java @@ -9,7 +9,7 @@ import com.stripe.android.core.networking.AnalyticsRequestExecutor; import com.stripe.android.core.networking.DefaultStripeNetworkClient; import com.stripe.android.core.version.StripeSdkVersion; -import com.stripe.android.exception.AuthenticationException; +import com.stripe.android.core.exception.AuthenticationException; import com.stripe.android.exception.CardException; import com.stripe.android.core.exception.InvalidRequestException; import com.stripe.android.core.exception.StripeException; diff --git a/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt b/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt index 234fd0bd444..268c76016d0 100644 --- a/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt +++ b/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt @@ -7,7 +7,7 @@ import com.stripe.android.PaymentIntentResult import com.stripe.android.StripeIntentResult import com.stripe.android.core.Logger import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.exception.MaxRetryReachedException +import com.stripe.android.core.exception.MaxRetryReachedException import com.stripe.android.model.PaymentIntentFixtures import com.stripe.android.networking.StripeRepository import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/payments-core/src/test/java/com/stripe/android/view/PaymentRelayActivityTest.kt b/payments-core/src/test/java/com/stripe/android/view/PaymentRelayActivityTest.kt index eb0cc1d5994..20d928a092c 100644 --- a/payments-core/src/test/java/com/stripe/android/view/PaymentRelayActivityTest.kt +++ b/payments-core/src/test/java/com/stripe/android/view/PaymentRelayActivityTest.kt @@ -7,7 +7,7 @@ import com.google.common.truth.Truth.assertThat import com.stripe.android.PaymentRelayContract import com.stripe.android.PaymentRelayStarter import com.stripe.android.StripeErrorFixtures -import com.stripe.android.exception.PermissionException +import com.stripe.android.core.exception.PermissionException import com.stripe.android.model.PaymentIntentFixtures import com.stripe.android.payments.PaymentFlowResult import org.junit.Test diff --git a/payments-core/src/main/java/com/stripe/android/exception/AuthenticationException.kt b/stripe-core/src/main/java/com/stripe/android/core/exception/AuthenticationException.kt similarity index 65% rename from payments-core/src/main/java/com/stripe/android/exception/AuthenticationException.kt rename to stripe-core/src/main/java/com/stripe/android/core/exception/AuthenticationException.kt index 9bf0184077e..f311344376d 100644 --- a/payments-core/src/main/java/com/stripe/android/exception/AuthenticationException.kt +++ b/stripe-core/src/main/java/com/stripe/android/core/exception/AuthenticationException.kt @@ -1,7 +1,7 @@ -package com.stripe.android.exception +package com.stripe.android.core.exception +import androidx.annotation.RestrictTo import com.stripe.android.core.StripeError -import com.stripe.android.core.exception.StripeException import java.net.HttpURLConnection /** @@ -9,7 +9,7 @@ import java.net.HttpURLConnection * * [Errors](https://stripe.com/docs/api/errors) */ -class AuthenticationException internal constructor( +class AuthenticationException @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) constructor( stripeError: StripeError, requestId: String? = null ) : StripeException( diff --git a/stripe-core/src/main/java/com/stripe/android/core/exception/MaxRetryReachedException.kt b/stripe-core/src/main/java/com/stripe/android/core/exception/MaxRetryReachedException.kt new file mode 100644 index 00000000000..afed45abfd4 --- /dev/null +++ b/stripe-core/src/main/java/com/stripe/android/core/exception/MaxRetryReachedException.kt @@ -0,0 +1,10 @@ +package com.stripe.android.core.exception + +import androidx.annotation.RestrictTo + +/** + * An [Exception] that represents max retry is reached when making a request. + */ +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +class MaxRetryReachedException(message: String? = null) : + StripeException(message = message) diff --git a/payments-core/src/main/java/com/stripe/android/exception/PermissionException.kt b/stripe-core/src/main/java/com/stripe/android/core/exception/PermissionException.kt similarity index 80% rename from payments-core/src/main/java/com/stripe/android/exception/PermissionException.kt rename to stripe-core/src/main/java/com/stripe/android/core/exception/PermissionException.kt index 9073672efdf..35558d01371 100644 --- a/payments-core/src/main/java/com/stripe/android/exception/PermissionException.kt +++ b/stripe-core/src/main/java/com/stripe/android/core/exception/PermissionException.kt @@ -1,7 +1,6 @@ -package com.stripe.android.exception +package com.stripe.android.core.exception import com.stripe.android.core.StripeError -import com.stripe.android.core.exception.StripeException import java.net.HttpURLConnection /** diff --git a/payments-core/src/main/java/com/stripe/android/exception/RateLimitException.kt b/stripe-core/src/main/java/com/stripe/android/core/exception/RateLimitException.kt similarity index 83% rename from payments-core/src/main/java/com/stripe/android/exception/RateLimitException.kt rename to stripe-core/src/main/java/com/stripe/android/core/exception/RateLimitException.kt index f92266d1237..650ca7dec4b 100644 --- a/payments-core/src/main/java/com/stripe/android/exception/RateLimitException.kt +++ b/stripe-core/src/main/java/com/stripe/android/core/exception/RateLimitException.kt @@ -1,7 +1,6 @@ -package com.stripe.android.exception +package com.stripe.android.core.exception import com.stripe.android.core.StripeError -import com.stripe.android.core.exception.StripeException import com.stripe.android.core.networking.HTTP_TOO_MANY_REQUESTS /** From c7208be8c452b3805a732d3fd718545905c00ebf Mon Sep 17 00:00:00 2001 From: Carlos Munoz Date: Thu, 31 Mar 2022 11:41:54 -0700 Subject: [PATCH 2/4] Detekt fixes. --- .../src/main/java/com/stripe/android/PaymentController.kt | 2 +- payments-core/src/main/java/com/stripe/android/Stripe.kt | 2 +- payments-core/src/main/java/com/stripe/android/StripeKtx.kt | 2 +- .../main/java/com/stripe/android/StripePaymentController.kt | 2 +- .../com/stripe/android/networking/StripeApiRepository.kt | 6 +++--- .../java/com/stripe/android/networking/StripeRepository.kt | 2 +- .../stripe/android/payments/PaymentFlowResultProcessor.kt | 2 +- .../src/test/java/com/stripe/android/StripeKtxTest.kt | 2 +- .../payments/PaymentIntentFlowResultProcessorTest.kt | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/payments-core/src/main/java/com/stripe/android/PaymentController.kt b/payments-core/src/main/java/com/stripe/android/PaymentController.kt index 79bfc6b07c1..cc78d306c28 100644 --- a/payments-core/src/main/java/com/stripe/android/PaymentController.kt +++ b/payments-core/src/main/java/com/stripe/android/PaymentController.kt @@ -8,9 +8,9 @@ import androidx.activity.result.ActivityResultLauncher import androidx.fragment.app.Fragment import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.ConfirmPaymentIntentParams import com.stripe.android.model.ConfirmStripeIntentParams import com.stripe.android.model.PaymentIntent diff --git a/payments-core/src/main/java/com/stripe/android/Stripe.kt b/payments-core/src/main/java/com/stripe/android/Stripe.kt index 2c0b400c53b..7971acec06c 100644 --- a/payments-core/src/main/java/com/stripe/android/Stripe.kt +++ b/payments-core/src/main/java/com/stripe/android/Stripe.kt @@ -14,12 +14,12 @@ import com.stripe.android.core.ApiVersion import com.stripe.android.core.Logger import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.exception.StripeException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.version.StripeSdkVersion -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.AccountParams import com.stripe.android.model.BankAccount diff --git a/payments-core/src/main/java/com/stripe/android/StripeKtx.kt b/payments-core/src/main/java/com/stripe/android/StripeKtx.kt index 64f53b1f1f0..c82fec4b0c5 100644 --- a/payments-core/src/main/java/com/stripe/android/StripeKtx.kt +++ b/payments-core/src/main/java/com/stripe/android/StripeKtx.kt @@ -4,11 +4,11 @@ import android.content.Intent import androidx.annotation.Size import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.exception.StripeException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.AccountParams import com.stripe.android.model.BankAccountTokenParams diff --git a/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt b/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt index 912f081af12..d2dc642513f 100644 --- a/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt +++ b/payments-core/src/main/java/com/stripe/android/StripePaymentController.kt @@ -10,13 +10,13 @@ import com.google.android.instantapps.InstantApps import com.stripe.android.core.Logger import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.exception.StripeException import com.stripe.android.core.networking.AnalyticsRequestExecutor import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.networking.DefaultAnalyticsRequestExecutor import com.stripe.android.core.networking.RetryDelaySupplier -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.ConfirmPaymentIntentParams import com.stripe.android.model.ConfirmSetupIntentParams import com.stripe.android.model.ConfirmStripeIntentParams diff --git a/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt b/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt index f41542ece55..37fdaf52b3b 100644 --- a/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt +++ b/payments-core/src/main/java/com/stripe/android/networking/StripeApiRepository.kt @@ -12,7 +12,10 @@ import com.stripe.android.core.ApiVersion import com.stripe.android.core.Logger import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException +import com.stripe.android.core.exception.PermissionException +import com.stripe.android.core.exception.RateLimitException import com.stripe.android.core.exception.StripeException import com.stripe.android.core.injection.IOContext import com.stripe.android.core.injection.PUBLISHABLE_KEY @@ -32,10 +35,7 @@ import com.stripe.android.core.networking.StripeNetworkClient import com.stripe.android.core.networking.StripeResponse import com.stripe.android.core.networking.responseJson import com.stripe.android.core.version.StripeSdkVersion -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException -import com.stripe.android.core.exception.PermissionException -import com.stripe.android.core.exception.RateLimitException import com.stripe.android.model.BankConnectionsLinkedAccountSession import com.stripe.android.model.BankStatuses import com.stripe.android.model.CardMetadata diff --git a/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt b/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt index 2247f1e81f5..da5b3d6298e 100644 --- a/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt +++ b/payments-core/src/main/java/com/stripe/android/networking/StripeRepository.kt @@ -5,9 +5,9 @@ import androidx.annotation.VisibleForTesting import com.stripe.android.cards.Bin import com.stripe.android.core.exception.APIConnectionException import com.stripe.android.core.exception.APIException +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.exception.CardException import com.stripe.android.model.BankConnectionsLinkedAccountSession import com.stripe.android.model.BankStatuses diff --git a/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt b/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt index af82c6e91d5..64f33b43251 100644 --- a/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt +++ b/payments-core/src/main/java/com/stripe/android/payments/PaymentFlowResultProcessor.kt @@ -8,11 +8,11 @@ import com.stripe.android.StripeIntentResult import com.stripe.android.StripeIntentResult.Outcome.Companion.SUCCEEDED import com.stripe.android.core.Logger import com.stripe.android.core.exception.InvalidRequestException +import com.stripe.android.core.exception.MaxRetryReachedException import com.stripe.android.core.injection.IOContext import com.stripe.android.core.injection.PUBLISHABLE_KEY import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.networking.RetryDelaySupplier -import com.stripe.android.core.exception.MaxRetryReachedException import com.stripe.android.model.PaymentIntent import com.stripe.android.model.SetupIntent import com.stripe.android.model.StripeIntent diff --git a/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt b/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt index dad48f0d8d1..1894eaa8ddb 100644 --- a/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt +++ b/payments-core/src/test/java/com/stripe/android/StripeKtxTest.kt @@ -2,10 +2,10 @@ package com.stripe.android import android.content.Intent import com.google.common.truth.Truth.assertThat +import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.core.exception.InvalidRequestException import com.stripe.android.core.model.StripeModel import com.stripe.android.core.networking.ApiRequest -import com.stripe.android.core.exception.AuthenticationException import com.stripe.android.model.PaymentIntent import com.stripe.android.model.SetupIntent import com.stripe.android.model.Source diff --git a/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt b/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt index 268c76016d0..6ce4ad007d5 100644 --- a/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt +++ b/payments-core/src/test/java/com/stripe/android/payments/PaymentIntentFlowResultProcessorTest.kt @@ -6,8 +6,8 @@ import com.stripe.android.ApiKeyFixtures import com.stripe.android.PaymentIntentResult import com.stripe.android.StripeIntentResult import com.stripe.android.core.Logger -import com.stripe.android.core.networking.ApiRequest import com.stripe.android.core.exception.MaxRetryReachedException +import com.stripe.android.core.networking.ApiRequest import com.stripe.android.model.PaymentIntentFixtures import com.stripe.android.networking.StripeRepository import kotlinx.coroutines.ExperimentalCoroutinesApi From 278e6f0c7f9d3f9fda38e420c8ae7c22d70792d3 Mon Sep 17 00:00:00 2001 From: Carlos Munoz Date: Thu, 31 Mar 2022 11:56:15 -0700 Subject: [PATCH 3/4] Regenerates APIs. --- payments-core/api/payments-core.api | 17 ----------------- stripe-core/api/stripe-core.api | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/payments-core/api/payments-core.api b/payments-core/api/payments-core.api index 5c26489ef56..09d4ff0d40e 100644 --- a/payments-core/api/payments-core.api +++ b/payments-core/api/payments-core.api @@ -904,10 +904,6 @@ public final class com/stripe/android/cards/CardNumber$Unvalidated : com/stripe/ public fun toString ()Ljava/lang/String; } -public final class com/stripe/android/exception/AuthenticationException : com/stripe/android/core/exception/StripeException { - public static final field $stable I -} - public final class com/stripe/android/exception/CardException : com/stripe/android/core/exception/StripeException { public static final field $stable I public fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V @@ -918,19 +914,6 @@ public final class com/stripe/android/exception/CardException : com/stripe/andro public final fun getParam ()Ljava/lang/String; } -public final class com/stripe/android/exception/PermissionException : com/stripe/android/core/exception/StripeException { - public static final field $stable I - public fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V - public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V -} - -public final class com/stripe/android/exception/RateLimitException : com/stripe/android/core/exception/StripeException { - public static final field $stable I - public fun ()V - public fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V - public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V -} - public final class com/stripe/android/googlepaylauncher/DefaultGooglePayRepository_Factory : dagger/internal/Factory { public fun (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lcom/stripe/android/googlepaylauncher/DefaultGooglePayRepository_Factory; diff --git a/stripe-core/api/stripe-core.api b/stripe-core/api/stripe-core.api index 19ad1c46683..c5414ac24e7 100644 --- a/stripe-core/api/stripe-core.api +++ b/stripe-core/api/stripe-core.api @@ -60,6 +60,11 @@ public final class com/stripe/android/core/exception/APIException : com/stripe/a public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V } +public final class com/stripe/android/core/exception/AuthenticationException : com/stripe/android/core/exception/StripeException { + public static final field $stable I + public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +} + public final class com/stripe/android/core/exception/InvalidRequestException : com/stripe/android/core/exception/StripeException { public static final field $stable I public fun ()V @@ -67,6 +72,19 @@ public final class com/stripe/android/core/exception/InvalidRequestException : c public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V } +public final class com/stripe/android/core/exception/PermissionException : com/stripe/android/core/exception/StripeException { + public static final field $stable I + public fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V + public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +} + +public final class com/stripe/android/core/exception/RateLimitException : com/stripe/android/core/exception/StripeException { + public static final field $stable I + public fun ()V + public fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V + public synthetic fun (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V +} + public abstract class com/stripe/android/core/exception/StripeException : java/lang/Exception { public static final field $stable I public static final field Companion Lcom/stripe/android/core/exception/StripeException$Companion; From b45c3fa078e26e98119e0509be0ce9258bccba60 Mon Sep 17 00:00:00 2001 From: Carlos Munoz Date: Thu, 31 Mar 2022 12:37:06 -0700 Subject: [PATCH 4/4] Updates CHANGELOG.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7842b0469c..0cd110108ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ This release patches a crash with payment launcher when there is a configuration ### Payments * [FIXED] [4776](https://github.com/stripe/stripe-android/pull/4776) fix issue with PaymentLauncher configuration change -* [CHANGED] [4358](https://github.com/stripe/stripe-android/pull/4358) Updated the card element on PaymentSheet to use Compose. +* [CHANGED] [4358](https://github.com/stripe/stripe-android/pull/4358) Updated the card element on + PaymentSheet to use Compose. +* [CHANGED] [4800](https://github.com/stripe/stripe-android/pull/4800) Relocated network exceptions + to :stripe-core. ## 19.3.1 - 2022-03-22 This release patches an issue with 3ds2 confirmation