From 6f5be8dd789a03857e57e7e8dced021dd973b74f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 15 Feb 2021 12:57:00 +0100 Subject: [PATCH] Allow disabling identities hint --- .../java/eu/faircode/email/FragmentDialogIdentity.java | 9 +++++++-- .../main/java/eu/faircode/email/FragmentOptionsMisc.java | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java b/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java index ed5f72b29b..5994af82fe 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogIdentity.java @@ -60,6 +60,9 @@ public class FragmentDialogIdentity extends FragmentDialogBase { final Group grpNoIdentities = dview.findViewById(R.id.grpNoIdentities); final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + boolean identities_primary_hint = prefs.getBoolean("identities_primary_hint", false); + spIdentity.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -81,18 +84,20 @@ public class FragmentDialogIdentity extends FragmentDialogBase { } }); + tvPrimaryHint.setVisibility(identities_primary_hint ? View.GONE : View.VISIBLE); tvPrimaryHint.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(getContext(), ActivitySetup.class) + prefs.edit().putBoolean("identities_primary_hint", true).apply(); + startActivity(new Intent(v.getContext(), ActivitySetup.class) .putExtra("manual", true)); + tvPrimaryHint.setVisibility(View.GONE); } }); cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("identities_asked", isChecked).apply(); } }); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 8823dd9f48..d511c79899 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -143,7 +143,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc "reply_hint", "html_always_images", "open_full_confirmed", "print_html_confirmed", "reformatted_hint", "selected_folders", "move_1_confirmed", "move_n_confirmed", "last_search_senders", "last_search_recipients", "last_search_subject", "last_search_keywords", "last_search_message", "last_search", - "identities_asked", "cc_bcc", "inline_image_hint", "compose_reference", "send_dialog", + "identities_asked", "identities_primary_hint", + "cc_bcc", "inline_image_hint", "compose_reference", "send_dialog", "setup_reminder", "setup_advanced" };