mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2021-04-27 12:26:55 +02:00
parent 5a4f446a32
commit c87cf45e23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -40,7 +40,6 @@ import org.jsoup.nodes.Element;
import java.io.File;
import java.io.Serializable;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@ -324,12 +323,7 @@ public class EntityMessage implements Serializable {
boolean language_detection = prefs.getBoolean("language_detection", false);
String l = (language_detection ? language : null);
DateFormat DF;
if (l == null)
DF = Helper.getDateTimeInstance(context);
else
DF = SimpleDateFormat.getDateTimeInstance(
SimpleDateFormat.MEDIUM, SimpleDateFormat.MEDIUM, new Locale(l));
DateFormat DF = Helper.getDateTimeInstance(context, l == null ? null : new Locale(l));
Element p = document.createElement("p");
if (extended) {

10
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -995,10 +995,18 @@ public class Helper {
}
static DateFormat getDateTimeInstance(Context context) {
return Helper.getDateTimeInstance(context, SimpleDateFormat.MEDIUM, SimpleDateFormat.MEDIUM);
return getDateTimeInstance(context, null);
}
static DateFormat getDateTimeInstance(Context context, Locale locale) {
return Helper.getDateTimeInstance(context, SimpleDateFormat.MEDIUM, SimpleDateFormat.MEDIUM, locale);
}
static DateFormat getDateTimeInstance(Context context, int dateStyle, int timeStyle) {
return getDateTimeInstance(context, dateStyle, timeStyle, null);
}
static DateFormat getDateTimeInstance(Context context, int dateStyle, int timeStyle, Locale locale) {
// TODO fix time format
return SimpleDateFormat.getDateTimeInstance(dateStyle, timeStyle);
}