mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix display of boost payment processing dialog.

fork-5.53.8
Greyson Parrelli 2021-11-22 20:20:05 -05:00
rodzic 2cb67f6ee3
commit 1627d92009
2 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
Wyświetl plik

@ -169,7 +169,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
title = DSLSettingsText.from(R.string.preferences__signal_boost), title = DSLSettingsText.from(R.string.preferences__signal_boost),
icon = DSLSettingsIcon.from(R.drawable.ic_boost_24), icon = DSLSettingsIcon.from(R.drawable.ic_boost_24),
onClick = { onClick = {
findNavController().navigate(R.id.action_appSettingsFragment_to_boostsFragment) findNavController().navigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment())
} }
) )
} else { } else {

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostViewModel.kt
Wyświetl plik

@ -139,6 +139,8 @@ class BoostViewModel(
if (boost != null) { if (boost != null) {
eventPublisher.onNext(DonationEvent.RequestTokenSuccess) eventPublisher.onNext(DonationEvent.RequestTokenSuccess)
store.update { it.copy(stage = BoostState.Stage.PAYMENT_PIPELINE) }
donationPaymentRepository.continuePayment(boost.price, paymentData).subscribeBy( donationPaymentRepository.continuePayment(boost.price, paymentData).subscribeBy(
onError = { throwable -> onError = { throwable ->
store.update { it.copy(stage = BoostState.Stage.READY) } store.update { it.copy(stage = BoostState.Stage.READY) }
@ -172,7 +174,7 @@ class BoostViewModel(
return return
} }
store.update { it.copy(stage = BoostState.Stage.PAYMENT_PIPELINE) } store.update { it.copy(stage = BoostState.Stage.TOKEN_REQUEST) }
boostToPurchase = if (snapshot.isCustomAmountFocused) { boostToPurchase = if (snapshot.isCustomAmountFocused) {
Boost(snapshot.customAmount) Boost(snapshot.customAmount)