From 11c5b2df60aa09aeb2bafe506d1f1d3e97494110 Mon Sep 17 00:00:00 2001
From: desperateCoder <echotodevnull@gmail.com>
Date: Fri, 6 Dec 2019 21:09:40 +0100
Subject: fixes #204 and #205

---
 .../java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java | 6 ++++++
 .../java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java | 3 +++
 .../niedermann/nextcloud/deck/persistence/sync/SyncManager.java   | 1 -
 app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java | 8 +++++---
 4 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java
index c4273c7a8..40f6c8f8d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java
@@ -16,6 +16,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import it.niedermann.nextcloud.deck.DeckLog;
+
 public class GsonUTCDateAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {
 
     private final DateFormat dateFormat;
@@ -28,11 +30,15 @@ public class GsonUTCDateAdapter implements JsonSerializer<Date>, JsonDeserialize
     }
 
     @Override public synchronized JsonElement serialize(Date date, Type type, JsonSerializationContext jsonSerializationContext) {
+        if (dateFormat.format(date).contains("31")){
+            DeckLog.log("date-handling: (serialize) Input: \""+date+"\" | output: "+dateFormat.format(date));
+        }
         return new JsonPrimitive(dateFormat.format(date));
     }
 
     @Override public synchronized Date deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
       try {
+          DeckLog.log("date-handling: (deserialize) Input: \""+jsonElement.getAsString()+"\" | output: "+dateFormat.parse(jsonElement.getAsString()));
         return dateFormat.parse(jsonElement.getAsString());
       } catch (ParseException e) {
         throw new JsonParseException(e);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index d95e9bfc8..2090007f0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -367,6 +367,9 @@ public class JsonToEntityParser {
             return null;
         } else {
             try {
+                if (jsonElement.getAsString().contains("31")){
+                    DeckLog.log("date-handling: (deserialize) Input: \""+jsonElement.getAsString()+"\" | output: "+formatter.parse(jsonElement.getAsString()));
+                }
                 return formatter.parse(jsonElement.getAsString());
             } catch (ParseException e) {
                 return null;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index 139e46c6f..163dcec7e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -879,7 +879,6 @@ public class SyncManager {
             }
         }
         reorderAscending(changedCards, startingAtOrder);
-
     }
 
     private void reorderAscending(List<Card> cardsToReorganize, int startingAtOrder) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
index 65d044309..d21ff3620 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/DateUtil.java
@@ -39,14 +39,16 @@ public final class DateUtil {
     /**
      * Get difference between 2 dates in days (hours, minutes will be set to zero).
      *
-     * @param dateFrom  start date
-     * @param dateUntil end date
+     * @param sourceDateFrom  start date
+     * @param sourceDateUntil end date
      * @return difference between the to dates in days.
      */
-    public static long getDayDifference(Date dateFrom, Date dateUntil) {
+    public static long getDayDifference(Date sourceDateFrom, Date sourceDateUntil) {
+        Date dateFrom = new Date(sourceDateFrom.getTime());
         dateFrom.setHours(0);
         dateFrom.setMinutes(0);
 
+        Date dateUntil = new Date(sourceDateUntil.getTime());
         dateUntil.setHours(0);
         dateUntil.setMinutes(0);
 
-- 
cgit v1.2.3