Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate network exceptions to :stripe-core. #4800

Merged
merged 4 commits into from
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 0 additions & 17 deletions payments-core/api/payments-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V
Expand All @@ -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 <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V
public synthetic fun <init> (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 <init> ()V
public fun <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
public synthetic fun <init> (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 <init> (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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.model.ConfirmPaymentIntentParams
import com.stripe.android.model.ConfirmStripeIntentParams
import com.stripe.android.model.PaymentIntent
Expand Down
2 changes: 1 addition & 1 deletion payments-core/src/main/java/com/stripe/android/Stripe.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.exception.CardException
import com.stripe.android.model.AccountParams
import com.stripe.android.model.BankAccount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.exception.CardException
import com.stripe.android.model.AccountParams
import com.stripe.android.model.BankAccountTokenParams
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.model.ConfirmPaymentIntentParams
import com.stripe.android.model.ConfirmSetupIntentParams
import com.stripe.android.model.ConfirmStripeIntentParams
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.exception.AuthenticationException
import com.stripe.android.exception.CardException
import com.stripe.android.exception.PermissionException
import com.stripe.android.exception.RateLimitException
import com.stripe.android.model.BankConnectionsLinkedAccountSession
import com.stripe.android.model.BankStatuses
import com.stripe.android.model.CardMetadata
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.exception.CardException
import com.stripe.android.model.BankConnectionsLinkedAccountSession
import com.stripe.android.model.BankStatuses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.MaxRetryReachedException
import com.stripe.android.model.PaymentIntent
import com.stripe.android.model.SetupIntent
import com.stripe.android.model.StripeIntent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.AuthenticationException
import com.stripe.android.model.PaymentIntent
import com.stripe.android.model.SetupIntent
import com.stripe.android.model.Source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.exception.MaxRetryReachedException
import com.stripe.android.core.networking.ApiRequest
import com.stripe.android.exception.MaxRetryReachedException
import com.stripe.android.model.PaymentIntentFixtures
import com.stripe.android.networking.StripeRepository
import kotlinx.coroutines.ExperimentalCoroutinesApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions stripe-core/api/stripe-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,31 @@ public final class com/stripe/android/core/exception/APIException : com/stripe/a
public synthetic fun <init> (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 <init> (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 <init> ()V
public fun <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;ILjava/lang/String;Ljava/lang/Throwable;)V
public synthetic fun <init> (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 <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;)V
public synthetic fun <init> (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 <init> ()V
public fun <init> (Lcom/stripe/android/core/StripeError;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
public synthetic fun <init> (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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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

/**
* No valid API key provided.
*
* [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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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

/**
Expand Down