From dc63e3138005ff0a9802ba65d3f71addf8eb7de4 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 13 Mar 2024 18:59:57 +0100 Subject: [PATCH] Added message of the day --- .../java/eu/faircode/email/ApplicationEx.java | 3 ++ .../eu/faircode/email/FragmentMessages.java | 19 +++++++++ app/src/main/res/layout/fragment_messages.xml | 41 ++++++++++++++++++- app/src/main/res/values/strings.xml | 5 +++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 248f00bb97..b2d7a2901c 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -854,6 +854,9 @@ public class ApplicationEx extends Application } else if (version < 2162) { if (!BuildConfig.DEBUG) editor.putBoolean("tabular_unread_bg", false); + } else if (version < 2168) { + if (Helper.isGoogle()) + editor.putBoolean("mod", true); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index bce4205fed..95db9c0181 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -255,6 +255,8 @@ public class FragmentMessages extends FragmentBase private ImageButton ibHintSwipe; private ImageButton ibHintSelect; private ImageButton ibHintJunk; + private TextView tvMod; + private ImageButton ibMod; private TextView tvNoEmail; private TextView tvNoEmailHint; private FixedRecyclerView rvMessage; @@ -280,6 +282,7 @@ public class FragmentMessages extends FragmentBase private Group grpHintSwipe; private Group grpHintSelect; private Group grpHintJunk; + private Group grpMod; private Group grpReady; private Group grpOutbox; private FloatingActionButton fabReply; @@ -577,6 +580,8 @@ public class FragmentMessages extends FragmentBase ibHintSwipe = view.findViewById(R.id.ibHintSwipe); ibHintSelect = view.findViewById(R.id.ibHintSelect); ibHintJunk = view.findViewById(R.id.ibHintJunk); + tvMod = view.findViewById(R.id.tvMod); + ibMod = view.findViewById(R.id.ibMod); tvNoEmail = view.findViewById(R.id.tvNoEmail); tvNoEmailHint = view.findViewById(R.id.tvNoEmailHint); rvMessage = view.findViewById(R.id.rvMessage); @@ -603,6 +608,7 @@ public class FragmentMessages extends FragmentBase grpHintSwipe = view.findViewById(R.id.grpHintSwipe); grpHintSelect = view.findViewById(R.id.grpHintSelect); grpHintJunk = view.findViewById(R.id.grpHintJunk); + grpMod = view.findViewById(R.id.grpMod); grpReady = view.findViewById(R.id.grpReady); grpOutbox = view.findViewById(R.id.grpOutbox); @@ -719,6 +725,17 @@ public class FragmentMessages extends FragmentBase } }); + if (Helper.isGoogle()) + tvMod.setText(getString(R.string.app_mod1)); + + ibMod.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + prefs.edit().putBoolean("mod", false).apply(); + grpMod.setVisibility(View.GONE); + } + }); + rvMessage.setHasFixedSize(false); rvMessage.setItemViewCacheSize(ITEM_CACHE_SIZE); @@ -5182,12 +5199,14 @@ public class FragmentMessages extends FragmentBase boolean message_swipe = prefs.getBoolean("message_swipe", false); boolean message_select = prefs.getBoolean("message_select", false); boolean message_junk = prefs.getBoolean("message_junk", false); + boolean mod = prefs.getBoolean("mod", false); boolean send_pending = prefs.getBoolean("send_pending", true); grpHintSupport.setVisibility(app_support || !hints || junk ? View.GONE : View.VISIBLE); grpHintSwipe.setVisibility(message_swipe || !hints || junk ? View.GONE : View.VISIBLE); grpHintSelect.setVisibility(message_select || !hints || junk ? View.GONE : View.VISIBLE); grpHintJunk.setVisibility(message_junk || !junk ? View.GONE : View.VISIBLE); + grpMod.setVisibility(mod ? View.VISIBLE : View.GONE); final DB db = DB.getInstance(getContext()); diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml index 3e7cec97b0..3848bfbbe0 100644 --- a/app/src/main/res/layout/fragment_messages.xml +++ b/app/src/main/res/layout/fragment_messages.xml @@ -270,6 +270,39 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvHintJunk" /> + + + + + + + app:layout_constraintTop_toBottomOf="@id/vSeparatorMod" /> + + Downloaded from: %1$s DMARC + + The March security update is causing \'App not responding\' messages, exclusively on Google Pixel devices. + Please do not blame the app for this, only Google can solve this! + + Monitor Send Email