diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java index 20e09bd895..4ad99710f5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolder.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java @@ -74,6 +74,7 @@ public class FragmentFolder extends FragmentBase { private CheckBox cbAutoDelete; private Button btnSave; private ContentLoadingProgressBar pbSave; + private TextView tvInboxRootHint; private ContentLoadingProgressBar pbWait; private Group grpParent; private Group grpPoll; @@ -130,6 +131,7 @@ public class FragmentFolder extends FragmentBase { cbAutoDelete = view.findViewById(R.id.cbAutoDelete); btnSave = view.findViewById(R.id.btnSave); pbSave = view.findViewById(R.id.pbSave); + tvInboxRootHint = view.findViewById(R.id.tvInboxRootHint); pbWait = view.findViewById(R.id.pbWait); grpParent = view.findViewById(R.id.grpParent); grpPoll = view.findViewById(R.id.grpPoll); @@ -209,6 +211,7 @@ public class FragmentFolder extends FragmentBase { grpAutoDelete.setVisibility(View.GONE); btnSave.setEnabled(false); pbSave.setVisibility(View.GONE); + tvInboxRootHint.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); return view; @@ -269,6 +272,8 @@ public class FragmentFolder extends FragmentBase { cbAutoDelete.setChecked(folder != null && folder.auto_delete); grpAutoDelete.setVisibility(View.VISIBLE); } + + tvInboxRootHint.setVisibility(folder == null && parent == null ? View.VISIBLE : View.GONE); } // Consider previous save as cancelled diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 98ac50bd6d..8e8da10f71 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -300,7 +300,7 @@ android:text="@string/title_auto_delete_hint" android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textStyle="italic" - app:layout_constraintEnd_toStartOf="@+id/btnInfo" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cbAutoDelete" /> @@ -325,6 +325,18 @@ app:layout_constraintStart_toEndOf="@id/btnSave" app:layout_constraintTop_toTopOf="@id/btnSave" /> + + Automatically move old messages to trash Automatically permanently delete old messages Old messages are messages that are no longer kept on the device + + Some providers require new folders to be created below the inbox. + In this case, you can long press the inbox in the folder list and select \'Create sub folder\'. + Folder name missing Folder %1$s exists Permanently delete this folder and any messages it contains?