Skip to content

Apply Fix for cancel issue #40

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

Open
mahmoudashrafmohamed wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply Fix for cancel issue #40

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions sdk/src/main/java/com/moyasar/android/sdk/samsungpay/presentation/SamsungPayFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,18 @@ class SamsungPayFragment : Fragment() {
SamsungPayManager.initiate(
requireActivity(),
paymentRequest,
onCanceled = {
MoyasarAppContainer.viewModel.notifyPaymentResult(PaymentResult.Canceled)
},
authorizePayment = { token, orderNumber ->
if (token != null && orderNumber != null) {
progressBar.show()
SamsungPayManager.authorizePayment(token, orderNumber)
} else {
MoyasarAppContainer.viewModel.notifyPaymentResult(
PaymentResult.Failed(Throwable("Something went wrong."))
)
}
else MoyasarAppContainer.viewModel.notifyPaymentResult(PaymentResult.Failed(
Throwable("Something went wrong.")))
}
)

Expand Down
8 changes: 8 additions & 0 deletions sdk/src/main/java/com/moyasar/android/sdk/samsungpay/presentation/SamsungPayManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ object SamsungPayManager {
fun initiate(
context: Context,
paymentRequest: PaymentRequest,
onCanceled: () -> Unit = {},
authorizePayment: (String?, String?) -> Unit
) {
val samsungPayConfig = paymentRequest.samsungPay
Expand All @@ -76,6 +77,7 @@ object SamsungPayManager {
paymentRequest,
context,
samsungPay,
onCanceled,
authorizePayment
)
}
Expand Down Expand Up @@ -173,6 +175,7 @@ object SamsungPayManager {
paymentRequest: PaymentRequest,
context: Context,
samsungPay: SamsungPay,
onCanceled: () -> Unit,
authorizePayment: (String?, String?) -> Unit
) {
val customSheetPaymentInfo = makeCustomSheetPaymentInfo(paymentRequest)
Expand Down Expand Up @@ -224,6 +227,11 @@ object SamsungPayManager {
}

override fun onFailure(errorCode: Int, errorData: Bundle?) {
if (errorCode == ERROR_USER_CANCELED) {
MoyasarLogger.log("MoyasarSDK", "Samsung Pay canceled by user")
onCanceled()
return
}
handleOnFail(errorData ?: Bundle(), samsungPay, context, errorCode)
authorizePayment(null, null)
}
Expand Down
1 change: 1 addition & 0 deletions sdkdriver/src/main/java/com/moyasar/android/sdkdriver/CheckoutViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.moyasar.android.sdk.core.extensions.default
import com.moyasar.android.sdk.core.data.response.PaymentResponse
import com.moyasar.android.sdk.creditcard.data.models.CreditCardNetwork
import com.moyasar.android.sdk.creditcard.data.models.request.PaymentRequest
import com.moyasar.android.sdk.creditcard.data.models.request.PaymentSplit
import com.moyasar.android.sdk.stcpay.presentation.view.fragments.EnterMobileNumberFragment
import com.moyasar.android.sdk.creditcard.presentation.view.fragments.PaymentFragment
import com.moyasar.android.sdk.samsungpay.data.SamsungPayConfig
Expand Down