From 14b338e26f3de14e049afa4728a0188884fa52f1 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 10 Apr 2023 08:03:12 +0200 Subject: [PATCH] Small behavior improvement --- .../java/eu/faircode/email/FragmentQuickSetup.java | 11 ++++------- .../main/java/eu/faircode/email/FragmentSetup.java | 5 +++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 93904a3bb4..4afbba637c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -250,13 +250,10 @@ public class FragmentQuickSetup extends FragmentBase { btnManual.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - finish(); - - FragmentAccount fragment = new FragmentAccount(); - fragment.setArguments(new Bundle()); - FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account"); - fragmentTransaction.commit(); + v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK) + .putExtra("manual", true) + .putExtra("scroll", true)); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 18dc8696f7..a613e3b10f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -985,18 +985,23 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS } private void updateManual() { + boolean scroll = false; FragmentActivity activity = getActivity(); if (activity != null) { Intent intent = activity.getIntent(); if (intent.hasExtra("manual")) { manual = intent.getBooleanExtra("manual", false); + scroll = intent.getBooleanExtra("scroll", false); intent.removeExtra("manual"); + intent.removeExtra("scroll"); activity.setIntent(intent); } } ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */); cardManual.setVisibility(manual ? View.VISIBLE : View.GONE); + if (scroll) + ensureVisible(cardManual); } private void updateExtra() {