Merge pull request #12303 from nextcloud/refactor/use-work-manager-for-upload

Use Only Work Manager For File Upload

app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt

@@ -139,12 +139,10 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         val file = getDummyFile("chunkedFile.txt")
 
         FileUploader.uploadNewFile(
-            targetContext,
             user,
             file.absolutePath,
             "/testFile.txt",
             FileUploader.LOCAL_BEHAVIOUR_COPY,
-            null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,
@@ -258,12 +256,10 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         val file = getDummyFile("nonEmpty.txt")
 
         FileUploader.uploadNewFile(
-            targetContext,
             user,
             file.absolutePath,
             "/testFile.txt",
             FileUploader.LOCAL_BEHAVIOUR_COPY,
-            null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,
@@ -369,12 +365,10 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         val file = getDummyFile("chunkedFile.txt")
 
         FileUploader.uploadNewFile(
-            targetContext,
             user,
             file.absolutePath,
             "/testFile.txt",
             FileUploader.LOCAL_BEHAVIOUR_COPY,
-            null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,
@@ -476,12 +470,10 @@ abstract class FileUploaderIT : AbstractOnServerIT() {
         val file = getDummyFile("chunkedFile.txt")
 
         FileUploader.uploadNewFile(
-            targetContext,
             user,
             file.absolutePath,
             "/testFile.txt",
             FileUploader.LOCAL_BEHAVIOUR_COPY,
-            null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,

app/src/main/java/com/nextcloud/client/documentscan/DocumentScanViewModel.kt

@@ -36,7 +36,6 @@ import com.owncloud.android.files.services.FileUploader
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.helpers.FileOperationsHelper
-import com.owncloud.android.utils.MimeType
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -184,16 +183,10 @@ class DocumentScanViewModel @Inject constructor(
             uploadFolder + OCFile.PATH_SEPARATOR + File(it).name
         }.toTypedArray()
 
-        val mimetypes = pageList.map {
-            MimeType.JPEG
-        }.toTypedArray()
-
         FileUploader.uploadNewFile(
-            getApplication(),
             currentAccountProvider.user,
             pageList.toTypedArray(),
             uploadPaths,
-            mimetypes,
             FileUploader.LOCAL_BEHAVIOUR_DELETE,
             true,
             UploadFileOperation.CREATED_BY_USER,

app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt

@@ -39,7 +39,6 @@ import com.owncloud.android.files.services.FileUploader
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.notifications.NotificationUtils
-import com.owncloud.android.utils.MimeType
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
 import java.security.SecureRandom
@@ -124,12 +123,10 @@ class GeneratePdfFromImagesWork(
         val uploadPath = uploadFolder + OCFile.PATH_SEPARATOR + File(pdfPath).name
 
         FileUploader.uploadNewFile(
-            appContext,
             user,
             pdfPath,
             uploadPath,
             FileUploader.LOCAL_BEHAVIOUR_DELETE, // MIME type will be detected from file name
-            MimeType.PDF,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,

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

@@ -162,7 +162,6 @@ class FilesSyncWork(
         }
         val localPaths = pathsAndMimes.map { it.first }.toTypedArray()
         val remotePaths = pathsAndMimes.map { it.second }.toTypedArray()
-        val mimetypes = pathsAndMimes.map { it.third }.toTypedArray()
 
         if (lightVersion) {
             needsCharging = resources.getBoolean(R.bool.syncedFolder_light_on_charging)
@@ -177,12 +176,11 @@ class FilesSyncWork(
             needsWifi = syncedFolder.isWifiOnly
             uploadAction = syncedFolder.uploadAction
         }
+
         FileUploader.uploadNewFile(
-            context,
             user,
             localPaths,
             remotePaths,
-            mimetypes,
             uploadAction!!,
             true, // create parent folder if not existent
             UploadFileOperation.CREATED_AS_INSTANT_PICTURE,

app/src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -79,6 +79,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.files.model.ServerFileInterface;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 import com.owncloud.android.ui.activity.UploadListActivity;
@@ -902,12 +903,10 @@ public class FileUploader extends Service
      * Upload a new file
      */
     public static void uploadNewFile(
-        Context context,
         User user,
         String localPath,
         String remotePath,
         int behaviour,
-        String mimeType,
         boolean createRemoteFile,
         int createdBy,
         boolean requiresWifi,
@@ -915,11 +914,9 @@ public class FileUploader extends Service
         NameCollisionPolicy nameCollisionPolicy
                                     ) {
         uploadNewFile(
-            context,
             user,
             new String[]{localPath},
             new String[]{remotePath},
-            new String[]{mimeType},
             behaviour,
             createRemoteFile,
             createdBy,
@@ -933,11 +930,9 @@ public class FileUploader extends Service
      * Upload multiple new files
      */
     public static void uploadNewFile(
-        Context context,
         User user,
         String[] localPaths,
         String[] remotePaths,
-        String[] mimeTypes,
         Integer behaviour,
         Boolean createRemoteFolder,
         int createdBy,
@@ -945,9 +940,6 @@ public class FileUploader extends Service
         boolean requiresCharging,
         NameCollisionPolicy nameCollisionPolicy
                                     ) {
-
-
-        if (useFilesUploadWorker(context)) {
         new FilesUploadHelper().uploadNewFiles(user,
                                                localPaths,
                                                remotePaths,
@@ -957,27 +949,6 @@ public class FileUploader extends Service
                                                requiresCharging,
                                                nameCollisionPolicy,
                                                behaviour);
-        } else {
-            Intent intent = new Intent(context, FileUploader.class);
-
-            intent.putExtra(FileUploader.KEY_ACCOUNT, user.toPlatformAccount());
-            intent.putExtra(FileUploader.KEY_USER, user);
-            intent.putExtra(FileUploader.KEY_LOCAL_FILE, localPaths);
-            intent.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);
-            intent.putExtra(FileUploader.KEY_MIME_TYPE, mimeTypes);
-            intent.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, behaviour);
-            intent.putExtra(FileUploader.KEY_CREATE_REMOTE_FOLDER, createRemoteFolder);
-            intent.putExtra(FileUploader.KEY_CREATED_BY, createdBy);
-            intent.putExtra(FileUploader.KEY_WHILE_ON_WIFI_ONLY, requiresWifi);
-            intent.putExtra(FileUploader.KEY_WHILE_CHARGING_ONLY, requiresCharging);
-            intent.putExtra(FileUploader.KEY_NAME_COLLISION_POLICY, nameCollisionPolicy);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                context.startForegroundService(intent);
-            } else {
-                context.startService(intent);
-            }
-        }
     }
 
     /**
@@ -1006,8 +977,7 @@ public class FileUploader extends Service
         OCFile existingFile,
         Integer behaviour,
         NameCollisionPolicy nameCollisionPolicy,
-        boolean disableRetries
+        boolean disableRetries) {
-                                       ) {
         uploadUpdateFile(context,
                          user,
                          new OCFile[]{existingFile},
@@ -1036,13 +1006,7 @@ public class FileUploader extends Service
         intent.putExtra(FileUploader.KEY_NAME_COLLISION_POLICY, nameCollisionPolicy);
         intent.putExtra(FileUploader.KEY_DISABLE_RETRIES, disableRetries);
 
-        if (useFilesUploadWorker(context)) {
         new FilesUploadHelper().uploadUpdatedFile(user, existingFiles, behaviour, nameCollisionPolicy);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(intent);
-        } else {
-            context.startService(intent);
-        }
     }
 
     /**
@@ -1057,13 +1021,7 @@ public class FileUploader extends Service
         i.putExtra(FileUploader.KEY_ACCOUNT, user.toPlatformAccount());
         i.putExtra(FileUploader.KEY_RETRY_UPLOAD, upload);
 
-        if (useFilesUploadWorker(context)) {
         new FilesUploadHelper().retryUpload(upload, user);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.startForegroundService(i);
-        } else {
-            context.startService(i);
-        }
     }
 
     /**
@@ -1129,16 +1087,6 @@ public class FileUploader extends Service
         return FileUploader.class.getName() + UPLOAD_FINISH_MESSAGE;
     }
 
-
-    private static boolean useFilesUploadWorker(Context context) {
-        if (forceNewUploadWorker) {
-            return true;
-        }
-
-        // bump min version down with every release until minSDK is reached, at that point get rid of old upload code
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || context.getResources().getBoolean(R.bool.is_beta);
-    }
-
     @VisibleForTesting
     public static void setForceNewUploadWorker(final Boolean value) {
         forceNewUploadWorker = value;
@@ -1150,7 +1098,6 @@ public class FileUploader extends Service
      * It provides by itself the available operations.
      */
     public class FileUploaderBinder extends Binder implements OnDatatransferProgressListener {
-
         /**
          * Map of listeners that will be reported about progress of uploads from a {@link FileUploaderBinder} instance
          */
@@ -1162,7 +1109,7 @@ public class FileUploader extends Service
          * @param account ownCloud account where the remote file will be stored.
          * @param file    A file in the queue of pending uploads
          */
-        public void cancel(Account account, OCFile file) {
+        public void cancel(Account account, ServerFileInterface file) {
             cancel(account.name, file.getRemotePath(), null);
         }
 
@@ -1183,35 +1130,11 @@ public class FileUploader extends Service
          * @param resultCode  Setting result code will pause rather than cancel the job
          */
         public void cancel(String accountName, String remotePath, @Nullable ResultCode resultCode) {
-            // Cancel for Android version >= Android 11
-            if (useFilesUploadWorker(getApplicationContext())) {
             try {
                 new FilesUploadHelper().cancelFileUpload(remotePath, accountManager.getUser(accountName).get());
             } catch (NoSuchElementException e) {
                 Log_OC.e(TAG, "Error cancelling current upload because user does not exist!");
             }
-            } else {
-                // Cancel for Android version <= Android 10
-                Pair<UploadFileOperation, String> removeResult = mPendingUploads.remove(accountName, remotePath);
-                UploadFileOperation upload = removeResult.first;
-                if (upload == null && mCurrentUpload != null && mCurrentAccount != null &&
-                    mCurrentUpload.getRemotePath().startsWith(remotePath) && accountName.equals(mCurrentAccount.name)) {
-
-                    upload = mCurrentUpload;
-                }
-
-                if (upload != null) {
-                    upload.cancel(resultCode);
-                    // need to update now table in mUploadsStorageManager,
-                    // since the operation will not get to be run by FileUploader#uploadFile
-                    if (resultCode != null) {
-                        mUploadsStorageManager.updateDatabaseUploadResult(new RemoteOperationResult(resultCode), upload);
-                        notifyUploadResult(upload, new RemoteOperationResult(resultCode));
-                    } else {
-                        mUploadsStorageManager.removeUpload(accountName, remotePath);
-                    }
-                }
-            }
         }
 
         /**
@@ -1225,14 +1148,7 @@ public class FileUploader extends Service
 
         public void cancel(String accountName) {
             cancelPendingUploads(accountName);
-            if (useFilesUploadWorker(getApplicationContext())) {
             new FilesUploadHelper().restartUploadJob(accountManager.getUser(accountName).get());
-            } else {
-                if (mCurrentUpload != null && mCurrentUpload.getUser().nameEquals(accountName)) {
-                    mCurrentUpload.cancel(ResultCode.CANCELLED);
-                }
-            }
-
         }
 
         public void clearListeners() {
@@ -1256,23 +1172,18 @@ public class FileUploader extends Service
             if (user == null || file == null) {
                 return false;
             }
-            if (useFilesUploadWorker(getApplicationContext())){
-                // Not same as for service because upload list is "created" on the spot in the worker and not available here
 
             OCUpload upload = mUploadsStorageManager.getUploadByRemotePath(file.getRemotePath());
+
             if (upload == null){
                 return false;
             }
-                 return upload.getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS;
 
-            }else{
+            return upload.getUploadStatus() == UploadStatus.UPLOAD_IN_PROGRESS;
-                return mPendingUploads.contains(user.getAccountName(), file.getRemotePath());
-            }
         }
 
         @SuppressFBWarnings("NP")
         public boolean isUploadingNow(OCUpload upload) {
-            if (useFilesUploadWorker(getApplicationContext())){
             UploadFileOperation currentUploadFileOperation = FilesUploadWorker.Companion.getCurrentUploadFileOperation();
             if (currentUploadFileOperation == null || currentUploadFileOperation.getUser() == null) return false;
             if (upload == null || (!upload.getAccountName().equals(currentUploadFileOperation.getUser().getAccountName()))) return false;
@@ -1282,17 +1193,6 @@ public class FileUploader extends Service
                     upload.getRemotePath().equals(currentUploadFileOperation.getOldFile().getRemotePath());
             }
             return upload.getRemotePath().equals(currentUploadFileOperation.getRemotePath());
-
-            }else {
-
-                return upload != null &&
-                    mCurrentAccount != null &&
-                    mCurrentUpload != null &&
-                    upload.getAccountName().equals(mCurrentAccount.name) &&
-                    (upload.getRemotePath().equals(mCurrentUpload.getRemotePath()) ||
-                        (mCurrentUpload.getOldFile() != null &&
-                            upload.getRemotePath().equals(mCurrentUpload.getOldFile().getRemotePath())));
-            }
         }
 
         /**
@@ -1305,18 +1205,14 @@ public class FileUploader extends Service
         public void addDatatransferProgressListener(
             OnDatatransferProgressListener listener,
             User user,
-            OCFile file
+            ServerFileInterface file
                                                    ) {
             if (user == null || file == null || listener == null) {
                 return;
             }
-            String targetKey = buildRemoteName(user.getAccountName(), file.getRemotePath());
 
-            if (useFilesUploadWorker(getApplicationContext())) {
+            String targetKey = buildRemoteName(user.getAccountName(), file.getRemotePath());
             new FilesUploadHelper().addDatatransferProgressListener(listener,targetKey);
-            }else {
-                mBoundListeners.put(targetKey, listener);
-            }
         }
 
         /**
@@ -1334,11 +1230,7 @@ public class FileUploader extends Service
             }
 
             String targetKey = buildRemoteName(ocUpload.getAccountName(), ocUpload.getRemotePath());
-            if (useFilesUploadWorker(getApplicationContext())) {
             new FilesUploadHelper().addDatatransferProgressListener(listener,targetKey);
-            }else {
-                mBoundListeners.put(targetKey, listener);
-            }
         }
 
         /**
@@ -1351,21 +1243,14 @@ public class FileUploader extends Service
         public void removeDatatransferProgressListener(
             OnDatatransferProgressListener listener,
             User user,
-            OCFile file
+            ServerFileInterface file
                                                       ) {
             if (user == null || file == null || listener == null) {
                 return;
             }
 
             String targetKey = buildRemoteName(user.getAccountName(), file.getRemotePath());
-
-            if (useFilesUploadWorker(getApplicationContext())) {
             new FilesUploadHelper().removeDatatransferProgressListener(listener,targetKey);
-            }else {
-                if (mBoundListeners.get(targetKey) == listener) {
-                    mBoundListeners.remove(targetKey);
-                }
-            }
         }
 
         /**
@@ -1383,14 +1268,7 @@ public class FileUploader extends Service
             }
 
             String targetKey = buildRemoteName(ocUpload.getAccountName(), ocUpload.getRemotePath());
-
-            if (useFilesUploadWorker(getApplicationContext())) {
             new FilesUploadHelper().removeDatatransferProgressListener(listener,targetKey);
-            }else {
-                if (mBoundListeners.get(targetKey) == listener) {
-                    mBoundListeners.remove(targetKey);
-                }
-            }
         }
 
         @Override

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -906,8 +906,15 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
                 default -> FileUploader.LOCAL_BEHAVIOUR_FORGET;
             };
 
-            FileUploader.uploadNewFile(this, getUser().orElseThrow(RuntimeException::new), filePaths, remotePaths, null,           // MIME type will be detected from file name
+            FileUploader.uploadNewFile(getUser().orElseThrow(RuntimeException::new),
-                                       behaviour, true, UploadFileOperation.CREATED_BY_USER, false, false, NameCollisionPolicy.ASK_USER);
+                                       filePaths,
+                                       remotePaths,
+                                       behaviour,
+                                       true,
+                                       UploadFileOperation.CREATED_BY_USER,
+                                       false,
+                                       false,
+                                       NameCollisionPolicy.ASK_USER);
 
         } else {
             Log_OC.d(TAG, "User clicked on 'Update' with no selection");

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -885,12 +885,10 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     public void uploadFile(String tmpName, String filename) {
         FileUploader.uploadNewFile(
-            getBaseContext(),
             getUser().orElseThrow(RuntimeException::new),
             tmpName,
             mFile.getRemotePath() + filename,
             FileUploader.LOCAL_BEHAVIOUR_COPY,
-            null,
             true,
             UploadFileOperation.CREATED_BY_USER,
             false,

app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java

@@ -192,8 +192,7 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
                     user,
                     fullTempPath,
                     currentRemotePath,
-                    behaviour,
+                    behaviour
-                    leakedContentResolver.getType(currentUri)
                 );
                 fullTempPath = null;
             }
@@ -247,14 +246,12 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
         return result;
     }
 
-    private void requestUpload(User user, String localPath, String remotePath, int behaviour, String mimeType) {
+    private void requestUpload(User user, String localPath, String remotePath, int behaviour) {
         FileUploader.uploadNewFile(
-            mAppContext,
             user,
             localPath,
             remotePath,
             behaviour,
-            mimeType,
             false,      // do not create parent folder if not existent
             UploadFileOperation.CREATED_BY_USER,
             false,

app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt

@@ -126,12 +126,10 @@ class UriUploader(
      */
     private fun requestUpload(localPath: String?, remotePath: String) {
         FileUploader.uploadNewFile(
-            mActivity,
             user,
             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,