Explorar el Código

Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space

David A. Velasco hace 10 años
padre
commit
4d2b382785
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. 6 2
      src/com/owncloud/android/operations/UploadFileOperation.java

+ 6 - 2
src/com/owncloud/android/operations/UploadFileOperation.java

@@ -258,7 +258,6 @@ public class UploadFileOperation extends RemoteOperation {
                                     (nRead = in.read(data, 0, data.length)) != -1) {
                                 out.write(data, 0, nRead);
                             }
-
                             out.flush();
 
                         } else {
@@ -278,6 +277,11 @@ public class UploadFileOperation extends RemoteOperation {
                             }
                         }
 
+                        if (mCancellationRequested.get()) {
+                            result = new RemoteOperationResult(new OperationCancelledException());
+                        }
+
+
                     } catch (Exception e) {
                         result = new RemoteOperationResult(ResultCode.LOCAL_STORAGE_NOT_COPIED);
                         return result;
@@ -300,7 +304,7 @@ public class UploadFileOperation extends RemoteOperation {
                     }
                 }
             }
-            localCopyPassed = true;
+            localCopyPassed = result.isSuccess();
 
             /// perform the upload
             if ( mChunked &&