From a3f294cd6773585fa59753e25101e4029004495f Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 26 Jun 2015 17:37:44 -0700
Subject: Format playlist creation date

---
 .../dsub/fragments/SelectPlaylistFragment.java           |  2 +-
 app/src/main/java/github/daneren2005/dsub/util/Util.java | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/github')

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
index 7a4c708e..5b7e68a6 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
@@ -217,7 +217,7 @@ public class SelectPlaylistFragment extends SelectRecyclerFragment<Playlist> {
 			((playlist.getComment() == null) ? "" : playlist.getComment()) +
 			"\nSong Count: " + playlist.getSongCount() +
 			((playlist.getPublic() == null) ? "" : ("\nPublic: " + playlist.getPublic())) +
-			"\nCreation Date: " + playlist.getCreated().replace('T', ' ');
+			"\nCreated: " + Util.formatDate(context, playlist.getCreated());
 		Util.info(context, playlist.getName(), message);
 	}
 
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 f44bc672..a3728d29 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -53,6 +53,7 @@ import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.PlayerState;
 import github.daneren2005.dsub.domain.RepeatMode;
+import github.daneren2005.dsub.domain.ServerInfo;
 import github.daneren2005.dsub.receiver.MediaButtonIntentReceiver;
 import github.daneren2005.dsub.service.DownloadService;
 
@@ -70,10 +71,12 @@ import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * @author Sindre Mehus
@@ -829,6 +832,19 @@ public final class Util {
         return builder.toString();
     }
 
+	public static String formatDate(Context context, String dateString) {
+		try {
+			boolean isDateNormalized = ServerInfo.checkServerVersion(context, "1.11");
+			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH);
+			if (isDateNormalized) {
+				dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+			}
+
+			return formatDate(dateFormat.parse(dateString));
+		} catch(ParseException e) {
+			return dateString;
+		}
+	}
 	public static String formatDate(Date date) {
 		if(date == null) {
 			return "Never";
-- 
cgit v1.2.3