diff --git a/app/src/main/java/eu/faircode/email/EntityAnswer.java b/app/src/main/java/eu/faircode/email/EntityAnswer.java index c9ff0fc90a..375eb321ae 100644 --- a/app/src/main/java/eu/faircode/email/EntityAnswer.java +++ b/app/src/main/java/eu/faircode/email/EntityAnswer.java @@ -48,12 +48,14 @@ import org.json.JSONObject; import java.io.Serializable; import java.text.Collator; +import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -211,6 +213,8 @@ public class EntityAnswer implements Serializable { } } + text = text.replace("$weekday$", new SimpleDateFormat("EEEE").format(new Date())); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); for (String key : prefs.getAll().keySet()) if (key.startsWith(PREF_PLACEHOLDER)) { diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index bae32bf1b8..ae46d554be 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java @@ -365,6 +365,9 @@ public class FragmentAnswer extends FragmentBase { } else if (itemId == R.id.menu_placeholder_date) { onMenuPlaceholder("$date$"); return true; + } else if (itemId == R.id.menu_placeholder_weekday) { + onMenuPlaceholder("$weekday$"); + return true; } } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/menu/menu_answer.xml b/app/src/main/res/menu/menu_answer.xml index 47c8b08396..9617715ae0 100644 --- a/app/src/main/res/menu/menu_answer.xml +++ b/app/src/main/res/menu/menu_answer.xml @@ -25,6 +25,9 @@ + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 180eae5269..a0bf080d03 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1907,6 +1907,7 @@ Sender\'s first name Sender\'s last name Current date + Day of week No action Mark read