diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index aa5f451724..5ca3c13ace 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -8778,6 +8778,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. TextView tvSourceFolders = dview.findViewById(R.id.tvSourceFolders); TextView tvTargetFolders = dview.findViewById(R.id.tvTargetFolders); CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); + TextView tvJunkLearn = dview.findViewById(R.id.tvJunkLearn); String question = context.getResources() .getQuantityString(R.plurals.title_moving_messages, @@ -8791,6 +8792,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. List targets = new ArrayList<>(); Integer sourceColor = null; Integer targetColor = null; + boolean junk = false; for (MessageTarget t : result) { if (!sources.contains(t.sourceFolder.type)) sources.add(t.sourceFolder.type); @@ -8800,6 +8802,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. sourceColor = t.sourceFolder.color; if (targetColor == null) targetColor = t.targetFolder.color; + if (!junk && + (EntityFolder.JUNK.equals(t.sourceFolder.type) || + EntityFolder.JUNK.equals(t.targetFolder.type))) + junk = true; } Drawable source = null; @@ -8844,6 +8850,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } }); + tvJunkLearn.setVisibility(junk ? View.VISIBLE : View.GONE); + return new AlertDialog.Builder(context) .setView(dview) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { diff --git a/app/src/main/res/layout/dialog_ask_move.xml b/app/src/main/res/layout/dialog_ask_move.xml index 2c9004b635..39d8d0c40e 100644 --- a/app/src/main/res/layout/dialog_ask_move.xml +++ b/app/src/main/res/layout/dialog_ask_move.xml @@ -44,11 +44,11 @@ android:layout_height="48dp" android:layout_marginTop="12dp" android:gravity="center" - app:tint="?android:attr/textColorSecondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvSourceFolders" - app:srcCompat="@drawable/baseline_arrow_downward_24" /> + app:srcCompat="@drawable/baseline_arrow_downward_24" + app:tint="?android:attr/textColorSecondary" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1c7b69417..5580d0e7b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1579,6 +1579,7 @@ By default, FairEmail reformats messages for privacy and security reasons. To view the original message, tap the \'full screen\' icon above the message text. The design is intentionally not distracting, but kept highly functional. There are many options to customize the appearance, but please understand that it is impossible to make everybody completely happy at the same time. Spam filtering should be done by the email server and cannot be done reliably on a battery powered device with limited capabilities. + By moving messages to and from the spam folder, the email server "learns" what spam is Long press for options This is a summary of the content of a raw message file. Save the raw message with the save icon in the action bar to view all content.