diff --git a/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java b/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java index cc676be24b..6dac0b89fd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java @@ -29,7 +29,8 @@ public abstract class RFC3339Date { private static final String TZF1, TZF2; static { - if (SystemVersion.isJava7()) { + // Android's SimpleDateFormat doesn't support XXX at any API + if (SystemVersion.isJava7() && !SystemVersion.isAndroid()) { // ISO 8601 // These handle timezones like +1000, +10, and +10:00 TZF1 = "yyyy-MM-dd'T'HH:mm:ssXXX"; @@ -81,7 +82,7 @@ public abstract class RFC3339Date { // strip the ':' out of the time zone, if present, // for Java 6 where we don't have the 'X' format int len = s.length(); - if (!SystemVersion.isJava7() && + if ((!SystemVersion.isJava7() || SystemVersion.isAndroid()) && s.charAt(len - 1) != 'Z' && s.charAt(len - 3) == ':' && (s.charAt(len - 6) == '+' || s.charAt(len - 6) == '-')) { diff --git a/history.txt b/history.txt index 9d3a0af95c..2daecfd2d3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-06-06 str4d + * newsxml: Don't use XXX for parsing dates on Android + 2015-06-04 str4d * i2ptunnel: - Don't connect manager to router in constructor (ticket #815)