diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:10 +0100 |
| commit | a0dcdf5c762ff28edeea34c2cfe654c31889abc7 (patch) | |
| tree | 9e92fc9f9f0bc44c2593c00e29290ad8f392747e /src/main/java/eu/siacs/conversations/parser/AbstractParser.java | |
| parent | 6bc277152a8e1bcf5347d3e1d60c93dfc904ca23 (diff) | |
| parent | 9efc13983516c4c37540eb9544f8fa411ded81c7 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/AbstractParser.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/AbstractParser.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java index 11ddcc13..51dc398a 100644 --- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java +++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java @@ -63,10 +63,10 @@ public abstract class AbstractParser { */ public static Date parseTimestamp(String timestamp) throws ParseException { /*try { - Log.d("TIMESTAMP", timestamp); + Logging.d("TIMESTAMP", timestamp); return DatatypeFactory.newInstance().newXMLGregorianCalendar(timestamp).toGregorianCalendar().getTime(); } catch (DatatypeConfigurationException e) { - Log.d("TIMESTAMP", e.getMessage()); + Logging.d("TIMESTAMP", e.getMessage()); return new Date(); }*/ timestamp = timestamp.replace("Z", "+0000"); |