aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-22 21:44:17 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-22 21:44:17 +0200
commitc25f1283a19dad6e15c8f09f771b40c716b3bb99 (patch)
tree6aca1101f9ae3d5a23651a53ecdced35a881ac6e /src/eu/siacs/conversations/parser
parent678cc7af10b09dda31eb8a5ab9fb954e18ff5a35 (diff)
removed warnings
Diffstat (limited to 'src/eu/siacs/conversations/parser')
-rw-r--r--src/eu/siacs/conversations/parser/AbstractParser.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/parser/AbstractParser.java b/src/eu/siacs/conversations/parser/AbstractParser.java
index c06a5cbd..f9a7b1c0 100644
--- a/src/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/eu/siacs/conversations/parser/AbstractParser.java
@@ -3,8 +3,8 @@ package eu.siacs.conversations.parser;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
-import android.util.Log;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.services.XmppConnectionService;
@@ -26,7 +26,7 @@ public abstract class AbstractParser {
"stamp");
stamp = stamp.replace("Z", "+0000");
if (stamp.contains(".")) {
- Date date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+ Date date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ",Locale.US)
.parse(stamp);
if (now<date.getTime()) {
return now;
@@ -34,7 +34,7 @@ public abstract class AbstractParser {
return date.getTime();
}
} else {
- Date date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+ Date date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ",Locale.US)
.parse(stamp);
if (now<date.getTime()) {
return now;