empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix navigation bug when deactivating payments.

Browse source
This commit is contained in:
Greyson Parrelli 2022-08-23 10:45:04 -04:00
parent 60da8116be
commit 13f3a8cf8a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletFragment.java
View file

@ -15,6 +15,8 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.payments.MoneyView; import org.thoughtcrime.securesms.payments.MoneyView;
import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.SpanUtil;
@ -56,7 +58,7 @@ public class DeactivateWalletFragment extends Fragment {
//noinspection CodeBlock2Expr //noinspection CodeBlock2Expr
deactivateWithoutTransfer.setOnClickListener(v -> { deactivateWithoutTransfer.setOnClickListener(v -> {
new AlertDialog.Builder(requireContext()) new MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.DeactivateWalletFragment__deactivate_without_transferring_question) .setTitle(R.string.DeactivateWalletFragment__deactivate_without_transferring_question)
.setMessage(R.string.DeactivateWalletFragment__your_balance_will_remain) .setMessage(R.string.DeactivateWalletFragment__your_balance_will_remain)
.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss()) .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())

4
app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
View file

@ -143,7 +143,7 @@ public class PaymentsHomeFragment extends LoggingFragment {
}); });
viewModel.getPaymentStateEvents().observe(getViewLifecycleOwner(), paymentStateEvent -> { viewModel.getPaymentStateEvents().observe(getViewLifecycleOwner(), paymentStateEvent -> {
AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setTitle(R.string.PaymentsHomeFragment__deactivate_payments_question); builder.setTitle(R.string.PaymentsHomeFragment__deactivate_payments_question);
builder.setMessage(R.string.PaymentsHomeFragment__you_will_not_be_able_to_send); builder.setMessage(R.string.PaymentsHomeFragment__you_will_not_be_able_to_send);
@ -168,7 +168,7 @@ public class PaymentsHomeFragment extends LoggingFragment {
case DEACTIVATE_WITH_BALANCE: case DEACTIVATE_WITH_BALANCE:
builder.setPositiveButton(getString(R.string.PaymentsHomeFragment__continue), (dialog, which) -> { builder.setPositiveButton(getString(R.string.PaymentsHomeFragment__continue), (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.deactivateWallet); SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_paymentsHome_to_deactivateWallet);
}); });
break; break;
case ACTIVATED: case ACTIVATED: