nextcloud · BatPio · Dec 20, 2022 · Dec 20, 2022 · Dec 20, 2022 · Dec 20, 2022
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/97.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/97.json
diff --git a/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.kt b/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.kt
@@ -57,6 +57,7 @@ class SyncedFoldersActivityIT : AbstractIT() {
             "test@https://nextcloud.localhost",
             0,
             0,
+            0,
             true,
             1000,
             "Name",

diff --git a/app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt
@@ -170,6 +170,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,
@@ -195,6 +196,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,

diff --git a/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt b/app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
@@ -91,7 +91,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 93, to = 94, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 94, to = 95, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
-        AutoMigration(from = 95, to = 96)
+        AutoMigration(from = 95, to = 96),
+        AutoMigration(from = 96, to = 97)
     ],
     exportSchema = true
 )

diff --git a/app/src/main/java/com/nextcloud/client/database/dao/FileSystemDao.kt b/app/src/main/java/com/nextcloud/client/database/dao/FileSystemDao.kt
@@ -36,11 +36,17 @@ interface FileSystemDao {
           AND ${ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_SENT_FOR_UPLOAD} = 0
           AND ${ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_IS_FOLDER} = 0
           AND ${ProviderMeta.ProviderTableMeta._ID} > :lastId
+          AND ${ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_MODIFIED} <= :maxFileTimestamp
         ORDER BY ${ProviderMeta.ProviderTableMeta._ID}
         LIMIT :limit
     """
     )
-    suspend fun getAutoUploadFilesEntities(syncedFolderId: String, limit: Int, lastId: Int): List<FilesystemEntity>
+    suspend fun getAutoUploadFilesEntities(
+        syncedFolderId: String,
+        limit: Int,
+        lastId: Int,
+        maxFileTimestamp: Long
+    ): List<FilesystemEntity>
 
     @Query(
         """

diff --git a/app/src/main/java/com/nextcloud/client/database/entity/SyncedFolderEntity.kt b/app/src/main/java/com/nextcloud/client/database/entity/SyncedFolderEntity.kt
@@ -42,6 +42,8 @@ data class SyncedFolderEntity(
     val uploadAction: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_NAME_COLLISION_POLICY)
     val nameCollisionPolicy: Int?,
+    @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_UPLOAD_MIN_FILE_AGE_MS)
+    val uploadMinFileAgeMs: Long?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_TYPE)
     val type: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_HIDDEN)
@@ -75,6 +77,8 @@ fun SyncedFolderEntity.toSyncedFolder(): SyncedFolder = SyncedFolder(
     this.uploadAction ?: 0,
     // nameCollisionPolicy
     this.nameCollisionPolicy ?: 0,
+    // uploadMinFileAgeMs
+    this.uploadMinFileAgeMs ?: 0,
     // enabled
     this.enabled == 1,
     // timestampMs

diff --git a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/FileSystemRepository.kt
@@ -35,8 +35,11 @@ class FileSystemRepository(private val dao: FileSystemDao, private val context:
     suspend fun getFilePathsWithIds(syncedFolder: SyncedFolder, lastId: Int): List<Pair<String, Int>> {
         val syncedFolderId = syncedFolder.id.toString()
         Log_OC.d(TAG, "Fetching candidate files for syncedFolderId = $syncedFolderId")
-
-        val entities = dao.getAutoUploadFilesEntities(syncedFolderId, BATCH_SIZE, lastId)
+        var maxFileTimestamp = Long.MAX_VALUE
+        if (syncedFolder.uploadMinFileAgeMs > 0) {
+            maxFileTimestamp = System.currentTimeMillis() - syncedFolder.uploadMinFileAgeMs
+        }
+        val entities = dao.getAutoUploadFilesEntities(syncedFolderId, BATCH_SIZE, lastId, maxFileTimestamp)
         val filtered = mutableListOf<Pair<String, Int>>()
 
         entities.forEach {

diff --git a/app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
@@ -38,6 +38,7 @@ public class SyncedFolder implements Serializable, Cloneable {
     private boolean chargingOnly;
     private boolean existing;
     private boolean subfolderByDate;
+    private long uploadMinFileAgeMs;
     private String account;
     private int uploadAction;
     private int nameCollisionPolicy;
@@ -77,6 +78,7 @@ public SyncedFolder(String localPath,
                         String account,
                         int uploadAction,
                         int nameCollisionPolicy,
+                        long uploadMinFileAgeMs,
                         boolean enabled,
                         long timestampMs,
                         MediaFolderType type,
@@ -94,6 +96,7 @@ public SyncedFolder(String localPath,
              account,
              uploadAction,
              nameCollisionPolicy,
+             uploadMinFileAgeMs,
              enabled,
              timestampMs,
              type,
@@ -118,6 +121,7 @@ public SyncedFolder(long id,
                            String account,
                            int uploadAction,
                            int nameCollisionPolicy,
+                           long uploadMinFileAgeMs,
                            boolean enabled,
                            long timestampMs,
                            MediaFolderType type,
@@ -135,6 +139,7 @@ public SyncedFolder(long id,
         this.account = account;
         this.uploadAction = uploadAction;
         this.nameCollisionPolicy = nameCollisionPolicy;
+        this.uploadMinFileAgeMs = uploadMinFileAgeMs;
         this.setEnabled(enabled, timestampMs);
         this.type = type;
         this.hidden = hidden;
@@ -225,6 +230,10 @@ public NameCollisionPolicy getNameCollisionPolicy() {
         return NameCollisionPolicy.deserialize(nameCollisionPolicy);
     }
 
+    public long getUploadMinFileAgeMs() {
+        return uploadMinFileAgeMs;
+    }
+
     public boolean isEnabled() {
         return this.enabled;
     }
@@ -283,6 +292,10 @@ public void setNameCollisionPolicy(int nameCollisionPolicy) {
         this.nameCollisionPolicy = nameCollisionPolicy;
     }
 
+    public void setUploadMinFileAgeMs(long uploadMinFileAgeMs) {
+        this.uploadMinFileAgeMs = uploadMinFileAgeMs;
+    }
+
     public void setType(MediaFolderType type) {
         this.type = type;
     }

diff --git a/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java
@@ -52,6 +52,7 @@ public SyncedFolderDisplayItem(long id,
                                    String account,
                                    int uploadAction,
                                    int nameCollisionPolicy,
+                                   long uploadMinFileAgeMs,
                                    boolean enabled,
                                    long timestampMs,
                                    List<String> filePaths,
@@ -72,6 +73,7 @@ public SyncedFolderDisplayItem(long id,
               account,
               uploadAction,
               nameCollisionPolicy,
+              uploadMinFileAgeMs,
               enabled,
               timestampMs,
               type,
@@ -94,6 +96,7 @@ public SyncedFolderDisplayItem(long id,
                                    String account,
                                    int uploadAction,
                                    int nameCollisionPolicy,
+                                   long uploadMinFileAgeMs,
                                    boolean enabled,
                                    long timestampMs,
                                    String folderName,
@@ -112,6 +115,7 @@ public SyncedFolderDisplayItem(long id,
               account,
               uploadAction,
               nameCollisionPolicy,
+              uploadMinFileAgeMs,
               enabled,
               timestampMs,
               type,

diff --git a/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java
@@ -352,6 +352,8 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_EXISTING)) == 1;
             boolean subfolderByDate = cursor.getInt(cursor.getColumnIndexOrThrow(
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_SUBFOLDER_BY_DATE)) == 1;
+            long uploadMinFileAgeMs = cursor.getLong(cursor.getColumnIndexOrThrow(
+                    ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_UPLOAD_MIN_FILE_AGE_MS));
             String accountName = cursor.getString(cursor.getColumnIndexOrThrow(
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT));
             int uploadAction = cursor.getInt(cursor.getColumnIndexOrThrow(
@@ -384,6 +386,7 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
                                             accountName,
                                             uploadAction,
                                             nameCollisionPolicy,
+                                            uploadMinFileAgeMs,
                                             enabled,
                                             enabledTimestampMs,
                                             type,
@@ -412,6 +415,7 @@ private ContentValues createContentValuesFromSyncedFolder(SyncedFolder syncedFol
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ENABLED, syncedFolder.isEnabled());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ENABLED_TIMESTAMP_MS, syncedFolder.getEnabledTimestampMs());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_SUBFOLDER_BY_DATE, syncedFolder.isSubfolderByDate());
+        cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_UPLOAD_MIN_FILE_AGE_MS, syncedFolder.getUploadMinFileAgeMs());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT, syncedFolder.getAccount());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_UPLOAD_ACTION, syncedFolder.getUploadAction());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_NAME_COLLISION_POLICY,

diff --git a/app/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java
@@ -23,7 +23,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 96;
+    public static final int DB_VERSION = 97;
 
     private ProviderMeta() {
         // No instance
@@ -333,6 +333,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String SYNCED_FOLDER_ACCOUNT = "account";
         public static final String SYNCED_FOLDER_UPLOAD_ACTION = "upload_option";
         public static final String SYNCED_FOLDER_NAME_COLLISION_POLICY = "name_collision_policy";
+        public static final String SYNCED_FOLDER_UPLOAD_MIN_FILE_AGE_MS = "upload_min_file_age_ms";
         public static final String SYNCED_FOLDER_HIDDEN = "hidden";
         public static final String SYNCED_FOLDER_SUBFOLDER_RULE = "sub_folder_rule";
         public static final String SYNCED_FOLDER_EXCLUDE_HIDDEN = "exclude_hidden";

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -386,6 +386,7 @@ class SyncedFoldersActivity :
             syncedFolder.account,
             syncedFolder.uploadAction,
             syncedFolder.nameCollisionPolicyInt,
+            syncedFolder.uploadMinFileAgeMs,
             syncedFolder.isEnabled,
             clock.currentTime,
             filePaths,
@@ -418,6 +419,7 @@ class SyncedFoldersActivity :
             syncedFolder.account,
             syncedFolder.uploadAction,
             syncedFolder.nameCollisionPolicyInt,
+            syncedFolder.uploadMinFileAgeMs,
             syncedFolder.isEnabled,
             clock.currentTime,
             mediaFolder.filePaths,
@@ -448,6 +450,7 @@ class SyncedFoldersActivity :
             account.name,
             FileUploadWorker.LOCAL_BEHAVIOUR_FORGET,
             NameCollisionPolicy.ASK_USER.serialize(),
+            0,
             false,
             clock.currentTime,
             mediaFolder.filePaths,
@@ -541,6 +544,7 @@ class SyncedFoldersActivity :
                         account.name,
                         FileUploadWorker.LOCAL_BEHAVIOUR_FORGET,
                         NameCollisionPolicy.ASK_USER.serialize(),
+                        0,
                         false,
                         clock.currentTime,
                         null,
@@ -677,6 +681,7 @@ class SyncedFoldersActivity :
                 syncedFolder.account,
                 syncedFolder.uploadAction,
                 syncedFolder.nameCollisionPolicy.serialize(),
+                syncedFolder.uploadMinFileAgeMs,
                 syncedFolder.isEnabled,
                 clock.currentTime,
                 File(syncedFolder.localPath).name,
@@ -701,6 +706,7 @@ class SyncedFoldersActivity :
                 syncedFolder.isSubfolderByDate,
                 syncedFolder.uploadAction,
                 syncedFolder.nameCollisionPolicy.serialize(),
+                syncedFolder.uploadMinFileAgeMs,
                 syncedFolder.isEnabled,
                 syncedFolder.subFolderRule,
                 syncedFolder.isExcludeHidden
@@ -789,6 +795,7 @@ class SyncedFoldersActivity :
      * @param subfolderByDate created sub folders
      * @param uploadAction    upload action
      * @param nameCollisionPolicy what to do on name collision
+     * @param uploadMinFileAgeMs minimal age of file to upload
      * @param enabled         is sync enabled
      * @param excludeHidden   exclude hidden file or folder, for {@link MediaFolderType#CUSTOM} only
      */
@@ -804,6 +811,7 @@ class SyncedFoldersActivity :
         subfolderByDate: Boolean,
         uploadAction: Int,
         nameCollisionPolicy: Int,
+        uploadMinFileAgeMs: Long,
         enabled: Boolean,
         subFolderRule: SubFolderRule,
         excludeHidden: Boolean
@@ -817,6 +825,7 @@ class SyncedFoldersActivity :
         item.isSubfolderByDate = subfolderByDate
         item.uploadAction = uploadAction
         item.setNameCollisionPolicy(nameCollisionPolicy)
+        item.uploadMinFileAgeMs = uploadMinFileAgeMs
         item.setEnabled(enabled, clock.currentTime)
         item.setSubFolderRule(subFolderRule)
         item.setExcludeHidden(excludeHidden)
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ class SyncedFoldersActivityIT : AbstractIT() { @@
                 "test@https://nextcloud.localhost",
 ,
 ,
+,
                 true,
 ,
                 "Name",
@@ Expand Down @@