1 files changed, 18 insertions, 25 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java
index 30a478808..f197c0d30 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java
@@ -1,94 +1,87 @@
 package it.niedermann.nextcloud.deck.model.interfaces;
 
-import androidx.annotation.NonNull;
-
+import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 
 public interface IRemoteEntity {
 
-    default IRemoteEntity getEntity() {return this;}
+    default IRemoteEntity getEntity() {
+        return this;
+    }
 
     default Long getLocalId() {
         return getEntity().getLocalId();
     }
 
-    
     default void setLocalId(Long localId) {
         getEntity().setLocalId(localId);
     }
 
-    
     default long getAccountId() {
         return getEntity().getAccountId();
     }
 
-    
     default void setAccountId(long accountId) {
         getEntity().setAccountId(accountId);
     }
 
-    
     default Long getId() {
         return getEntity().getId();
     }
 
-    
     default void setId(Long id) {
         getEntity().setId(id);
     }
 
-    
     default int getStatus() {
         return getEntity().getStatus();
     }
 
-    
-    default void setStatus(@NonNull int status) {
+    default void setStatus(int status) {
         getEntity().setStatus(status);
     }
 
-    
-    default Date getLastModified() {
+    default Instant getLastModified() {
         return getEntity().getLastModified();
     }
 
-    
-    default void setLastModified(Date lastModified) {
+    default void setLastModified(Instant lastModified) {
         getEntity().setLastModified(lastModified);
     }
 
-    
-    default Date getLastModifiedLocal() {
+    default Instant getLastModifiedLocal() {
         return getEntity().getLastModifiedLocal();
     }
 
-    
-    default void setLastModifiedLocal(Date lastModifiedLocal) {
+    default void setLastModifiedLocal(Instant lastModifiedLocal) {
         getEntity().setLastModifiedLocal(lastModifiedLocal);
     }
 
-    
     default DBStatus getStatusEnum() {
         return getEntity().getStatusEnum();
     }
 
-    
     default void setStatusEnum(DBStatus status) {
         getEntity().setStatusEnum(status);
     }
 
+    default String getEtag() {
+        return getEntity().getEtag();
+    }
+
+    default void setEtag(String etag) {
+        getEntity().setEtag(etag);
+    }
+
     default <T> List<T> copyList(List<T> listToCopy) {
         if (listToCopy == null) {
             return null;
         }
         List<T> list = new ArrayList<>(listToCopy.size());
-        for (T t : listToCopy) {
-            list.add(t);
-        }
+        list.addAll(listToCopy);
         return list;
     }
 }