persist upload timestamp

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Jul 23, 2024 · 74e23ab · 74e23ab
1 parent 3649ba2
commit 74e23ab
Show file tree

Hide file tree

Showing 8 changed files with 1,240 additions and 7 deletions.
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/82.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/82.json
diff --git a/app/src/androidTest/java/com/owncloud/android/UploadIT.java b/app/src/androidTest/java/com/owncloud/android/UploadIT.java
@@ -452,7 +452,7 @@ public void testCreationAndUploadTimestamp() throws IOException, AccountUtils.Ac
 
         assertEquals(remotePath, ocFile.getRemotePath());
         assertEquals(creationTimestamp, ocFile.getCreationTimestamp());
-        assertTrue(uploadTimestamp - 10 < ocFile.getUploadTimestamp() ||
+        assertTrue(uploadTimestamp - 10 < ocFile.getUploadTimestamp() &&
                            uploadTimestamp + 10 > ocFile.getUploadTimestamp());
     }
 

diff --git a/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java b/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java
@@ -36,6 +36,7 @@ public class OCFileUnitTest {
     private static final String STORAGE_PATH = "/mnt/sd/localpath/to/a/file.txt";
     private static final String MIME_TYPE = "text/plain";
     private static final long FILE_LENGTH = 9876543210L;
+    private static final long UPLOADED_TIMESTAMP = 8765431109L;
     private static final long CREATION_TIMESTAMP = 8765432109L;
     private static final long MODIFICATION_TIMESTAMP = 7654321098L;
     private static final long MODIFICATION_TIMESTAMP_AT_LAST_SYNC_FOR_DATA = 6543210987L;
@@ -63,6 +64,7 @@ public void writeThenReadAsParcelable() {
         mFile.setStoragePath(STORAGE_PATH);
         mFile.setMimeType(MIME_TYPE);
         mFile.setFileLength(FILE_LENGTH);
+        mFile.setUploadTimestamp(UPLOADED_TIMESTAMP);
         mFile.setCreationTimestamp(CREATION_TIMESTAMP);
         mFile.setModificationTimestamp(MODIFICATION_TIMESTAMP);
         mFile.setModificationTimestampAtLastSyncForData(MODIFICATION_TIMESTAMP_AT_LAST_SYNC_FOR_DATA);
@@ -93,6 +95,7 @@ public void writeThenReadAsParcelable() {
         assertThat(fileReadFromParcel.getStoragePath(), is(STORAGE_PATH));
         assertThat(fileReadFromParcel.getMimeType(), is(MIME_TYPE));
         assertThat(fileReadFromParcel.getFileLength(), is(FILE_LENGTH));
+        assertThat(fileReadFromParcel.getUploadTimestamp(), is(UPLOADED_TIMESTAMP));
         assertThat(fileReadFromParcel.getCreationTimestamp(), is(CREATION_TIMESTAMP));
         assertThat(fileReadFromParcel.getModificationTimestamp(), is(MODIFICATION_TIMESTAMP));
         assertThat(

diff --git a/app/src/main/java/com/nextcloud/client/database/entity/FileEntity.kt b/app/src/main/java/com/nextcloud/client/database/entity/FileEntity.kt
@@ -115,5 +115,7 @@ data class FileEntity(
     @ColumnInfo(name = ProviderTableMeta.FILE_METADATA_GPS)
     val metadataGPS: String?,
     @ColumnInfo(name = ProviderTableMeta.FILE_E2E_COUNTER)
-    val e2eCounter: Long?
+    val e2eCounter: Long?,
+    @ColumnInfo(name = ProviderTableMeta.FILE_UPLOADED)
+    val uploaded: Long?
 )
diff --git a/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -526,11 +526,13 @@ public void saveFolder(OCFile folder, List<OCFile> updatedFiles, Collection<OCFi
      * @see #createContentValuesForFile(OCFile)
      * @see #createContentValuesForFolder(OCFile)
      */
+    @SuppressFBWarnings("CE")
     private ContentValues createContentValuesBase(OCFile fileOrFolder) {
         final ContentValues cv = new ContentValues();
         cv.put(ProviderTableMeta.FILE_MODIFIED, fileOrFolder.getModificationTimestamp());
         cv.put(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, fileOrFolder.getModificationTimestampAtLastSyncForData());
         cv.put(ProviderTableMeta.FILE_PARENT, fileOrFolder.getParentId());
+        cv.put(ProviderTableMeta.FILE_UPLOADED, fileOrFolder.getUploadTimestamp());
         cv.put(ProviderTableMeta.FILE_CREATION, fileOrFolder.getCreationTimestamp());
         cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, fileOrFolder.getMimeType());
         cv.put(ProviderTableMeta.FILE_NAME, fileOrFolder.getFileName());
@@ -990,6 +992,7 @@ private OCFile createFileInstance(FileEntity fileEntity) {
             }
         }
         ocFile.setFileLength(nullToZero(fileEntity.getContentLength()));
+        ocFile.setUploadTimestamp(nullToZero(fileEntity.getUploaded()));
         ocFile.setCreationTimestamp(nullToZero(fileEntity.getCreation()));
         ocFile.setModificationTimestamp(nullToZero(fileEntity.getModified()));
         ocFile.setModificationTimestampAtLastSyncForData(nullToZero(fileEntity.getModifiedAtLastSyncForData()));

diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -156,6 +156,7 @@ private OCFile(Parcel source) {
         fileId = source.readLong();
         parentId = source.readLong();
         fileLength = source.readLong();
+        uploadTimestamp = source.readLong();
         creationTimestamp = source.readLong();
         modificationTimestamp = source.readLong();
         modificationTimestampAtLastSyncForData = source.readLong();
@@ -201,6 +202,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(fileId);
         dest.writeLong(parentId);
         dest.writeLong(fileLength);
+        dest.writeLong(uploadTimestamp);
         dest.writeLong(creationTimestamp);
         dest.writeLong(modificationTimestamp);
         dest.writeLong(modificationTimestampAtLastSyncForData);
@@ -495,6 +497,7 @@ private void resetData() {
         localPath = null;
         mimeType = null;
         fileLength = 0;
+        uploadTimestamp = 0;
         creationTimestamp = 0;
         modificationTimestamp = 0;
         modificationTimestampAtLastSyncForData = 0;
@@ -716,10 +719,6 @@ public long getModificationTimestamp() {
         return this.modificationTimestamp;
     }
 
-    public long getUploadTimestamp() {
-        return this.uploadTimestamp;
-    }
-
     public long getModificationTimestampAtLastSyncForData() {
         return this.modificationTimestampAtLastSyncForData;
     }
@@ -1050,4 +1049,12 @@ public void setE2eCounter(@Nullable Long e2eCounter) {
             this.e2eCounter = e2eCounter;
         }
     }
+
+    public long getUploadTimestamp() {
+        return uploadTimestamp;
+    }
+
+    public void setUploadTimestamp(long uploadTimestamp) {
+        this.uploadTimestamp = uploadTimestamp;
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java
@@ -25,7 +25,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 81;
+    public static final int DB_VERSION = 82;
 
     private ProviderMeta() {
         // No instance
@@ -76,6 +76,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String FILE_ENCRYPTED_NAME = "encrypted_filename";
         public static final String FILE_CREATION = "created";
         public static final String FILE_MODIFIED = "modified";
+        public static final String FILE_UPLOADED = "uploaded";
         public static final String FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA = "modified_at_last_sync_for_data";
         public static final String FILE_CONTENT_LENGTH = "content_length";
         public static final String FILE_CONTENT_TYPE = "content_type";
@@ -126,6 +127,7 @@ static public class ProviderTableMeta implements BaseColumns {
                 FILE_PARENT,
                 FILE_NAME,
                 FILE_ENCRYPTED_NAME,
+                FILE_UPLOADED,
                 FILE_CREATION,
                 FILE_MODIFIED,
                 FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA,

diff --git a/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
@@ -227,6 +227,7 @@ public static OCFile fillOCFile(RemoteFile remote) {
         OCFile file = new OCFile(remote.getRemotePath());
         file.setDecryptedRemotePath(remote.getRemotePath());
         file.setCreationTimestamp(remote.getCreationTimestamp());
+        file.setUploadTimestamp(remote.getUploadTimestamp());
         if (MimeType.DIRECTORY.equalsIgnoreCase(remote.getMimeType())) {
             file.setFileLength(remote.getSize());
         } else {