aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2016-02-19 12:55:52 +0100
committerMartin Fietz <Martin.Fietz@gmail.com>2016-02-19 12:55:52 +0100
commit844dd17cb195c6fd81d83f5ca560d65612a9cdcb (patch)
tree96bf40eafa58f9f6665f1de1aa95b3319adb9c87
parent6715419d7359a4c44fc7053362f001ea853c84e8 (diff)
parentdb084ec118466ce1972ea42a12108bf720807ec7 (diff)
downloadAntennaPod-844dd17cb195c6fd81d83f5ca560d65612a9cdcb.tar.gz
Merge pull request #1694 from mfietz/issue/1693-npe-dateutils-abbrevHEADmastermain
Prevent NPE in DateUtils.abbrev()
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
index 4b4201b5..6b0f423d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
@@ -145,6 +145,9 @@ public class DateUtils {
}
public static String formatAbbrev(final Context context, final Date date) {
+ if(date == null) {
+ return "";
+ }
GregorianCalendar cal = new GregorianCalendar();
cal.add(GregorianCalendar.YEAR, -1);
// some padding, because no one really remembers what day of the month it is