FileUploader: require explicit NameCollisionPolicy and change default…

… used value - Changes NameConflictPolicy for manual uploads from default RENAME to ASK_USER - Removal of helper class FileUploader.UploadRequester (methods become static and go to FileUploader) Signed-off-by: Alice Gaudon <alice@gaudon.pro>
nextcloud · Feb 18, 2020 · 7713a28 · 7713a28
1 parent 6783e8a
commit 7713a28
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 337 deletions.
diff --git a/src/main/java/com/owncloud/android/files/services/FileUploader.java b/src/main/java/com/owncloud/android/files/services/FileUploader.java
diff --git a/src/main/java/com/owncloud/android/jobs/ContactsBackupJob.java b/src/main/java/com/owncloud/android/jobs/ContactsBackupJob.java
@@ -169,18 +169,18 @@ private void backupContact(User user, String backupFolder) {
             }
         }
 
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        requester.uploadNewFile(
-                getContext(),
-                user.toPlatformAccount(),
-                file.getAbsolutePath(),
-                backupFolder + filename,
-                FileUploader.LOCAL_BEHAVIOUR_MOVE,
-                null,
-                true,
-                UploadFileOperation.CREATED_BY_USER,
-                false,
-                false
+        FileUploader.uploadNewFile(
+            getContext(),
+            user.toPlatformAccount(),
+            file.getAbsolutePath(),
+            backupFolder + filename,
+            FileUploader.LOCAL_BEHAVIOUR_MOVE,
+            null,
+            true,
+            UploadFileOperation.CREATED_BY_USER,
+            false,
+            false,
+            FileUploader.NameCollisionPolicy.ASK_USER
         );
     }
 

diff --git a/src/main/java/com/owncloud/android/jobs/FilesSyncJob.java b/src/main/java/com/owncloud/android/jobs/FilesSyncJob.java
@@ -141,12 +141,11 @@ protected Result onRunJob(@NonNull Params params) {
         Locale currentLocale = context.getResources().getConfiguration().locale;
         SimpleDateFormat sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss", currentLocale);
         sFormatter.setTimeZone(TimeZone.getTimeZone(TimeZone.getDefault().getID()));
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
 
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
             if ((syncedFolder.isEnabled()) && (!skipCustom || MediaFolderType.CUSTOM != syncedFolder.getType())) {
                 syncFolder(context, resources, lightVersion, filesystemDataProvider, currentLocale, sFormatter,
-                        requester, syncedFolder);
+                           syncedFolder);
             }
         }
 
@@ -157,10 +156,15 @@ protected Result onRunJob(@NonNull Params params) {
         return Result.SUCCESS;
     }
 
-    private void syncFolder(Context context, Resources resources, boolean lightVersion,
-                            FilesystemDataProvider filesystemDataProvider, Locale currentLocale,
-                            SimpleDateFormat sFormatter, FileUploader.UploadRequester requester,
-                            SyncedFolder syncedFolder) {
+    private void syncFolder(
+        Context context,
+        Resources resources,
+        boolean lightVersion,
+        FilesystemDataProvider filesystemDataProvider,
+        Locale currentLocale,
+        SimpleDateFormat sFormatter,
+        SyncedFolder syncedFolder
+    ) {
         String remotePath;
         boolean subfolderByDate;
         Integer uploadAction;
@@ -203,7 +207,7 @@ private void syncFolder(Context context, Resources resources, boolean lightVersi
                 remotePath = syncedFolder.getRemotePath();
             }
 
-            requester.uploadFileWithNameCollisionPolicy(
+            FileUploader.uploadNewFile(
                 context,
                 user.toPlatformAccount(),
                 file.getAbsolutePath(),

diff --git a/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -291,9 +291,13 @@ protected RemoteOperationResult run(OwnCloudClient client) {
      * @param file OCFile object representing the file to upload
      */
     private void requestForUpload(OCFile file) {
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        requester.uploadUpdate(mContext, mAccount, file, FileUploader.LOCAL_BEHAVIOUR_MOVE,
-                               FileUploader.NameCollisionPolicy.ASK_USER);
+        FileUploader.uploadUpdateFile(
+            mContext,
+            mAccount,
+            file,
+            FileUploader.LOCAL_BEHAVIOUR_MOVE,
+            FileUploader.NameCollisionPolicy.ASK_USER
+        );
 
         mTransferWasRequested = true;
     }

diff --git a/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -82,7 +82,6 @@ public void conflictDecisionMade(Decision decision) {
         }
 
         OCFile file = getFile();
-        FileUploader.UploadRequester uploadRequester = new FileUploader.UploadRequester();
 
         // Upload
         if (decision == Decision.KEEP_LOCAL || decision == Decision.KEEP_BOTH) {
@@ -91,7 +90,7 @@ public void conflictDecisionMade(Decision decision) {
                 collisionPolicy = FileUploader.NameCollisionPolicy.RENAME;
             }
 
-            uploadRequester.uploadUpdate(this, getAccount(), file, localBehaviour, collisionPolicy);
+            FileUploader.uploadUpdateFile(this, getAccount(), file, localBehaviour, collisionPolicy);
 
             if (this.conflictUpload != null) {
                 uploadsStorageManager.removeUpload(this.conflictUpload);

diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1043,8 +1043,7 @@ private void requestUploadOfFilesFromFileSystem(String[] filePaths, int resultCo
                     break;
             }
 
-            FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-            requester.uploadNewFile(
+            FileUploader.uploadNewFile(
                 this,
                 getAccount(),
                 filePaths,
@@ -1054,7 +1053,8 @@ private void requestUploadOfFilesFromFileSystem(String[] filePaths, int resultCo
                 false,          // do not create parent folder if not existent
                 UploadFileOperation.CREATED_BY_USER,
                 false,
-                false
+                false,
+                FileUploader.NameCollisionPolicy.ASK_USER
             );
 
         } else {

diff --git a/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -888,19 +888,19 @@ private boolean somethingToUpload() {
     }
 
     public void uploadFile(String tmpName, String filename) {
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        requester.uploadNewFile(
+        FileUploader.uploadNewFile(
             getBaseContext(),
             getAccount(),
-                tmpName,
+            tmpName,
             mFile.getRemotePath() + filename,
             FileUploader.LOCAL_BEHAVIOUR_COPY,
             null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,
-            false
-            );
+            false,
+            FileUploader.NameCollisionPolicy.ASK_USER
+        );
         finish();
     }
 

diff --git a/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -220,14 +220,15 @@ private void refresh() {
         }
 
         // retry failed uploads
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        new Thread(() -> requester.retryFailedUploads(this,
-                                                      null,
-                                                      uploadsStorageManager,
-                                                      connectivityService,
-                                                      userAccountManager,
-                                                      powerManagementService,
-                                                      null)).start();
+        new Thread(() -> FileUploader.retryFailedUploads(
+            this,
+            null,
+            uploadsStorageManager,
+            connectivityService,
+            userAccountManager,
+            powerManagementService,
+            null
+        )).start();
 
         // update UI
         uploadListAdapter.loadUploadItemsFromDb();

diff --git a/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -142,16 +142,15 @@ public void onBindHeaderViewHolder(SectionedViewHolder holder, int section, bool
                     uploadsStorageManager.clearSuccessfulUploads();
                     break;
                 case FAILED:
-                    new Thread(() -> new FileUploader.UploadRequester()
-                        .retryFailedUploads(
-                            parentActivity,
-                            null,
-                            uploadsStorageManager,
-                            connectivityService,
-                            accountManager,
-                            powerManagementService,
-                            null))
-                        .start();
+                    new Thread(() -> FileUploader.retryFailedUploads(
+                        parentActivity,
+                        null,
+                        uploadsStorageManager,
+                        connectivityService,
+                        accountManager,
+                        powerManagementService,
+                        null
+                    )).start();
                     break;
 
                 default:
@@ -394,8 +393,7 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
                 // not a credentials error
                 File file = new File(item.getLocalPath());
                 if (file.exists()) {
-                    FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-                    requester.retry(parentActivity, accountManager, item);
+                    FileUploader.retryUpload(parentActivity, item.getAccount(accountManager), item);
                     loadUploadItemsFromDb();
                 } else {
                     DisplayUtils.showSnackMessage(

diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java b/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java
@@ -219,8 +219,7 @@ protected ResultCode doInBackground(Object[] params) {
     }
 
     private void requestUpload(Account account, String localPath, String remotePath, int behaviour, String mimeType) {
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        requester.uploadNewFile(
+        FileUploader.uploadNewFile(
             mAppContext,
             account,
             localPath,
@@ -230,7 +229,8 @@ private void requestUpload(Account account, String localPath, String remotePath,
             false,      // do not create parent folder if not existent
             UploadFileOperation.CREATED_BY_USER,
             false,
-             false
+            false,
+            FileUploader.NameCollisionPolicy.ASK_USER
         );
     }
 

diff --git a/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java b/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java
@@ -158,18 +158,18 @@ private String generateDiplayName() {
      * @param remotePath    Absolute path in the current OC account to set to the uploaded file.
      */
     private void requestUpload(String localPath, String remotePath) {
-        FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
-        requester.uploadNewFile(
-                mActivity,
-                mAccount,
-                localPath,
-                remotePath,
-                mBehaviour,
-                null,       // MIME type will be detected from file name
-                false,      // do not create parent folder if not existent
-                UploadFileOperation.CREATED_BY_USER,
-                false,
-                false
+        FileUploader.uploadNewFile(
+            mActivity,
+            mAccount,
+            localPath,
+            remotePath,
+            mBehaviour,
+            null,       // MIME type will be detected from file name
+            false,      // do not create parent folder if not existent
+            UploadFileOperation.CREATED_BY_USER,
+            false,
+            false,
+            FileUploader.NameCollisionPolicy.ASK_USER
         );
     }
 

diff --git a/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java b/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
@@ -196,8 +196,6 @@ public static void restartJobsIfNeeded(final UploadsStorageManager uploadsStorag
                                            final PowerManagementService powerManagementService) {
         final Context context = MainApp.getAppContext();
 
-        FileUploader.UploadRequester uploadRequester = new FileUploader.UploadRequester();
-
         boolean accountExists;
 
         OCUpload[] failedUploads = uploadsStorageManager.getFailedUploads();
@@ -221,13 +219,15 @@ public static void restartJobsIfNeeded(final UploadsStorageManager uploadsStorag
         new Thread(() -> {
             if (connectivityService.getActiveNetworkType() != JobRequest.NetworkType.ANY &&
                     !connectivityService.isInternetWalled()) {
-                uploadRequester.retryFailedUploads(context,
-                                                   null,
-                                                   uploadsStorageManager,
-                                                   connectivityService,
-                                                   accountManager,
-                                                   powerManagementService,
-                                                   null);
+                FileUploader.retryFailedUploads(
+                    context,
+                    null,
+                    uploadsStorageManager,
+                    connectivityService,
+                    accountManager,
+                    powerManagementService,
+                    null
+                );
             }
         }).start();
     }