Rebase master

Signed-off-by: alperozturk <alper_ozturk@proton.me>

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

@@ -325,48 +325,6 @@ class FilesUploadWorker(
         const val LOCAL_BEHAVIOUR_FORGET = 2
         const val LOCAL_BEHAVIOUR_DELETE = 3
 
-        /**
-         * Upload and overwrite an already uploaded file with disabled retries
-         */
-        fun uploadUpdateFile(
-            context: Context?,
-            user: User,
-            existingFile: OCFile?,
-            behaviour: Int?,
-            nameCollisionPolicy: NameCollisionPolicy?
-        ) {
-            uploadUpdateFile(
-                context,
-                user, arrayOf(existingFile),
-                behaviour,
-                nameCollisionPolicy,
-                true
-            )
-        }
-
-        /**
-         * Upload and overwrite an already uploaded file
-         */
-        fun uploadUpdateFile(
-            context: Context?,
-            user: User,
-            existingFile: OCFile?,
-            behaviour: Int?,
-            nameCollisionPolicy: NameCollisionPolicy?,
-            disableRetries: Boolean
-        ) {
-            uploadUpdateFile(
-                context,
-                user, arrayOf(existingFile),
-                behaviour,
-                nameCollisionPolicy,
-                disableRetries
-            )
-        }
-
-        /**
-         * Upload and overwrite already uploaded files
-         */
         fun uploadUpdateFile(
             context: Context?,
             user: User,

app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java

@@ -270,7 +270,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
                         FilesUploadWorker.Companion.uploadUpdateFile(
                             context,
                             user,
-                            ocFile,
+                            new OCFile[]{ ocFile },
                             FilesUploadWorker.LOCAL_BEHAVIOUR_DELETE,
                             NameCollisionPolicy.OVERWRITE,
                             false);

app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

@@ -96,7 +96,8 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
                         user,
                         arrayOf(file),
                         localBehaviour,
-                        NameCollisionPolicy.OVERWRITE
+                        NameCollisionPolicy.OVERWRITE,
+                        true
                     )
                     uploadsStorageManager?.removeUpload(upload)
                 }
@@ -106,7 +107,8 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
                         user,
                         arrayOf(file),
                         localBehaviour,
-                        NameCollisionPolicy.RENAME
+                        NameCollisionPolicy.RENAME,
+                        true
                     )
                     uploadsStorageManager?.removeUpload(upload)
                 }