diff options
author | Scott Jackson <daneren2005@gmail.com> | 2020-09-12 10:55:51 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2020-09-12 10:55:51 -0700 |
commit | f41260fb75c24eb0f28e576903f0220c29cc2738 (patch) | |
tree | 49ce81222528acb43ce47ba7125e06989d3eb6ab /app/src/main/java/github/daneren2005/dsub/util | |
parent | 5cc7156fee13d8318bad59b76edca8b0d844a18c (diff) | |
download | dsub-f41260fb75c24eb0f28e576903f0220c29cc2738.tar.gz dsub-f41260fb75c24eb0f28e576903f0220c29cc2738.tar.bz2 dsub-f41260fb75c24eb0f28e576903f0220c29cc2738.zip |
Fix #1001 playlist timestamps showing UTC time still
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util')
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/Util.java | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java index c1581a26..b58a81e4 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Util.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java @@ -865,12 +865,9 @@ public final class Util { return builder.toString(); } - public static String formatDate(Context context, String dateString) { - return formatDate(context, dateString, true); - } - public static String formatDate(Context context, String dateString, boolean includeTime) { + public static Date parseDate(Context context, String dateString) { if(dateString == null) { - return ""; + return null; } try { @@ -881,11 +878,21 @@ public final class Util { dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); } - return formatDate(dateFormat.parse(dateString), includeTime); + return dateFormat.parse(dateString); } catch(ParseException e) { Log.e(TAG, "Failed to parse date string", e); - return dateString; + return null; + } + } + public static String formatDate(Context context, String dateString) { + return formatDate(context, dateString, true); + } + public static String formatDate(Context context, String dateString, boolean includeTime) { + if(dateString == null) { + return ""; } + + return formatDate(parseDate(context, dateString), includeTime); } public static String formatDate(Date date) { return formatDate(date, true); |