fix: upload cancel

Signed-off-by: alperozturk <[email protected]>

# Conflicts:
#	build.gradle

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -104,7 +104,7 @@ class FileUploadWorker(
         fun cancelCurrentUpload(remotePath: String, accountName: String, onCompleted: () -> Unit) {
             currentUploadFileOperation?.let {
                 if (it.remotePath == remotePath && it.user.accountName == accountName) {
-                    it.cancel(null)
+                    it.cancel(ResultCode.USER_CANCELLED)
                     onCompleted()
                 }
             }
@@ -400,6 +400,10 @@ class FileUploadWorker(
             return
         }
 
+        if (uploadResult.code == ResultCode.USER_CANCELLED) {
+            return
+        }
+
         notificationManager.run {
             val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(
                 uploadResult,

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

@@ -798,7 +798,7 @@ public void updateDatabaseUploadResult(RemoteOperationResult uploadResult, Uploa
                     upload.getRemotePath(),
                     localPath
                                   );
-            } else {
+            } else if (uploadResult.getCode() != RemoteOperationResult.ResultCode.USER_CANCELLED){
                 updateUploadStatus(
                     upload.getOCUploadId(),
                     UploadStatus.UPLOAD_FAILED,

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -1131,10 +1131,6 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
         return result;
     }
 
-    private boolean isCancellationRequested() {
-        return mCancellationRequested.get() || mUpload.getUploadStatus() == UploadsStorageManager.UploadStatus.UPLOAD_CANCELLED;
-    }
-
     private void updateSize(long size) {
         OCUpload ocUpload = uploadsStorageManager.getUploadById(getOCUploadId());
         if (ocUpload != null) {
@@ -1172,7 +1168,7 @@ private RemoteOperationResult copyFile(File originalFile, String expectedPath) t
             return copy(originalFile, temporalFile);
         }
 
-        if (isCancellationRequested()) {
+        if (mCancellationRequested.get()) {
             throw new OperationCancelledException();
         }
 
@@ -1214,7 +1210,7 @@ private RemoteOperationResult checkNameCollision(OCFile parentFile,
             }
         }
 
-        if (isCancellationRequested()) {
+        if (mCancellationRequested.get()) {
             throw new OperationCancelledException();
         }
 
@@ -1438,21 +1434,37 @@ private static boolean existsFile(OwnCloudClient client,
     }
 
     /**
-     * Allows to cancel the actual upload operation. If actual upload operating is in progress it is cancelled, if
-     * upload preparation is being performed upload will not take place.
+     * Cancels the current upload process.
+     *
+     * <p>
+     * Behavior depends on the current state of the upload:
+     * <ul>
+     *   <li><b>Upload in preparation:</b> Upload will not start and a cancellation flag is set.</li>
+     *   <li><b>Upload in progress:</b> The ongoing upload operation is cancelled via
+     *       {@link UploadFileRemoteOperation#cancel(ResultCode)}.</li>
+     *   <li><b>No upload operation:</b> A cancellation flag is still set, but this situation is unexpected
+     *       and logged as an error.</li>
+     * </ul>
+     *
+     * <p>
+     * Once cancelled, the database will be updated through
+     * {@link UploadsStorageManager#updateDatabaseUploadResult(RemoteOperationResult, UploadFileOperation)}.
+     *
+     * @param cancellationReason the reason for cancellation
      */
     public void cancel(ResultCode cancellationReason) {
-        if (mUploadOperation == null) {
+        if (mUploadOperation != null) {
+            // Cancel an active upload
+            Log_OC.d(TAG, "Cancelling upload during actual upload operation.");
+            mUploadOperation.cancel(cancellationReason);
+        } else {
+            // Cancel while preparing or when no upload exists
+            mCancellationRequested.set(true);
             if (mUploadStarted.get()) {
-                Log_OC.d(TAG, "Cancelling upload during upload preparations.");
-                mCancellationRequested.set(true);
+                Log_OC.d(TAG, "Cancelling upload during preparation.");
             } else {
-                mCancellationRequested.set(true);
                 Log_OC.e(TAG, "No upload in progress. This should not happen.");
             }
-        } else {
-            Log_OC.d(TAG, "Cancelling upload during actual upload operation.");
-            mUploadOperation.cancel(cancellationReason);
         }
     }
 
@@ -1507,19 +1519,19 @@ private RemoteOperationResult copy(File sourceFile, File targetFile) throws IOEx
                     out = new FileOutputStream(targetFile);
                     int nRead;
                     byte[] buf = new byte[4096];
-                    while (!isCancellationRequested() &&
+                    while (!mCancellationRequested.get() &&
                         (nRead = in.read(buf)) > -1) {
                         out.write(buf, 0, nRead);
                     }
                     out.flush();
 
                 } // else: weird but possible situation, nothing to copy
 
-                if (isCancellationRequested()) {
-                    return new RemoteOperationResult<>(new OperationCancelledException());
+                if (mCancellationRequested.get()) {
+                    return new RemoteOperationResult(new OperationCancelledException());
                 }
             } catch (Exception e) {
-                return new RemoteOperationResult<>(ResultCode.LOCAL_STORAGE_NOT_COPIED);
+                return new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_COPIED);
             } finally {
                 try {
                     if (in != null) {

gradle/verification-metadata.xml

@@ -16772,6 +16772,14 @@
             <sha256 value="66fc4c12f83ef0d2ae5536ebc4d808e2225129ba4668af77f03f27bd95b93934" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="198270eb39">
+         <artifact name="android-library-198270eb39.aar">
+            <sha256 value="9bfd96478ef41028d4f469453e8ae43c29f9a80b35ef0b40aeb14a3818815ab4" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-198270eb39.module">
+            <sha256 value="afee00871f65f143324e77d6c3b95ed80e92a0127a70aae92be856823bba9a5b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="1a8e497c9a75edb490014ba01b9675f452d39ef6">
          <artifact name="android-library-1a8e497c9a75edb490014ba01b9675f452d39ef6.aar">
             <sha256 value="9022efe1d029eb74b5c165144d010dcca39bc23fd7004a3463996e5012f3d424" origin="Generated by Gradle"/>