#7815 Delayed synchronization

app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java

@@ -59,6 +59,7 @@ public void testSyncedFolderDialog() {
                                                                    "test@https://nextcloud.localhost",
                                                                    0,
                                                                    0,
+                                                                   0,
                                                                    true,
                                                                    1000,
                                                                    "Name",

app/src/androidTest/java/com/owncloud/android/ui/dialog/DurationPickerDialogFragmentIT.kt

@@ -0,0 +1,55 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Piotr Bator
+ * Copyright (C) 2022 Piotr Bator
+ * Copyright (C) 2022 Nextcloud GmbH
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package com.owncloud.android.ui.dialog
+
+import androidx.annotation.UiThread
+import androidx.test.core.app.launchActivity
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import com.nextcloud.test.TestActivity
+import com.owncloud.android.AbstractIT
+import com.owncloud.android.utils.ScreenshotTest
+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() {
+
+    private val testClassName = "com.owncloud.android.ui.dialog.DurationPickerDialogFragmentIT"
+
+    @Test
+    @UiThread
+    @ScreenshotTest
+    fun showSyncDelayDurationDialog() {
+        val initialDuration = DAYS.toMillis(2) + HOURS.toMillis(8) + MINUTES.toMillis(15)
+
+        launchActivity<TestActivity>().use { scenario ->
+            scenario.onActivity { sut ->
+                val transaction = sut.supportFragmentManager.beginTransaction()
+
+                val dialog = DurationPickerDialogFragment.newInstance(
+                    initialDuration,
+                    "Dialog title",
+                    "Hint message"
+                )
+                dialog.show(transaction, "DURATION_DIALOG")
+
+                onIdleSync {
+                    val screenShotName = createName(testClassName + "_" + "showSyncDelayDurationDialog", "")
+                    onView(isRoot()).check(matches(isDisplayed()))
+                    screenshotViaName(sut, screenShotName)
+                }
+            }
+        }
+    }
+}

app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt

@@ -169,6 +169,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,
@@ -194,6 +195,7 @@ class SyncedFolderUtilsTest : AbstractIT() {
             account.name,
             1,
             1,
+            0,
             true,
             0L,
             MediaFolderType.IMAGE,

app/src/androidTest/java/com/owncloud/android/utils/TimeUtilsTest.kt

@@ -0,0 +1,37 @@
+/*
+ * Nextcloud Android client application
+ *
+ * @author Piotr Bator
+ * Copyright (C) 2022 Piotr Bator
+ * Copyright (C) 2022 Nextcloud GmbH
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+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)
+    }
+}

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -68,7 +68,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 81, to = 82),
         AutoMigration(from = 82, to = 83),
         AutoMigration(from = 83, to = 84),
-        AutoMigration(from = 84, to = 85, spec = DatabaseMigrationUtil.DeleteColumnSpec::class)
+        AutoMigration(from = 84, to = 85, spec = DatabaseMigrationUtil.DeleteColumnSpec::class),
+        AutoMigration(from = 85, to = 86)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/entity/SyncedFolderEntity.kt

@@ -39,6 +39,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, defaultValue = "0")
+    val uploadDelayTimeMs: Long,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_TYPE)
     val type: Int?,
     @ColumnInfo(name = ProviderTableMeta.SYNCED_FOLDER_HIDDEN)

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -81,6 +81,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;
@@ -446,6 +447,9 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract SyncFileNotEnoughSpaceDialogFragment syncFileNotEnoughSpaceDialogFragment();
 
+    @ContributesAndroidInjector
+    abstract DurationPickerDialogFragment durationPickerFragment();
+
     @ContributesAndroidInjector
     abstract DashboardWidgetConfigurationActivity dashboardWidgetConfigurationActivity();
 

app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt

@@ -218,15 +218,16 @@ class FilesSyncWork(
         syncedFolderProvider.updateSyncFolder(syncedFolder)
     }
 
-    private fun getAllFiles(path: String): Set<File> {
+    private fun getAllFiles(path: String, maxFileTimestamp: Long?): Set<File> {
         return File(path).takeIf { it.exists() }
             ?.walkTopDown()
             ?.asSequence()
             ?.filter { file ->
                 file.isFile &&
                     file.exists() &&
                     isQualifiedFolder(file.parentFile?.path) &&
-                    isFileNameQualifiedForAutoUpload(file.name)
+                    isFileNameQualifiedForAutoUpload(file.name) &&
+                    maxFileTimestamp?.let { it >= file.lastModified() } ?: true
             }
             ?.toSet()
             ?: emptySet()
@@ -259,7 +260,13 @@ class FilesSyncWork(
             null
         }
 
-        val files = getAllFiles(syncedFolder.localPath)
+        val maxFileTimestamp = if (syncedFolder.uploadDelayTimeMs > 0) {
+            System.currentTimeMillis() - syncedFolder.uploadDelayTimeMs
+        } else {
+            null
+        }
+
+        val files = getAllFiles(syncedFolder.localPath, maxFileTimestamp)
         if (files.isEmpty()) {
             return
         }

app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java

@@ -12,6 +12,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 
+import com.google.common.collect.ObjectArrays;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.lib.common.utils.Log_OC;
 

app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java

@@ -35,6 +35,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,
@@ -91,6 +93,7 @@ public SyncedFolder(String localPath,
              account,
              uploadAction,
              nameCollisionPolicy,
+             uploadDelayTimeMs,
              enabled,
              timestampMs,
              type,
@@ -115,6 +118,7 @@ protected SyncedFolder(long id,
                            String account,
                            int uploadAction,
                            int nameCollisionPolicy,
+                           long uploadDelayTimeMs,
                            boolean enabled,
                            long timestampMs,
                            MediaFolderType type,
@@ -132,6 +136,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;
@@ -200,6 +205,10 @@ public NameCollisionPolicy getNameCollisionPolicy() {
         return NameCollisionPolicy.deserialize(nameCollisionPolicy);
     }
 
+    public long getUploadDelayTimeMs() {
+        return uploadDelayTimeMs;
+    }
+
     public boolean isEnabled() {
         return this.enabled;
     }
@@ -258,6 +267,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;
     }

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 uploadDelayTimeMs,
                                    boolean enabled,
                                    long timestampMs,
                                    List<String> filePaths,
@@ -72,6 +73,7 @@ public SyncedFolderDisplayItem(long id,
               account,
               uploadAction,
               nameCollisionPolicy,
+              uploadDelayTimeMs,
               enabled,
               timestampMs,
               type,
@@ -94,6 +96,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,

app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -368,6 +368,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(
@@ -400,6 +402,7 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
                                             accountName,
                                             uploadAction,
                                             nameCollisionPolicy,
+                                            uploadDelayTimeMs,
                                             enabled,
                                             enabledTimestampMs,
                                             type,
@@ -428,6 +431,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,

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 = 85;
+    public static final int DB_VERSION = 86;
 
     private ProviderMeta() {
         // No instance
@@ -309,6 +309,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";
         public static final String SYNCED_FOLDER_SUBFOLDER_RULE = "sub_folder_rule";
         public static final String SYNCED_FOLDER_EXCLUDE_HIDDEN = "exclude_hidden";