Ver Fonte

add missing constructor usages

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk há 6 meses atrás
pai
commit
d8e951ecaa

+ 6 - 4
app/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -114,7 +114,8 @@ public class SynchronizeFileOperation extends SyncOperation {
         User user,
         boolean syncFileContents,
         Context context,
-        FileDataStorageManager storageManager) {
+        FileDataStorageManager storageManager,
+        boolean syncForInternalTwoWaySyncWorker) {
         super(storageManager);
 
         mLocalFile = localFile;
@@ -134,6 +135,7 @@ public class SynchronizeFileOperation extends SyncOperation {
         mSyncFileContents = syncFileContents;
         mContext = context;
         mAllowUploads = true;
+        this.syncForInternalTwoWaySyncWorker = syncForInternalTwoWaySyncWorker;
     }
 
 
@@ -163,9 +165,9 @@ public class SynchronizeFileOperation extends SyncOperation {
         boolean syncFileContents,
         boolean allowUploads,
         Context context,
-        FileDataStorageManager storageManager) {
-
-        this(localFile, serverFile, user, syncFileContents, context, storageManager);
+        FileDataStorageManager storageManager,
+        boolean syncForInternalTwoWaySyncWorker) {
+        this(localFile, serverFile, user, syncFileContents, context, storageManager, syncForInternalTwoWaySyncWorker);
         mAllowUploads = allowUploads;
     }
 

+ 4 - 2
app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -409,7 +409,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
                 user,
                 true,
                 mContext,
-                getStorageManager()
+                getStorageManager(),
+                syncForInternalTwoWaySyncWorker
             );
             mFilesToSyncContents.add(operation);
         }
@@ -430,7 +431,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
                         user,
                         true,
                         mContext,
-                        getStorageManager()
+                        getStorageManager(),
+                        syncForInternalTwoWaySyncWorker
                     );
                     mFilesToSyncContents.add(operation);
                 }

+ 4 - 2
app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -225,7 +225,8 @@ public class FileOperationsHelper {
                                                                     user,
                                                                     true,
                                                                     fileActivity,
-                                                                    storageManager);
+                                                                    storageManager,
+                                                                    false);
         RemoteOperationResult result = sfo.execute(fileActivity);
 
         if (result.getCode() == RemoteOperationResult.ResultCode.SYNC_CONFLICT) {
@@ -303,7 +304,8 @@ public class FileOperationsHelper {
                                                                                 user,
                                                                                 true,
                                                                                 fileActivity,
-                                                                                storageManager);
+                                                                                storageManager,
+                                                                                false);
                     RemoteOperationResult result = sfo.execute(fileActivity);
                     fileActivity.dismissLoadingDialog();
                     if (result.getCode() == RemoteOperationResult.ResultCode.SYNC_CONFLICT) {