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.

Sign up for GitHub

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

Bump Terminal SDK to 4.0.0 #847

Merged
merged 14 commits into from
Dec 17, 2024
Merged

Bump Terminal SDK to 4.0.0 #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0129d24
Apply android sdk 4.0.0 change
tim-lin-bbpos Nov 7, 2024
47e1136
Apply ios sdk 4.0.0 change
tim-lin-bbpos Nov 8, 2024
be312b6
Refine and fix test
tim-lin-bbpos Nov 9, 2024
4a030e2
Fix listener issue
tim-lin-bbpos Nov 11, 2024
2aa9453
Fix comment
tim-lin-bbpos Nov 12, 2024
abba49e
Expose DisconnectReason
tim-lin-bbpos Nov 12, 2024
0469d79
Align naming from storedAt to storedAtMs
tim-lin-bbpos Nov 14, 2024
df7954a
Update listener structure
tim-lin-bbpos Nov 14, 2024
96f8dc9
refine bridge interface
tim-lin-bbpos Nov 15, 2024
06c757a
Add parameter
tim-lin-bbpos Nov 20, 2024
9f0e9f1
Update ui for allowRedisplay
tim-lin-bbpos Nov 28, 2024
c3a085c
Add default value
tim-lin-bbpos Dec 2, 2024
d6c44f2
Add missing error string
tim-lin-bbpos Dec 3, 2024
90ef859
Fix ios ci
tim-lin-bbpos Dec 16, 2024
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: 3 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def getExtOrIntegerDefault(name) {
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['StripeTerminalReactNative_' + name]).toInteger()
}

def terminalAndroidSdkVersion = '3.10.1'

def terminalAndroidSdkVersion = '4.0.0'
def reactNativeSdkVersion = getVersionFromNpm()

android {
Expand Down Expand Up @@ -140,7 +141,7 @@ dependencies {
api 'com.facebook.react:react-android:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.stripe:stripeterminal-core:$terminalAndroidSdkVersion"
implementation "com.stripe:stripeterminal-localmobile:$terminalAndroidSdkVersion"
implementation "com.stripe:stripeterminal-taptopay:$terminalAndroidSdkVersion"
implementation "com.stripe:stripeterminal-handoffclient:$terminalAndroidSdkVersion"
implementation 'com.google.code.gson:gson:2.3.1'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/stripeterminalreactnative/DiscoveryMethod.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.stripeterminalreactnative
enum class DiscoveryMethod {
BLUETOOTH_SCAN,
INTERNET,
LOCAL_MOBILE,
TAP_TO_PAY,
HANDOFF,
USB
}
3 changes: 1 addition & 2 deletions android/src/main/java/com/stripeterminalreactnative/Errors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package com.stripeterminalreactnative
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.WritableMap
import com.stripe.stripeterminal.external.models.TerminalErrorCode
import com.stripe.stripeterminal.external.models.TerminalException
import com.stripe.stripeterminal.external.models.TerminalException.TerminalErrorCode
import kotlinx.coroutines.CancellationException
import kotlin.jvm.Throws

internal fun createError(throwable: Throwable): ReadableMap = nativeMapOf { putError(throwable) }

Expand Down
63 changes: 38 additions & 25 deletions android/src/main/java/com/stripeterminalreactnative/Mappers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ import com.facebook.react.bridge.WritableNativeArray
import com.stripe.stripeterminal.external.CollectInputs
import com.stripe.stripeterminal.external.OfflineMode
import com.stripe.stripeterminal.external.models.Address
import com.stripe.stripeterminal.external.models.AllowRedisplay
import com.stripe.stripeterminal.external.models.AmountDetails
import com.stripe.stripeterminal.external.models.BatteryStatus
import com.stripe.stripeterminal.external.models.CardDetails
import com.stripe.stripeterminal.external.models.CardPresentDetails
import com.stripe.stripeterminal.external.models.CartLineItem
import com.stripe.stripeterminal.external.models.Charge
import com.stripe.stripeterminal.external.models.CollectDataType
import com.stripe.stripeterminal.external.models.CollectedData
import com.stripe.stripeterminal.external.models.CollectInputsResult
import com.stripe.stripeterminal.external.models.CollectedData
import com.stripe.stripeterminal.external.models.ConnectionStatus
import com.stripe.stripeterminal.external.models.DeviceType
import com.stripe.stripeterminal.external.models.DisconnectReason
import com.stripe.stripeterminal.external.models.EmailResult
import com.stripe.stripeterminal.external.models.LocalMobileUxConfiguration
import com.stripe.stripeterminal.external.models.Location
import com.stripe.stripeterminal.external.models.LocationStatus
import com.stripe.stripeterminal.external.models.NetworkStatus
Expand Down Expand Up @@ -60,6 +60,7 @@ import com.stripe.stripeterminal.external.models.SetupIntentStatus
import com.stripe.stripeterminal.external.models.SetupIntentUsage
import com.stripe.stripeterminal.external.models.SignatureResult
import com.stripe.stripeterminal.external.models.SimulateReaderUpdate
import com.stripe.stripeterminal.external.models.TapToPayUxConfiguration
import com.stripe.stripeterminal.external.models.TextResult
import com.stripe.stripeterminal.external.models.ToggleResult
import com.stripe.stripeterminal.external.models.Wallet
Expand All @@ -72,6 +73,9 @@ internal fun getInt(map: ReadableMap, key: String): Int? =
internal fun getBoolean(map: ReadableMap?, key: String): Boolean =
if (map?.hasKey(key) == true) map.getBoolean(key) else false

internal fun getBoolean(map: ReadableMap?, key: String, defaultValue: Boolean): Boolean =
if (map?.hasKey(key) == true) map.getBoolean(key) else defaultValue

internal fun putDoubleOrNull(mapTarget: WritableMap, key: String, value: Double?) {
value?.let {
mapTarget.putDouble(key, it)
Expand Down Expand Up @@ -143,7 +147,6 @@ internal fun mapFromDeviceType(type: DeviceType): String {
return when (type) {
DeviceType.CHIPPER_1X -> "chipper1X"
DeviceType.CHIPPER_2X -> "chipper2X"
DeviceType.COTS_DEVICE -> "cotsDevice"
DeviceType.ETNA -> "etna"
DeviceType.STRIPE_M2 -> "stripeM2"
DeviceType.STRIPE_S700 -> "stripeS700"
Expand All @@ -157,14 +160,14 @@ internal fun mapFromDeviceType(type: DeviceType): String {
DeviceType.WISEPAD_3S -> "wisePad3s"
DeviceType.WISEPOS_E -> "wisePosE"
DeviceType.WISEPOS_E_DEVKIT -> "wisePosEDevkit"
DeviceType.TAP_TO_PAY_DEVICE -> "tapToPay"
}
}

internal fun mapToDeviceType(type: String): DeviceType? {
return when (type) {
"chipper1X" -> DeviceType.CHIPPER_1X
"chipper2X" -> DeviceType.CHIPPER_2X
"cotsDevice" -> DeviceType.COTS_DEVICE
"etna" -> DeviceType.ETNA
"stripeM2" -> DeviceType.STRIPE_M2
"stripeS700" -> DeviceType.STRIPE_S700
Expand All @@ -177,6 +180,7 @@ internal fun mapToDeviceType(type: String): DeviceType? {
"wisePad3s" -> DeviceType.WISEPAD_3S
"wisePosE" -> DeviceType.WISEPOS_E
"wisePosEDevkit" -> DeviceType.WISEPOS_E_DEVKIT
"tapToPay" -> DeviceType.TAP_TO_PAY_DEVICE
else -> null
}
}
Expand All @@ -193,13 +197,21 @@ internal fun mapToDiscoveryMethod(method: String?): DiscoveryMethod? {
return when (method) {
"bluetoothScan" -> DiscoveryMethod.BLUETOOTH_SCAN
"internet" -> DiscoveryMethod.INTERNET
"localMobile" -> DiscoveryMethod.LOCAL_MOBILE
"tapToPay" -> DiscoveryMethod.TAP_TO_PAY
"handoff" -> DiscoveryMethod.HANDOFF
"usb" -> DiscoveryMethod.USB
else -> null
}
}

internal fun mapToAllowRedisplay(method: String?): AllowRedisplay {
return when (method) {
"always" -> AllowRedisplay.ALWAYS
"limited" -> AllowRedisplay.LIMITED
else -> AllowRedisplay.UNSPECIFIED
}
}

@OptIn(OfflineMode::class)
internal fun mapFromPaymentIntent(paymentIntent: PaymentIntent, uuid: String): ReadableMap =
nativeMapOf {
Expand Down Expand Up @@ -449,6 +461,7 @@ internal fun mapFromConnectionStatus(status: ConnectionStatus): String {
ConnectionStatus.CONNECTED -> "connected"
ConnectionStatus.NOT_CONNECTED -> "notConnected"
ConnectionStatus.CONNECTING -> "connecting"
ConnectionStatus.DISCOVERING -> "discovering"
}
}

Expand Down Expand Up @@ -492,18 +505,18 @@ internal fun mapFromReaderSoftwareUpdate(update: ReaderSoftwareUpdate?): Writabl
putString("deviceSoftwareVersion", it.version)
putString(
"estimatedUpdateTime",
mapFromUpdateTimeEstimate(it.timeEstimate)
mapFromUpdateTimeEstimate(it.durationEstimate)
)
putString("requiredAt", it.requiredAt.time.toString())
putString("requiredAt", it.requiredAtMs.toString())
}
}

internal fun mapFromUpdateTimeEstimate(time: ReaderSoftwareUpdate.UpdateTimeEstimate): String {
internal fun mapFromUpdateTimeEstimate(time: ReaderSoftwareUpdate.UpdateDurationEstimate): String {
return when (time) {
ReaderSoftwareUpdate.UpdateTimeEstimate.FIVE_TO_FIFTEEN_MINUTES -> "estimate5To15Minutes"
ReaderSoftwareUpdate.UpdateTimeEstimate.LESS_THAN_ONE_MINUTE -> "estimateLessThan1Minute"
ReaderSoftwareUpdate.UpdateTimeEstimate.ONE_TO_TWO_MINUTES -> "estimate1To2Minutes"
ReaderSoftwareUpdate.UpdateTimeEstimate.TWO_TO_FIVE_MINUTES -> "estimate2To5Minutes"
ReaderSoftwareUpdate.UpdateDurationEstimate.FIVE_TO_FIFTEEN_MINUTES -> "estimate5To15Minutes"
ReaderSoftwareUpdate.UpdateDurationEstimate.LESS_THAN_ONE_MINUTE -> "estimateLessThan1Minute"
ReaderSoftwareUpdate.UpdateDurationEstimate.ONE_TO_TWO_MINUTES -> "estimate1To2Minutes"
ReaderSoftwareUpdate.UpdateDurationEstimate.TWO_TO_FIVE_MINUTES -> "estimate2To5Minutes"
}
}

Expand Down Expand Up @@ -659,7 +672,7 @@ private fun mapFromWechatPayDetails(wechatPayDetails: WechatPayDetails?): Readab
private fun mapFromOfflineDetails(offlineDetails: OfflineDetails?): ReadableMap? =
offlineDetails?.let {
nativeMapOf {
putString("storedAt", offlineDetails.storedAt.toString())
putString("storedAtMs", offlineDetails.storedAtMs.toString())
putBoolean("requiresUpload", offlineDetails.requiresUpload)
putMap(
"cardPresentDetails",
Expand Down Expand Up @@ -963,23 +976,23 @@ fun mapFromCollectDataType(type: String): CollectDataType? {
}
}

fun mapToTapZoneIndicator(indicator: String?): LocalMobileUxConfiguration.TapZoneIndicator {
fun mapToTapZoneIndicator(indicator: String?): TapToPayUxConfiguration.TapZoneIndicator {
return when (indicator) {
"default" -> LocalMobileUxConfiguration.TapZoneIndicator.DEFAULT
"above" -> LocalMobileUxConfiguration.TapZoneIndicator.ABOVE
"below" -> LocalMobileUxConfiguration.TapZoneIndicator.BELOW
"front" -> LocalMobileUxConfiguration.TapZoneIndicator.FRONT
"behind" -> LocalMobileUxConfiguration.TapZoneIndicator.BEHIND
else -> LocalMobileUxConfiguration.TapZoneIndicator.DEFAULT
"default" -> TapToPayUxConfiguration.TapZoneIndicator.DEFAULT
"above" -> TapToPayUxConfiguration.TapZoneIndicator.ABOVE
"below" -> TapToPayUxConfiguration.TapZoneIndicator.BELOW
"front" -> TapToPayUxConfiguration.TapZoneIndicator.FRONT
"behind" -> TapToPayUxConfiguration.TapZoneIndicator.BEHIND
else -> TapToPayUxConfiguration.TapZoneIndicator.DEFAULT
}
}

fun mapToDarkMode(mode: String?): LocalMobileUxConfiguration.DarkMode {
fun mapToDarkMode(mode: String?): TapToPayUxConfiguration.DarkMode {
return when (mode) {
"dark" -> LocalMobileUxConfiguration.DarkMode.DARK
"light" -> LocalMobileUxConfiguration.DarkMode.LIGHT
"system" -> LocalMobileUxConfiguration.DarkMode.SYSTEM
else -> LocalMobileUxConfiguration.DarkMode.LIGHT
"dark" -> TapToPayUxConfiguration.DarkMode.DARK
"light" -> TapToPayUxConfiguration.DarkMode.LIGHT
"system" -> TapToPayUxConfiguration.DarkMode.SYSTEM
else -> TapToPayUxConfiguration.DarkMode.LIGHT
}
}

Expand Down
1 change: 0 additions & 1 deletion android/src/main/java/com/stripeterminalreactnative/ReactNativeConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ enum class ReactNativeConstants(val listenerName: String) {
REQUEST_READER_DISPLAY_MESSAGE("didRequestReaderDisplayMessage"),
REQUEST_READER_INPUT("didRequestReaderInput"),
REPORT_AVAILABLE_UPDATE("didReportAvailableUpdate"),
REPORT_UNEXPECTED_READER_DISCONNECT("didReportUnexpectedReaderDisconnect"),
REPORT_UPDATE_PROGRESS("didReportReaderSoftwareUpdateProgress"),
START_INSTALLING_UPDATE("didStartInstallingUpdate"),
UPDATE_DISCOVERED_READERS("didUpdateDiscoveredReaders"),
Expand Down
Loading