nextcloud · BatPio · Dec 20, 2022 · Dec 20, 2022 · Dec 20, 2022 · Dec 20, 2022
diff --git a/app/schemas/com.nextcloud.client.database.NextcloudDatabase/68.json b/app/schemas/com.nextcloud.client.database.NextcloudDatabase/68.json
diff --git a/...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png b/...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png
diff --git a/...ndroid.ui.dialog.DurationPickerDialogFragmentIT_showSyncDelayDurationDialog.png b/...ndroid.ui.dialog.DurationPickerDialogFragmentIT_showSyncDelayDurationDialog.png
diff --git a/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java
@@ -68,6 +68,7 @@ public void testSyncedFolderDialog() {
                                                                    "test@https://nextcloud.localhost",
                                                                    0,
                                                                    0,
+                                                                   0,
                                                                    true,
                                                                    1000,
                                                                    "Name",

diff --git a/app/src/androidTest/java/com/owncloud/android/ui/dialog/DurationPickerDialogFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/dialog/DurationPickerDialogFragmentIT.kt
@@ -0,0 +1,36 @@
+package com.owncloud.android.ui.dialog
+
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import com.nextcloud.test.TestActivity
+import com.owncloud.android.AbstractIT
+import org.junit.Rule
+import org.junit.Test
+import java.util.concurrent.TimeUnit.DAYS
+import java.util.concurrent.TimeUnit.HOURS
+import java.util.concurrent.TimeUnit.MINUTES
+
+class DurationPickerDialogFragmentIT : AbstractIT() {
+
+    @get:Rule
+    val testActivityRule = IntentsTestRule(TestActivity::class.java, true, false)
+
+    @Test
+    fun showSyncDelayDurationDialog() {
+        val initialDuration = DAYS.toMillis(2) + HOURS.toMillis(8) + MINUTES.toMillis(15)
+        val activity = testActivityRule.launchActivity(null)
+
+        val fm = activity.supportFragmentManager
+        val ft = fm.beginTransaction()
+        ft.addToBackStack(null)
+
+        val dialog = DurationPickerDialogFragment.newInstance(
+            initialDuration,
+            "Dialog title",
+            "Hint message"
+        )
+        dialog.show(ft, "DURATION_DIALOG")
+
+        waitForIdleSync()
+        screenshot(dialog.requireDialog().window!!.decorView)
+    }
+}
diff --git a/app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt
@@ -182,6 +182,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,
@@ -204,6 +205,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,

diff --git a/app/src/androidTest/java/com/owncloud/android/utils/TimeUtilsTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/TimeUtilsTest.kt
@@ -0,0 +1,28 @@
+package com.owncloud.android.utils
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.owncloud.android.utils.TimeUtils.getDurationParts
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+@RunWith(AndroidJUnit4::class)
+class TimeUtilsTest {
+
+    @Test
+    fun shouldGetDurationParts() {
+        val days = 5
+        val hours = 10
+        val minutes = 30
+        val duration = TimeUnit.DAYS.toMillis(days.toLong()) +
+            TimeUnit.HOURS.toMillis(hours.toLong()) +
+            TimeUnit.MINUTES.toMillis(minutes.toLong())
+
+        val durationParts = getDurationParts(duration)
+
+        assertEquals(days, durationParts.days)
+        assertEquals(hours, durationParts.hours)
+        assertEquals(minutes, durationParts.minutes)
+    }
+}
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
@@ -54,6 +54,8 @@ data class SyncedFolderEntity(
     val uploadAction: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_NAME_COLLISION_POLICY)
     val nameCollisionPolicy: Int?,
+    @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_UPLOAD_DELAY_TIME_MS)
+    val uploadDelayTimeMs: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_TYPE)
     val type: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_HIDDEN)

diff --git a/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java
@@ -83,6 +83,7 @@
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
+import com.owncloud.android.ui.dialog.DurationPickerDialogFragment;
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.dialog.LoadingDialog;
@@ -442,6 +443,9 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract SyncFileNotEnoughSpaceDialogFragment syncFileNotEnoughSpaceDialogFragment();
 
+    @ContributesAndroidInjector
+    abstract DurationPickerDialogFragment durationPickerFragment();
+
     @ContributesAndroidInjector
     abstract DashboardWidgetConfigurationActivity dashboardWidgetConfigurationActivity();
 

diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
@@ -141,7 +141,8 @@ class FilesSyncWork(
         }
         val paths = filesystemDataProvider.getFilesForUpload(
             syncedFolder.localPath,
-            syncedFolder.id.toString()
+            syncedFolder.id.toString(),
+            syncedFolder.uploadDelayTimeMs
         )
 
         if (paths.size == 0) {

diff --git a/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java b/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
@@ -74,19 +74,22 @@ public void updateFilesystemFileAsSentForUpload(String path, String syncedFolder
         );
     }
 
-    public Set<String> getFilesForUpload(String localPath, String syncedFolderId) {
+    public Set<String> getFilesForUpload(String localPath, String syncedFolderId, long uploadDelayTimeMs) {
         Set<String> localPathsToUpload = new HashSet<>();
 
         String likeParam = localPath + "%";
 
+        long olderThanParam = (System.currentTimeMillis() - uploadDelayTimeMs) / 1000;
+
         Cursor cursor = contentResolver.query(
                 ProviderMeta.ProviderTableMeta.CONTENT_URI_FILESYSTEM,
                 null,
                 ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_LOCAL_PATH + " LIKE ? and " +
                         ProviderMeta.ProviderTableMeta.FILESYSTEM_SYNCED_FOLDER_ID + " = ? and " +
                         ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_SENT_FOR_UPLOAD + " = ? and " +
-                        ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_IS_FOLDER + " = ?",
-                new String[]{likeParam, syncedFolderId, "0", "0"},
+                        ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_IS_FOLDER + " = ? and " +
+                        ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_MODIFIED + " <= ?",
+                new String[]{likeParam, syncedFolderId, "0", "0", Long.toString(olderThanParam)},
                 null);
 
         if (cursor != null) {

diff --git a/app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
@@ -40,6 +40,7 @@ public class SyncedFolder implements Serializable, Cloneable {
     private boolean chargingOnly;
     private boolean existing;
     private boolean subfolderByDate;
+    private long uploadDelayTimeMs;
     private String account;
     private int uploadAction;
     private int nameCollisionPolicy;
@@ -74,6 +75,7 @@ public SyncedFolder(String localPath,
                         String account,
                         int uploadAction,
                         int nameCollisionPolicy,
+                        long uploadDelayTimeMs,
                         boolean enabled,
                         long timestampMs,
                         MediaFolderType type,
@@ -88,6 +90,7 @@ public SyncedFolder(String localPath,
              account,
              uploadAction,
              nameCollisionPolicy,
+             uploadDelayTimeMs,
              enabled,
              timestampMs,
              type,
@@ -109,6 +112,7 @@ protected SyncedFolder(long id,
                            String account,
                            int uploadAction,
                            int nameCollisionPolicy,
+                           long uploadDelayTimeMs,
                            boolean enabled,
                            long timestampMs,
                            MediaFolderType type,
@@ -123,6 +127,7 @@ protected SyncedFolder(long id,
         this.account = account;
         this.uploadAction = uploadAction;
         this.nameCollisionPolicy = nameCollisionPolicy;
+        this.uploadDelayTimeMs = uploadDelayTimeMs;
         this.setEnabled(enabled, timestampMs);
         this.type = type;
         this.hidden = hidden;
@@ -188,6 +193,10 @@ public NameCollisionPolicy getNameCollisionPolicy() {
         return NameCollisionPolicy.deserialize(nameCollisionPolicy);
     }
 
+    public long getUploadDelayTimeMs() {
+        return uploadDelayTimeMs;
+    }
+
     public boolean isEnabled() {
         return this.enabled;
     }
@@ -244,6 +253,10 @@ public void setNameCollisionPolicy(int nameCollisionPolicy) {
         this.nameCollisionPolicy = nameCollisionPolicy;
     }
 
+    public void setUploadDelayTimeMs(long uploadDelayTimeMs) {
+        this.uploadDelayTimeMs = uploadDelayTimeMs;
+    }
+
     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
@@ -61,6 +61,7 @@ public SyncedFolderDisplayItem(long id,
                                    String account,
                                    int uploadAction,
                                    int nameCollisionPolicy,
+                                   long uploadDelayTimeMs,
                                    boolean enabled,
                                    long timestampMs,
                                    List<String> filePaths,
@@ -78,6 +79,7 @@ public SyncedFolderDisplayItem(long id,
               account,
               uploadAction,
               nameCollisionPolicy,
+              uploadDelayTimeMs,
               enabled,
               timestampMs,
               type,
@@ -97,6 +99,7 @@ public SyncedFolderDisplayItem(long id,
                                    String account,
                                    int uploadAction,
                                    int nameCollisionPolicy,
+                                   long uploadDelayTimeMs,
                                    boolean enabled,
                                    long timestampMs,
                                    String folderName,
@@ -112,6 +115,7 @@ public SyncedFolderDisplayItem(long id,
               account,
               uploadAction,
               nameCollisionPolicy,
+              uploadDelayTimeMs,
               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
@@ -346,6 +346,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 uploadDelayTimeMs = cursor.getLong(cursor.getColumnIndexOrThrow(
+                    ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_UPLOAD_DELAY_TIME_MS));
             String accountName = cursor.getString(cursor.getColumnIndexOrThrow(
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ACCOUNT));
             int uploadAction = cursor.getInt(cursor.getColumnIndexOrThrow(
@@ -371,6 +373,7 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
                                             accountName,
                                             uploadAction,
                                             nameCollisionPolicy,
+                                            uploadDelayTimeMs,
                                             enabled,
                                             enabledTimestampMs,
                                             type,
@@ -396,6 +399,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_DELAY_TIME_MS, syncedFolder.getUploadDelayTimeMs());
         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
@@ -35,7 +35,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 67;
+    public static final int DB_VERSION = 68;
 
     private ProviderMeta() {
         // No instance
@@ -286,6 +286,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_DELAY_TIME_MS = "upload_delay_time_ms";
         public static final String SYNCED_FOLDER_HIDDEN = "hidden";
 
         // Columns of external links table

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
@@ -393,6 +393,7 @@ class SyncedFoldersActivity :
             syncedFolder.account,
             syncedFolder.uploadAction,
             syncedFolder.nameCollisionPolicyInt,
+            syncedFolder.uploadDelayTimeMs,
             syncedFolder.isEnabled,
             clock.currentTime,
             filePaths,
@@ -422,6 +423,7 @@ class SyncedFoldersActivity :
             syncedFolder.account,
             syncedFolder.uploadAction,
             syncedFolder.nameCollisionPolicyInt,
+            syncedFolder.uploadDelayTimeMs,
             syncedFolder.isEnabled,
             clock.currentTime,
             mediaFolder.filePaths,
@@ -450,6 +452,7 @@ class SyncedFoldersActivity :
             account.name,
             FileUploader.LOCAL_BEHAVIOUR_FORGET,
             NameCollisionPolicy.ASK_USER.serialize(),
+            0,
             false,
             clock.currentTime,
             mediaFolder.filePaths,
@@ -543,6 +546,7 @@ class SyncedFoldersActivity :
                         account.name,
                         FileUploader.LOCAL_BEHAVIOUR_FORGET,
                         NameCollisionPolicy.ASK_USER.serialize(),
+                        0,
                         false,
                         clock.currentTime,
                         null,
@@ -652,6 +656,7 @@ class SyncedFoldersActivity :
                 syncedFolder.account,
                 syncedFolder.uploadAction,
                 syncedFolder.nameCollisionPolicy.serialize(),
+                syncedFolder.uploadDelayTimeMs,
                 syncedFolder.isEnabled,
                 clock.currentTime,
                 File(syncedFolder.localPath).name,
@@ -673,6 +678,7 @@ class SyncedFoldersActivity :
                 syncedFolder.isSubfolderByDate,
                 syncedFolder.uploadAction,
                 syncedFolder.nameCollisionPolicy.serialize(),
+                syncedFolder.uploadDelayTimeMs,
                 syncedFolder.isEnabled
             )
             saveOrUpdateSyncedFolder(item)
@@ -739,6 +745,7 @@ class SyncedFoldersActivity :
      * @param subfolderByDate created sub folders
      * @param uploadAction    upload action
      * @param nameCollisionPolicy what to do on name collision
+     * @param uploadDelayTimeMs delay
      * @param enabled         is sync enabled
      */
     @Suppress("LongParameterList")
@@ -753,6 +760,7 @@ class SyncedFoldersActivity :
         subfolderByDate: Boolean,
         uploadAction: Int,
         nameCollisionPolicy: Int,
+        uploadDelayTimeMs: Long,
         enabled: Boolean
     ) {
         item.id = id
@@ -764,6 +772,7 @@ class SyncedFoldersActivity :
         item.isSubfolderByDate = subfolderByDate
         item.uploadAction = uploadAction
         item.setNameCollisionPolicy(nameCollisionPolicy)
+        item.uploadDelayTimeMs = uploadDelayTimeMs
         item.setEnabled(enabled, clock.currentTime)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,7 @@ public void testSyncedFolderDialog() { @@
                                                                        "test@https://nextcloud.localhost",
 ,
 ,
+,
                                                                        true,
 ,
                                                                        "Name",
@@ Expand Down @@