mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 18:27:43 +00:00
Code Issues Releases Wiki Activity

Placeholder $date$ range check

Browse source
This commit is contained in:
M66B 2022-09-13 21:16:40 +02:00
parent 6ffde0643c
commit 7cc6c8ff9e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/EntityAnswer.java
View file

@ -191,14 +191,16 @@ public class EntityAnswer implements Serializable {
String v = text.substring(s + 5, e); String v = text.substring(s + 5, e);
if (v.startsWith("-") || v.startsWith("+")) { if (v.startsWith("-") || v.startsWith("+")) {
Integer days = Helper.parseInt(v.substring(1)); Integer days = Helper.parseInt(v.substring(1));
if (days != null) { if (days != null && days >= 0 && days < 10 * 365) {
c = Calendar.getInstance(); c = Calendar.getInstance();
c.add(Calendar.DATE, days * (v.startsWith("-") ? -1 : 1)); c.add(Calendar.DATE, days * (v.startsWith("-") ? -1 : 1));
} }
} else if (TextUtils.isEmpty(v)) } else if (TextUtils.isEmpty(v))
c = Calendar.getInstance(); c = Calendar.getInstance();
if (c != null) { if (c == null)
s = text.indexOf("$date", e + 1);
else {
v = Html.escapeHtml(SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG).format(c.getTime())); v = Html.escapeHtml(SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG).format(c.getTime()));
text = text.substring(0, s) + v + text.substring(e + 1); text = text.substring(0, s) + v + text.substring(e + 1);
s = text.indexOf("$date", s + v.length()); s = text.indexOf("$date", s + v.length());