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

Jump to bottom

fix: crash on onActivityResult if Stripe isn't initalized #255

Merged
merged 1 commit into from
May 22, 2021
Merged

fix: crash on onActivityResult if Stripe isn't initalized #255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 65 additions & 63 deletions android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,86 +44,88 @@ class StripeSdkModule(reactContext: ReactApplicationContext, cardFieldManager: S

private val mActivityEventListener = object : BaseActivityEventListener() {
override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent) {
stripe.onSetupResult(requestCode, data, object : ApiResultCallback<SetupIntentResult> {
override fun onSuccess(result: SetupIntentResult) {
val setupIntent = result.intent
when (setupIntent.status) {
StripeIntent.Status.Succeeded -> {
confirmSetupIntentPromise?.resolve(mapFromSetupIntentResult(setupIntent))
}
StripeIntent.Status.Canceled -> {
val errorMessage = setupIntent.lastSetupError?.message.orEmpty()
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Canceled.toString(), errorMessage)
}
else -> {
val errorMessage = "unhandled error: ${setupIntent.status}"
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Unknown.toString(), errorMessage)
if (::stripe.isInitialized) {
stripe.onSetupResult(requestCode, data, object : ApiResultCallback<SetupIntentResult> {
override fun onSuccess(result: SetupIntentResult) {
val setupIntent = result.intent
when (setupIntent.status) {
StripeIntent.Status.Succeeded -> {
confirmSetupIntentPromise?.resolve(mapFromSetupIntentResult(setupIntent))
}
StripeIntent.Status.Canceled -> {
val errorMessage = setupIntent.lastSetupError?.message.orEmpty()
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Canceled.toString(), errorMessage)
}
else -> {
val errorMessage = "unhandled error: ${setupIntent.status}"
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Unknown.toString(), errorMessage)
}
}
}
}

override fun onError(e: Exception) {
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Failed.toString(), e.message.orEmpty())
}
})
override fun onError(e: Exception) {
confirmSetupIntentPromise?.reject(ConfirmSetupIntentErrorType.Failed.toString(), e.message.orEmpty())
}
})

stripe.onPaymentResult(requestCode, data, object : ApiResultCallback<PaymentIntentResult> {
override fun onSuccess(result: PaymentIntentResult) {
val paymentIntent = result.intent
stripe.onPaymentResult(requestCode, data, object : ApiResultCallback<PaymentIntentResult> {
override fun onSuccess(result: PaymentIntentResult) {
val paymentIntent = result.intent

when (paymentIntent.status) {
StripeIntent.Status.Succeeded,
StripeIntent.Status.Processing,
StripeIntent.Status.RequiresCapture -> {
confirmPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
handleCardActionPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
}
StripeIntent.Status.RequiresAction -> {
if (isPaymentIntentNextActionVoucherBased(paymentIntent.nextActionType)) {
when (paymentIntent.status) {
StripeIntent.Status.Succeeded,
StripeIntent.Status.Processing,
StripeIntent.Status.RequiresCapture -> {
confirmPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
handleCardActionPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
} else {
}
StripeIntent.Status.RequiresAction -> {
if (isPaymentIntentNextActionVoucherBased(paymentIntent.nextActionType)) {
confirmPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
handleCardActionPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
} else {
val errorMessage = paymentIntent.lastPaymentError?.message.orEmpty()
confirmPromise?.reject(ConfirmPaymentErrorType.Canceled.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Canceled.toString(), errorMessage)
}
}
StripeIntent.Status.RequiresPaymentMethod -> {
val errorMessage = paymentIntent.lastPaymentError?.message.orEmpty()
confirmPromise?.reject(ConfirmPaymentErrorType.Failed.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Failed.toString(), errorMessage)
}
StripeIntent.Status.RequiresConfirmation -> {
handleCardActionPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
}
StripeIntent.Status.Canceled -> {
val errorMessage = paymentIntent.lastPaymentError?.message.orEmpty()
confirmPromise?.reject(ConfirmPaymentErrorType.Canceled.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Canceled.toString(), errorMessage)
}
}
StripeIntent.Status.RequiresPaymentMethod -> {
val errorMessage = paymentIntent.lastPaymentError?.message.orEmpty()
confirmPromise?.reject(ConfirmPaymentErrorType.Failed.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Failed.toString(), errorMessage)
}
StripeIntent.Status.RequiresConfirmation -> {
handleCardActionPromise?.resolve(mapFromPaymentIntentResult(paymentIntent))
}
StripeIntent.Status.Canceled -> {
val errorMessage = paymentIntent.lastPaymentError?.message.orEmpty()
confirmPromise?.reject(ConfirmPaymentErrorType.Canceled.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Canceled.toString(), errorMessage)
}
else -> {
val errorMessage = "unhandled error: ${paymentIntent.status}"
confirmPromise?.reject(ConfirmPaymentErrorType.Unknown.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Unknown.toString(), errorMessage)
else -> {
val errorMessage = "unhandled error: ${paymentIntent.status}"
confirmPromise?.reject(ConfirmPaymentErrorType.Unknown.toString(), errorMessage)
handleCardActionPromise?.reject(NextPaymentActionErrorType.Unknown.toString(), errorMessage)
}
}
}
}

override fun onError(e: Exception) {
confirmPromise?.reject(ConfirmPaymentErrorType.Failed.toString(), e.toString())
handleCardActionPromise?.reject(NextPaymentActionErrorType.Failed.toString(), e.toString())
}
})
override fun onError(e: Exception) {
confirmPromise?.reject(ConfirmPaymentErrorType.Failed.toString(), e.toString())
handleCardActionPromise?.reject(NextPaymentActionErrorType.Failed.toString(), e.toString())
}
})

paymentSheetFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
paymentSheetFragment?.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)

try {
val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
if (data?.getParcelableExtra<Parcelable>("extra_activity_result") != null) {
onFpxPaymentMethodResult(result)
try {
val result = AddPaymentMethodActivityStarter.Result.fromIntent(data)
if (data?.getParcelableExtra<Parcelable>("extra_activity_result") != null) {
onFpxPaymentMethodResult(result)
}
} catch (e: java.lang.Exception) {
Log.d("Error", e.localizedMessage)
}
} catch (e: java.lang.Exception) {
Log.d("Error", e.localizedMessage)
}
}
}
Expand Down