aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-03-18 18:08:01 -0700
committerScott Jackson <daneren2005@gmail.com>2015-03-18 18:08:01 -0700
commitf1e64f3cfb11febd1bb0e36360b834e75f9b4957 (patch)
tree974a2dd02d753bd9c2b382a84087410dd53d5299 /src
parenta7111d92b44dbdbd35ea6152d3ce53f378bd7219 (diff)
downloaddsub-f1e64f3cfb11febd1bb0e36360b834e75f9b4957.tar.gz
dsub-f1e64f3cfb11febd1bb0e36360b834e75f9b4957.tar.bz2
dsub-f1e64f3cfb11febd1bb0e36360b834e75f9b4957.zip
Fix newer versions of Subsonic formatting dates as UTC
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/service/parser/PlayQueueParser.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/parser/PlayQueueParser.java b/src/github/daneren2005/dsub/service/parser/PlayQueueParser.java
index 7dc62105..ec161d2b 100644
--- a/src/github/daneren2005/dsub/service/parser/PlayQueueParser.java
+++ b/src/github/daneren2005/dsub/service/parser/PlayQueueParser.java
@@ -23,12 +23,15 @@ import java.io.Reader;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Locale;
+import java.util.TimeZone;
import github.daneren2005.dsub.domain.MusicDirectory;
import github.daneren2005.dsub.domain.PlayerQueue;
import github.daneren2005.dsub.util.ProgressListener;
public class PlayQueueParser extends MusicDirectoryEntryParser {
+ private static final String TAG = PlayQueueParser.class.getSimpleName();
+
public PlayQueueParser(Context context, int instance) {
super(context, instance);
}
@@ -38,7 +41,6 @@ public class PlayQueueParser extends MusicDirectoryEntryParser {
PlayerQueue state = new PlayerQueue();
String currentId = null;
- String changed = null;
int eventType;
do {
eventType = nextParseEvent();
@@ -48,7 +50,9 @@ public class PlayQueueParser extends MusicDirectoryEntryParser {
currentId = get("current");
state.currentPlayingPosition = getInteger("position");
try {
- state.changed = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH).parse(get("changed"));
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH);
+ dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ state.changed = dateFormat.parse(get("changed"));
} catch (ParseException e) {
state.changed = null;
}