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

Fix crash when no bank is selected in AddPaymentMethodActivity #4579

Merged
merged 3 commits into from
Feb 11, 2022
Merged

Fix crash when no bank is selected in AddPaymentMethodActivity #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6b1e64
Fix crash when no bank is selected
brnunes-stripe Feb 11, 2022
47be0b0
Tests
brnunes-stripe Feb 11, 2022
34d6e58
Changelog
brnunes-stripe Feb 11, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* [CHANGED] [4546](https://github.com/stripe/stripe-android/pull/4546) Update to kotlin 1.6
* [FIXED] [4560](https://github.com/stripe/stripe-android/pull/4560) Fix `cardValidCallback` being added multiple times in `CardInputWidget`.
* [FIXED] [4574](https://github.com/stripe/stripe-android/pull/4574) Take `postalCode` into account in `CardMultilineWidget` validation.
* [FIXED] [4579](https://github.com/stripe/stripe-android/pull/4579) Fix crash when no bank is selected in `AddPaymentMethodActivity`.
### PaymentSheet
* [FIXED] [4466](https://github.com/stripe/stripe-android/pull/4466) Fix issues when activities are lost on low resource phones.
* [FIXED] [4557](https://github.com/stripe/stripe-android/pull/4557) Add missing app info to some Stripe API requests
Expand Down
24 changes: 19 additions & 5 deletions example/src/androidTestDebug/java/com/stripe/example/activity/AddFpxPaymentMethodTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ class AddFpxPaymentMethodTest {

@Test
fun launchFpxAndSelectBank() {
launchBankSelector()

// click on first bank in the list
onView(withId(R.id.bank_list)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
)
}

@Test
fun launchFpxAndConfirmWithoutSelectingBank() {
launchBankSelector()

// confirm selection without selecting a bank
onView(withId(R.id.action_save)).perform(click())

// Nothing should happen as no bank was selected
}

private fun launchBankSelector() {
// launch FPX selection activity
onView(withId(R.id.examples)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(11, click())
Expand All @@ -46,10 +65,5 @@ class AddFpxPaymentMethodTest {
// click select payment method button
onView(withId(R.id.select_payment_method_button))
.perform(click())

// click on first bank in the list
onView(withId(R.id.bank_list)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
)
}
}
24 changes: 19 additions & 5 deletions ...e/src/androidTestDebug/java/com/stripe/example/activity/AddNetbankingPaymentMethodTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,25 @@ class AddNetbankingPaymentMethodTest {

@Test
fun launchNetbankingAndSelectBank() {
launchBankSelector()

// click on first bank in the list
onView(withId(R.id.bank_list)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
)
}

@Test
fun launchNetbankingAndConfirmWithoutSelectingBank() {
launchBankSelector()

// confirm selection without selecting a bank
onView(withId(R.id.action_save)).perform(click())

// Nothing should happen as no bank was selected
}

private fun launchBankSelector() {
// launch Netbanking selection activity
onView(withId(R.id.examples)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(10, click())
Expand All @@ -52,10 +71,5 @@ class AddNetbankingPaymentMethodTest {
// click select payment method button
onView(withId(R.id.select_payment_method_button))
.perform(click())

// click on first bank in the list
onView(withId(R.id.bank_list)).perform(
RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click())
)
}
}
12 changes: 7 additions & 5 deletions payments-core/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.stripe.android.R
import com.stripe.android.databinding.BankListPaymentMethodBinding
import com.stripe.android.model.BankStatuses
Expand Down Expand Up @@ -36,11 +37,12 @@ internal class AddPaymentMethodFpxView @JvmOverloads internal constructor(

override val createParams: PaymentMethodCreateParams?
get() {
val fpxBank = FpxBank.values()[fpxAdapter.selectedPosition]

return PaymentMethodCreateParams.create(
PaymentMethodCreateParams.Fpx(bank = fpxBank.code)
)
return fpxAdapter.selectedPosition.takeIf { it != RecyclerView.NO_POSITION }?.let {
val fpxBank = FpxBank.values()[it]
PaymentMethodCreateParams.create(
PaymentMethodCreateParams.Fpx(bank = fpxBank.code)
)
}
}

init {
Expand Down
12 changes: 8 additions & 4 deletions payments-core/src/main/java/com/stripe/android/view/AddPaymentMethodNetbankingView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.util.AttributeSet
import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.stripe.android.R
import com.stripe.android.databinding.BankListPaymentMethodBinding
import com.stripe.android.model.PaymentMethodCreateParams
Expand All @@ -25,11 +26,14 @@ internal class AddPaymentMethodNetbankingView @JvmOverloads internal constructor

override val createParams: PaymentMethodCreateParams?
get() {
val netbankingBank = NetbankingBank.values()[netbankingAdapter.selectedPosition]
return netbankingAdapter.selectedPosition.takeIf { it != RecyclerView.NO_POSITION }
?.let {
val netbankingBank = NetbankingBank.values()[netbankingAdapter.selectedPosition]

return PaymentMethodCreateParams.create(
PaymentMethodCreateParams.Netbanking(bank = netbankingBank.code)
)
return PaymentMethodCreateParams.create(
PaymentMethodCreateParams.Netbanking(bank = netbankingBank.code)
)
}
}

init {
Expand Down