Missing stuff all around

Signed-off-by: Mario Danic <mario@lovelyhq.com>

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

@@ -430,6 +430,9 @@ public class UploadFileOperation extends SyncOperation {
             // check conditions 
             result = checkConditions(originalFile);
 
+            if (result != null) {
+                return result;
+            }
             /***** E2E *****/
 
             // Lock folder
@@ -744,7 +747,7 @@ public class UploadFileOperation extends SyncOperation {
 
     private RemoteOperationResult checkConditions(File originalFile) {
         RemoteOperationResult remoteOperationResult = null;
-        
+
         // check that internet is not behind walled garden
         if (Device.getNetworkType(mContext).equals(JobRequest.NetworkType.ANY) ||
                 ConnectivityUtils.isInternetWalled(mContext)) {
@@ -791,6 +794,10 @@ public class UploadFileOperation extends SyncOperation {
             // check conditions
             result = checkConditions(originalFile);
 
+            if (result != null) {
+                return result;
+            }
+
             // check name collision
             checkNameCollision(client, null, false);