Skip to content
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: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.


## [1.25.2] - 2025-04-14
### Added
- Flexibility to display the desired card brand scheme for card brand choice.

## [1.25.1] - 2025-01-09
### Fixed
- Fixed `onChange` listener not firing in card brand choice dropdown selection.
Expand Down
2 changes: 1 addition & 1 deletion Skyflow/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ext {
mGroupId = "com.skyflowapi.android"
mArtifactId = "skyflow-android-sdk"
mVersionCode = 1
mVersionName = "1.25.1"
mVersionName = "1.25.1-dev.56c1004"

mLibraryName = "skyflow-android"
mLibraryDescription = "Skyflow’s android SDK can be used to securely collect, tokenize, and display sensitive data in the mobile without exposing your front-end infrastructure to sensitive data."
Expand Down
11 changes: 8 additions & 3 deletions Skyflow/src/main/kotlin/Skyflow/TextField.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ class TextField @JvmOverloads constructor(
null
)
drawableIcon = copyIcon
drawableRight = drawableIcon
}, 2000) // 2000 milliseconds = 2 seconds
}
}
Expand Down Expand Up @@ -319,9 +320,13 @@ class TextField @JvmOverloads constructor(
isCardMetadataUpdated = true
this.options.cardMetadata = updateCollectOptions.cardMetadata
this.setupField(this.collectInput, this.options)
if (updateCollectOptions.cardMetadata.scheme.size < 2) {
invokeUserOnChangeListener()
}

val defaultCardType = if (this.options.cardMetadata.scheme.size > 1)
this.options.cardMetadata.scheme[0]
else cardType
updateCardChoice(defaultCardType, true)
changeCardIcon(defaultCardType)
invokeUserOnChangeListener()
}

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
Expand Down
14 changes: 10 additions & 4 deletions Skyflow/src/test/java/com/Skyflow/CollectTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1584,10 +1584,16 @@ class CollectTest {
val cardNumber = container.create(activity, collectInput, options)
cardNumber.onAttachedToWindow()

var scheme = arrayOf<CardType>()
cardNumber.on(EventName.CHANGE) { state ->
val value = state.get("value")
val cards = getCardSchemes(value.toString().length)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(cards)))
val value = state.getString("value")
if (value.length < 8 && scheme.isNotEmpty()) {
scheme = arrayOf(CardType.CARTES_BANCAIRES)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(scheme)))
} else if (value.length >= 8 && scheme.isEmpty()) {
scheme = getCardSchemes(value.length)
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(scheme)))
}
}

var state = StateforText(cardNumber)
Expand All @@ -1598,7 +1604,7 @@ class CollectTest {
state = StateforText(cardNumber)
Assert.assertTrue(state.getInternalState().getBoolean("isRequired"))
Assert.assertNotNull(cardNumber.inputField.compoundDrawablesRelative[2])
Assert.assertEquals(CardType.MASTERCARD, cardNumber.cardType)
Assert.assertEquals(CardType.CARTES_BANCAIRES, cardNumber.cardType)
}
}

Expand Down
5 changes: 4 additions & 1 deletion samples/src/main/java/com/Skyflow/CardBrandChoiceActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@ class CardBrandChoiceActivity : AppCompatActivity() {
}

var scheme = arrayOf<CardType>()
var calledUpdate = false
cardNumber.on(EventName.CHANGE) { state ->
Log.d(TAG, "change: state $state")
val value = state.getString("value")
if (value.length < 8 && scheme.isNotEmpty()) {
scheme = arrayOf()
cardNumber.update(CollectElementOptions(cardMetadata = CardMetadata(scheme)))
} else if (value.length >= 8 && scheme.isEmpty()) {
calledUpdate = false
} else if (value.length >= 8 && scheme.isEmpty() && !calledUpdate) {
binLookup(value, object : Callback {
override fun onSuccess(responseBody: Any) {
scheme = getCardSchemes(responseBody as JSONArray)
Expand All @@ -132,6 +134,7 @@ class CardBrandChoiceActivity : AppCompatActivity() {
println(exception)
}
})
calledUpdate = true
}
}

Expand Down
Loading