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

Fix navigation after sending payment from conversation.

main
Varsha 2022-12-01 12:03:41 -08:00 zatwierdzone przez Cody Henthorne
rodzic 45b498f62f
commit cc95041519
2 zmienionych plików z 6 dodań i 1 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/mms/AttachmentManager.java
Wyświetl plik

@ -448,7 +448,7 @@ public class AttachmentManager {
if (address != null) { if (address != null) {
Intent intent = new Intent(fragment.requireContext(), PaymentsActivity.class); Intent intent = new Intent(fragment.requireContext(), PaymentsActivity.class);
intent.putExtra(PaymentsActivity.EXTRA_PAYMENTS_STARTING_ACTION, R.id.action_directly_to_createPayment); intent.putExtra(PaymentsActivity.EXTRA_PAYMENTS_STARTING_ACTION, R.id.action_directly_to_createPayment);
intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).build().toBundle()); intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).setFinishOnConfirm(true).build().toBundle());
fragment.startActivity(intent); fragment.startActivity(intent);
} else if (FeatureFlags.paymentsRequestActivateFlow()) { } else if (FeatureFlags.paymentsRequestActivateFlow()) {
showRequestToActivatePayments(fragment.requireContext(), recipient); showRequestToActivatePayments(fragment.requireContext(), recipient);

5
app/src/main/res/navigation/payments_preferences.xml
Wyświetl plik

@ -243,6 +243,11 @@
app:argType="string" app:argType="string"
app:nullable="true" /> app:nullable="true" />
<argument
android:name="finish_on_confirm"
app:argType="boolean"
android:defaultValue="false" />
</action> </action>
<action <action