#359 etags: first steps - board list and board

4 files changed, 62 insertions, 9 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 a0b9fd8aa..bff8ddfdb 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
@@ -125,9 +125,9 @@ public class ServerAdapter {
 //        return lastSyncHeader;
     }
 
-    public void getBoards(IResponseCallback<List<FullBoard>> responseCallback) {
+    public void getBoards(IResponseCallback<ParsedResponse<List<FullBoard>>> responseCallback) {
         RequestHelper.request(provider, () ->
-                        provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId())),
+                        provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId()), responseCallback.getAccount().getBoardsEtag()),
                 responseCallback);
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
index 0ac0f786b..a491946ed 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
@@ -97,7 +97,7 @@ import it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao.widgets.Sta
                 UserInBoard.class,
         },
         exportSchema = false,
-        version = 22
+        version = 23
 )
 @TypeConverters({DateTypeConverter.class})
 public abstract class DeckDatabase extends RoomDatabase {
@@ -375,6 +375,25 @@ public abstract class DeckDatabase extends RoomDatabase {
         }
     };
 
+    private static final Migration MIGRATION_22_23 = new Migration(22, 23) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            // https://github.com/stefan-niedermann/nextcloud-deck/issues/359
+            database.execSQL("ALTER TABLE `Account` ADD `boardsEtag` TEXT");
+            database.execSQL("ALTER TABLE `Board` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `Stack` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `Card` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `Label` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `AccessControl` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `Attachment` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `User` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `DeckComment` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `Activity` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `OcsProject` ADD `etag` TEXT");
+            database.execSQL("ALTER TABLE `OcsProjectResource` ADD `etag` TEXT");
+        }
+    };
+
     public static final RoomDatabase.Callback ON_CREATE_CALLBACK = new RoomDatabase.Callback() {
         @Override
         public void onCreate(@NonNull SupportSQLiteDatabase db) {
@@ -434,6 +453,7 @@ public abstract class DeckDatabase extends RoomDatabase {
                         lastSyncPref.apply();
                     }
                 })
+                .addMigrations(MIGRATION_22_23)
                 .fallbackToDestructiveMigration()
                 .addCallback(ON_CREATE_CALLBACK)
                 .build();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
index 032c3594a..69e3833cf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.persistence.sync.helpers;
 
+import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException;
+
+import java.net.HttpURLConnection;
 import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -53,9 +56,10 @@ public class SyncHelper {
                                 DeckLog.log("Conflicting changes on entity: " + existingEntity);
                                 // TODO: what to do?
                             } else {
-//                                if (existingEntity.getLastModified().getTime() == entityFromServer.getLastModified().getTime()) {
-//                                    continue; // TODO: is this is ok for sure? -> isn`t! NPE
-//                                }
+                                if (entityFromServer.getEtag() != null && entityFromServer.getEtag().equals(existingEntity.getEtag())) {
+                                    DeckLog.info("ETags do match! skipping this one.");
+                                    continue;
+                                }
                                 provider.updateInDB(dataBaseAdapter, accountId, applyUpdatesFromRemote(provider, existingEntity, entityFromServer, accountId), false);
                             }
                         }
@@ -73,8 +77,17 @@ public class SyncHelper {
 
             @Override
             public void onError(Throwable throwable) {
+                super.onError(throwable);
+                if (throwable.getClass() == NextcloudHttpRequestFailedException.class) {
+                    NextcloudHttpRequestFailedException requestFailedException = (NextcloudHttpRequestFailedException) throwable;
+                    if (HttpURLConnection.HTTP_NOT_MODIFIED == requestFailedException.getStatusCode()){
+                        DeckLog.info("ETags do match! skipping this one.");
+                        // well, etags say we're fine here. no need to go deeper.
+                        provider.childDone(provider, responseCallback, false);
+                        return;
+                    }
+                }
                 provider.onError(throwable, responseCallback);
-                DeckLog.logError(throwable);
                 responseCallback.onError(throwable);
             }
         }, lastSync);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java
index 5b458471f..f5e071adb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/BoardDataProvider.java
@@ -1,5 +1,9 @@
 package it.niedermann.nextcloud.deck.persistence.sync.helpers.providers;
 
+import android.annotation.SuppressLint;
+
+import com.nextcloud.android.sso.api.ParsedResponse;
+
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,8 +30,24 @@ public class BoardDataProvider extends AbstractSyncDataProvider<FullBoard> {
     }
 
     @Override
-    public void getAllFromServer(ServerAdapter serverAdapter, long accountId, IResponseCallback<List<FullBoard>> responder, Instant lastSync) {
-        serverAdapter.getBoards(responder);
+    public void getAllFromServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, IResponseCallback<List<FullBoard>> responder, Instant lastSync) {
+        serverAdapter.getBoards(new IResponseCallback<ParsedResponse<List<FullBoard>>>(responder.getAccount()) {
+            @Override
+            public void onResponse(ParsedResponse<List<FullBoard>> response) {
+                String etag = response.getHeaders().get("ETag");
+                if (etag != null && !etag.equals(account.getBoardsEtag())) {
+                    account.setBoardsEtag(etag);
+                    dataBaseAdapter.updateAccount(account);
+                }
+                responder.onResponse(response.getResponse());
+            }
+
+            @SuppressLint("MissingSuperCall")
+            @Override
+            public void onError(Throwable throwable) {
+                responder.onError(throwable);
+            }
+        });
     }
 
     @Override