From 244c29aa17cf52ae72e9c53106a0d333966433d2 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 21 Nov 2017 20:53:59 +0100
Subject: catch all sorts of date parsing errors

---
 src/main/java/de/pixart/messenger/parser/AbstractParser.java | 2 +-
 src/main/java/de/pixart/messenger/parser/PresenceParser.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/parser/AbstractParser.java b/src/main/java/de/pixart/messenger/parser/AbstractParser.java
index f85be0952..283aee7af 100644
--- a/src/main/java/de/pixart/messenger/parser/AbstractParser.java
+++ b/src/main/java/de/pixart/messenger/parser/AbstractParser.java
@@ -46,7 +46,7 @@ public abstract class AbstractParser {
                     try {
                         min = Math.min(min, AbstractParser.parseTimestamp(stamp));
                         returnDefault = false;
-                    } catch (ParseException e) {
+                    } catch (Throwable t) {
                         //ignore
                     }
                 }
diff --git a/src/main/java/de/pixart/messenger/parser/PresenceParser.java b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
index 0ade1abc3..e46947304 100644
--- a/src/main/java/de/pixart/messenger/parser/PresenceParser.java
+++ b/src/main/java/de/pixart/messenger/parser/PresenceParser.java
@@ -2,7 +2,6 @@ package de.pixart.messenger.parser;
 
 import android.util.Log;
 
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -224,7 +223,7 @@ public class PresenceParser extends AbstractParser implements
                     final String since = idle.getAttribute("since");
                     contact.setLastseen(AbstractParser.parseTimestamp(since));
                     contact.flagInactive();
-                } catch (NullPointerException | ParseException e) {
+                } catch (Throwable throwable) {
                     if (contact.setLastseen(AbstractParser.parseTimestamp(packet))) {
                         contact.flagActive();
                     }
-- 
cgit v1.2.3