started proper lastSyncHandling

1 files changed, 22 insertions, 13 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
index 80cdac7c2..652ffdf53 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
+import android.util.Log;
 
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
@@ -12,7 +13,9 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
+import it.niedermann.nextcloud.deck.DeckConsts;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.api.ApiProvider;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
@@ -24,10 +27,15 @@ import it.niedermann.nextcloud.deck.model.Stack;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.persistence.sync.util.DateUtil;
 
 public class ServerAdapter {
 
-    private static final DateFormat API_FORMAT = new SimpleDateFormat("E, d MMM yyyy hh:mm:ss z");
+    private static final DateFormat API_FORMAT = new SimpleDateFormat("E, dd MMM yyyy hh:mm:ss z");
+
+    static {
+        API_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
 
     private Context applicationContext;
     private ApiProvider provider;
@@ -67,23 +75,24 @@ public class ServerAdapter {
     }
 
     private String getLastSyncDateFormatted() {
-        return null;
-//        String lastSyncHeader = API_FORMAT.format(getLastSync());
-//        // omit Offset of timezone (e.g.: +01:00)
-//        if (lastSyncHeader.matches("^.*\\+[0-9]{2}:[0-9]{2}$")) {
-//            lastSyncHeader = lastSyncHeader.substring(0, lastSyncHeader.length()-6);
-//        }
-//        Log.d("deck lastSync", lastSyncHeader);
-//        return lastSyncHeader;
+//        return null;
+        String lastSyncHeader = API_FORMAT.format(getLastSync());
+        // omit Offset of timezone (e.g.: +01:00)
+        if (lastSyncHeader.matches("^.*\\+[0-9]{2}:[0-9]{2}$")) {
+            lastSyncHeader = lastSyncHeader.substring(0, lastSyncHeader.length()-6);
+        }
+        Log.d("deck lastSync", lastSyncHeader);
+        return lastSyncHeader;
     }
 
     private Date getLastSync() {
-        return new Date(0l);
+//        return new Date(0l);
         //return null;
         // FIXME: reactivate, when lastSync is working in REST-API
-//        Date lastSync = new Date();
-//        lastSync.setTime(lastSyncPref.getLong(DeckConsts.LAST_SYNC_KEY, 0L));
-//        return lastSync;
+        Date lastSync = DateUtil.nowInGMT();
+        lastSync.setTime(lastSyncPref.getLong(DeckConsts.LAST_SYNC_KEY, 0L));
+
+        return lastSync;
     }
 
     public void getBoards(IResponseCallback<List<FullBoard>> responseCallback) {