Fix don't keep activities on add fragment. #4466
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michelleb-stripe
requested review from
brnunes-stripe and
skyler-stripe
as code owners
michelleb-stripe
changed the title
Comment on lines
126
to
134
| viewLifecycleOwner.lifecycleScope.launch { | ||
| formViewModel.completeFormValues.collect { formFieldValues -> | ||
| sheetViewModel.updateSelection( | ||
| transformToPaymentSelection( | ||
| formFieldValues, | ||
| formFragment.paramKeySpec, | ||
| selectedPaymentMethod | ||
| ) | ||
| } | ||
| ) |
There was a problem hiding this comment.
Unrelated to this change, but what we're doing here can be achieved with launchIn: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/launch-in.html
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetActivity.kt
Outdated
Show resolved
Hide resolved
ccen-stripe
reviewed
Dec 17, 2021
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt
Outdated
Show resolved
Hide resolved
…ncel authenticate, Add new card
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| // When the fragment is destroyed and recreated, the child fragment is re-instantiated | ||
| // during onCreate, so the factory must be set before calling super. | ||
| childFragmentManager.fragmentFactory = AddPaymentMethodsFragmentFactory( |
There was a problem hiding this comment.
If you have to re-create the fragment, then the viewModel will be created, but the SavedStateHandle can not be observed until after create is complete.
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsViewModel.kt
Outdated
Show resolved
Hide resolved
brnunes-stripe
suggested changes
Feb 1, 2022
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsActivity.kt
Outdated
Show resolved
Hide resolved
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsViewModel.kt
Outdated
Show resolved
Hide resolved
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetActivity.kt
Outdated
Show resolved
Hide resolved
paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt
Outdated
Show resolved
Hide resolved
...ain/java/com/stripe/android/paymentsheet/paymentdatacollection/CardDataCollectionFragment.kt
Show resolved
Hide resolved
michelleb-stripe
commented
Feb 7, 2022
...est/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModelTest.kt
Show resolved
Hide resolved
…er/GooglePayPaymentMethodLauncherViewModelTest.kt
…-android into michelleb/dka-add-fragment
michelleb-stripe
assigned brnunes-stripe and skyler-stripe and unassigned michelleb-stripe
skyler-stripe
previously approved these changes
Feb 7, 2022
…mentSheetActivity.kt Co-authored-by: Bruno R. Nunes <77990083+brnunes-stripe@users.noreply.github.com>
…mentSheetActivity.kt Co-authored-by: Bruno R. Nunes <77990083+brnunes-stripe@users.noreply.github.com>
…-android into michelleb/dka-add-fragment
brnunes-stripe
approved these changes
Feb 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please review, but let's wait until after internal dogfood before releasing.
Summary
When don't keep activities is turned on we need to properly restore the state in the BaseAddFragment.
When a viewModel has a savedStateHandle onCreate must complete. This means no factories can be used.
Values in the viewModel are saved in the SavedStateHandle so they are restored.
When don't keep activities is turned on, when activities are re-created the previous fragment is restored, so we should not replace this fragment.
There are still a few outstanding issues to be addressed in a follow up PR (see MOBILESDK-252):
Waiting on reproduction of: Returning customer, PI, USD:
Not reproduced on master
Motivation
#4457
MOBILESDK 252
I think this addresses MOBILESDK 367
No longer reproduce: MOBILESDK 210 with nav bar disappearing.
Testing
Screenshots