aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-01-18 17:36:53 -0800
committerScott Jackson <daneren2005@gmail.com>2016-01-18 17:36:53 -0800
commitd4b3a3897b89e7c0fe4df8eeeb80009e18007c18 (patch)
treec07c47041d7498d08b6ae39c69757fee1c50eeba /app
parent75be18e825820c10525dc78946af1061b7908db4 (diff)
downloaddsub-d4b3a3897b89e7c0fe4df8eeeb80009e18007c18.tar.gz
dsub-d4b3a3897b89e7c0fe4df8eeeb80009e18007c18.tar.bz2
dsub-d4b3a3897b89e7c0fe4df8eeeb80009e18007c18.zip
Format podcast dates the same as the rest of the app
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java2
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Util.java21
-rw-r--r--app/src/main/java/github/daneren2005/dsub/view/SongView.java3
3 files changed, 19 insertions, 7 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java b/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
index 728044fb..35d419bb 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
@@ -296,7 +296,7 @@ public class AutoMediaBrowserService extends MediaBrowserService {
MediaDescription description = new MediaDescription.Builder()
.setTitle(podcast.getTitle())
- .setSubtitle(Util.formatDate(downloadService, podcast.getDate()))
+ .setSubtitle(Util.formatDate(downloadService, podcast.getDate(), false))
.setMediaId(PODCAST_PREFIX + podcast.getId())
.setExtras(podcastExtras)
.build();
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 bf4af20d..6975b1bf 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -107,6 +107,7 @@ public final class Util {
private static DecimalFormat BYTE_LOCALIZED_FORMAT = null;
private static SimpleDateFormat DATE_FORMAT_SHORT = new SimpleDateFormat("MMM d h:mm a");
private static SimpleDateFormat DATE_FORMAT_LONG = new SimpleDateFormat("MMM d, yyyy h:mm a");
+ private static SimpleDateFormat DATE_FORMAT_NO_TIME = new SimpleDateFormat("MMM d, yyyy");
private static int CURRENT_YEAR = new Date().getYear();
public static final String EVENT_META_CHANGED = "github.daneren2005.dsub.EVENT_META_CHANGED";
@@ -901,26 +902,38 @@ public final class Util {
}
public static String formatDate(Context context, String dateString) {
+ return formatDate(context, dateString, true);
+ }
+ public static String formatDate(Context context, String dateString, boolean includeTime) {
try {
+ dateString = dateString.replace(' ', 'T');
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));
+ return formatDate(dateFormat.parse(dateString), includeTime);
} catch(ParseException e) {
+ Log.e(TAG, "Failed to parse date string", e);
return dateString;
}
}
public static String formatDate(Date date) {
+ return formatDate(date, true);
+ }
+ public static String formatDate(Date date, boolean includeTime) {
if(date == null) {
return "Never";
} else {
- if(date.getYear() != CURRENT_YEAR) {
- return DATE_FORMAT_LONG.format(date);
+ if(includeTime) {
+ if (date.getYear() != CURRENT_YEAR) {
+ return DATE_FORMAT_LONG.format(date);
+ } else {
+ return DATE_FORMAT_SHORT.format(date);
+ }
} else {
- return DATE_FORMAT_SHORT.format(date);
+ return DATE_FORMAT_NO_TIME.format(date);
}
}
}
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SongView.java b/app/src/main/java/github/daneren2005/dsub/view/SongView.java
index c7634b34..2c0580af 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/SongView.java
@@ -106,8 +106,7 @@ public class SongView extends UpdateView2<MusicDirectory.Entry, Boolean> {
if(artist.length() != 0) {
artist.append(" - ");
}
- int index = date.indexOf(" ");
- artist.append(date.substring(0, index != -1 ? index : date.length()));
+ artist.append(Util.formatDate(context, date, false));
}
}
else if(song.getArtist() != null) {