Mark code using Card for card object creation as @deprecated (#2681)

stripe · Aug 3, 2020 · da97e5f · da97e5f
1 parent 035b688
commit da97e5f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/stripe/src/main/java/com/stripe/android/Stripe.kt b/stripe/src/main/java/com/stripe/android/Stripe.kt
@@ -1226,6 +1226,7 @@ class Stripe internal constructor(
      * By default, will use the Connect account that was used to instantiate the `Stripe` object, if specified.
      * @param callback a [ApiResultCallback] to receive the result or error
      */
+    @Deprecated("Use createCardToken(CardParams)")
     @UiThread
     @JvmOverloads
     fun createCardToken(
@@ -1290,6 +1291,7 @@ class Stripe internal constructor(
      * @throws APIException any other type of problem (for instance, a temporary issue with
      * Stripe's servers
      */
+    @Deprecated("Use createCardTokenSynchronous(CardParams)")
     @Throws(AuthenticationException::class, InvalidRequestException::class,
         APIConnectionException::class, CardException::class, APIException::class)
     @WorkerThread

diff --git a/stripe/src/main/java/com/stripe/android/model/Card.kt b/stripe/src/main/java/com/stripe/android/model/Card.kt
@@ -17,11 +17,13 @@ data class Card internal constructor(
     /**
      * the [number] of this card
      */
+    @Deprecated("Use CardParams")
     val number: String?,
 
     /**
      * the [cvc] for this card
      */
+    @Deprecated("Use CardParams")
     val cvc: String?,
 
     /**
@@ -225,6 +227,7 @@ data class Card internal constructor(
     /**
      * @return a [Card.Builder] populated with the fields of this [Card] instance
      */
+    @Deprecated("Use CardParams")
     fun toBuilder(): Builder {
         return Builder(number, expMonth, expYear, cvc)
             .name(name)
@@ -360,6 +363,7 @@ data class Card internal constructor(
      * @param expYear the expiry year
      * @param cvc the card CVC number
      */
+    @Deprecated("Use CardParams")
     class Builder(
         internal val number: String? = null,
         @param:IntRange(from = 1, to = 12) internal val expMonth: Int? = null,
@@ -377,8 +381,10 @@ data class Card internal constructor(
         private var addressCountry: String? = null
         private var brand: CardBrand? = null
         private var funding: CardFunding? = null
+
         @Size(4)
         private var last4: String? = null
+
         private var fingerprint: String? = null
         private var country: String? = null
         private var currency: String? = null

diff --git a/stripe/src/main/java/com/stripe/android/model/SourceParams.kt b/stripe/src/main/java/com/stripe/android/model/SourceParams.kt
@@ -649,6 +649,7 @@ class SourceParams private constructor(
          *
          * @see [Card Payments with Sources](https://stripe.com/docs/sources/cards)
          */
+        @Deprecated("Use createCardParams with CardParams argument.")
         @JvmStatic
         fun createCardParams(card: Card): SourceParams {
             return SourceParams(SourceType.CARD, card.loggingTokens)

diff --git a/stripe/src/main/java/com/stripe/android/view/CardInputWidget.kt b/stripe/src/main/java/com/stripe/android/view/CardInputWidget.kt
@@ -170,7 +170,7 @@ class CardInputWidget @JvmOverloads constructor(
      */
     override val paymentMethodCard: PaymentMethodCreateParams.Card?
         get() {
-            return card?.let {
+            return cardParams?.let {
                 PaymentMethodCreateParams.Card(
                     number = it.number,
                     cvc = it.cvc,
@@ -207,6 +207,7 @@ class CardInputWidget @JvmOverloads constructor(
      * A [Card] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     override val card: Card?
         get() {
             return cardBuilder?.build()
@@ -275,6 +276,7 @@ class CardInputWidget @JvmOverloads constructor(
      * A [Card.Builder] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     override val cardBuilder: Card.Builder?
         get() {
             val cardNumber = cardNumberEditText.cardNumber

diff --git a/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.kt b/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.kt
@@ -122,7 +122,7 @@ class CardMultilineWidget @JvmOverloads constructor(
      */
     override val paymentMethodCard: PaymentMethodCreateParams.Card?
         get() {
-            return card?.let {
+            return cardParams?.let {
                 PaymentMethodCreateParams.Card(
                     number = it.number,
                     cvc = it.cvc,
@@ -172,6 +172,7 @@ class CardMultilineWidget @JvmOverloads constructor(
      * A [Card] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     override val card: Card?
         get() {
             return cardBuilder?.build()
@@ -211,6 +212,7 @@ class CardMultilineWidget @JvmOverloads constructor(
      * A [Card.Builder] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     override val cardBuilder: Card.Builder?
         get() {
             if (!validateAllFields()) {

diff --git a/stripe/src/main/java/com/stripe/android/view/CardWidget.kt b/stripe/src/main/java/com/stripe/android/view/CardWidget.kt
@@ -11,6 +11,7 @@ internal interface CardWidget {
      * A [Card] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     val card: Card?
 
     /**
@@ -23,6 +24,7 @@ internal interface CardWidget {
      * A [Card.Builder] representing the card details and postal code if all fields are valid;
      * otherwise `null`
      */
+    @Deprecated("Use cardParams", ReplaceWith("cardParams"))
     val cardBuilder: Card.Builder?
 
     /**