From a6b91c3a1445a05d6044f8f627b9a1f9dcb2ad2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Wed, 19 Feb 2020 23:04:28 +0100
Subject: [PATCH] [Models] Add basic error protection in Date, Time.

---
 .../edziennik/utils/models/Date.java          | 35 ++++++++++++++++---
 .../edziennik/utils/models/Time.java          | 16 ++++++---
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
index a6c38bcb..a1327817 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Date.java
@@ -50,7 +50,12 @@ public class Date implements Comparable<Date> {
     }
 
     public static Date fromYmd(String dateTime) {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
+        try {
+            return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(4, 6)), Integer.parseInt(dateTime.substring(6, 8)));
+        }
+        catch (Exception e) {
+            return new Date(2019, 1, 1);
+        }
     }
 
     public static Date fromMillis(long millis) {
@@ -68,7 +73,12 @@ public class Date implements Comparable<Date> {
     }
 
     public static Date fromY_m_d(String dateTime) {
-        return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
+        try {
+            return new Date(Integer.parseInt(dateTime.substring(0, 4)), Integer.parseInt(dateTime.substring(5, 7)), Integer.parseInt(dateTime.substring(8, 10)));
+        }
+        catch (Exception e) {
+            return new Date(2019, 1, 1);
+        }
     }
 
     public long getInMillis() {
@@ -83,15 +93,30 @@ public class Date implements Comparable<Date> {
     }
 
     public static Date fromd_m_Y(String dateTime) {
-        return new Date(Integer.parseInt(dateTime.substring(6, 10)), Integer.parseInt(dateTime.substring(3, 5)), Integer.parseInt(dateTime.substring(0, 2)));
+        try {
+            return new Date(Integer.parseInt(dateTime.substring(6, 10)), Integer.parseInt(dateTime.substring(3, 5)), Integer.parseInt(dateTime.substring(0, 2)));
+        }
+        catch (Exception e) {
+            return new Date(2019, 1, 1);
+        }
     }
 
     public static long fromIso(String dateTime) {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
+        try {
+            return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), Integer.parseInt(dateTime.substring(17, 19))));
+        }
+        catch (Exception e) {
+            return System.currentTimeMillis();
+        }
     }
 
     public static long fromIsoHm(String dateTime) {
-        return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
+        try {
+            return Date.fromY_m_d(dateTime).combineWith(new Time(Integer.parseInt(dateTime.substring(11, 13)), Integer.parseInt(dateTime.substring(14, 16)), 0));
+        }
+        catch (Exception e) {
+            return System.currentTimeMillis();
+        }
     }
 
     public static Date fromValue(int value) {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
index 9e5cc936..d19e317f 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/utils/models/Time.java
@@ -30,15 +30,23 @@ public class Time implements Comparable<Time> {
 
     public Time parseFromYmdHm(String dateTime)
     {
-        this.hour = Integer.parseInt(dateTime.substring(8, 10));
-        this.minute = Integer.parseInt(dateTime.substring(10, 12));
-        this.second = 0;
+        try {
+            this.hour = Integer.parseInt(dateTime.substring(8, 10));
+            this.minute = Integer.parseInt(dateTime.substring(10, 12));
+            this.second = 0;
+        }
+        catch (Exception ignore) {}
         return this;
     }
 
     public static Time fromYmdHm(String dateTime)
     {
-        return new Time(Integer.parseInt(dateTime.substring(8, 10)), Integer.parseInt(dateTime.substring(10, 12)), 0);
+        try {
+            return new Time(Integer.parseInt(dateTime.substring(8, 10)), Integer.parseInt(dateTime.substring(10, 12)), 0);
+        }
+        catch (Exception e) {
+            return new Time(0, 0, 0);
+        }
     }
 
     public long combineWith(Date date) {