mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-18 21:28:54 +00:00
Code Issues Releases Wiki Activity

Use long date/time for extended reply header

Browse source
This commit is contained in:
M66B 2022-01-13 13:50:58 +01:00
parent 5635c17ba6
commit c73f4289af
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/EntityMessage.java
View file

@ -41,6 +41,7 @@ import org.jsoup.nodes.Element;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -411,10 +412,9 @@ public class EntityMessage implements Serializable {
boolean language_detection = prefs.getBoolean("language_detection", false); boolean language_detection = prefs.getBoolean("language_detection", false);
String l = (language_detection ? language : null); String l = (language_detection ? language : null);
DateFormat DF = Helper.getDateTimeInstance(context);
Element p = document.createElement("p"); Element p = document.createElement("p");
if (extended) { if (extended) {
DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.LONG, SimpleDateFormat.LONG);
if (from != null && from.length > 0) { if (from != null && from.length > 0) {
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(Helper.getString(context, l, R.string.title_from) + " "); strong.text(Helper.getString(context, l, R.string.title_from) + " ");
@ -440,7 +440,7 @@ public class EntityMessage implements Serializable {
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(Helper.getString(context, l, R.string.title_date) + " "); strong.text(Helper.getString(context, l, R.string.title_date) + " ");
p.appendChild(strong); p.appendChild(strong);
p.appendText(DF.format(received)); p.appendText(DTF.format(received));
p.appendElement("br"); p.appendElement("br");
} }
if (!TextUtils.isEmpty(subject)) { if (!TextUtils.isEmpty(subject)) {
@ -450,8 +450,10 @@ public class EntityMessage implements Serializable {
p.appendText(subject); p.appendText(subject);
p.appendElement("br"); p.appendElement("br");
} }
} else } else {
p.text(DF.format(new Date(received)) + " " + MessageHelper.formatAddresses(from) + ":"); DateFormat DTF = Helper.getDateTimeInstance(context);
p.text(DTF.format(new Date(received)) + " " + MessageHelper.formatAddresses(from) + ":");
}
Element div = document.createElement("div") Element div = document.createElement("div")
.attr("fairemail", "reply"); .attr("fairemail", "reply");