Merge pull request #2025 from nextcloud/fix-conditions-check

Fix conditions check

src/main/java/com/owncloud/android/jobs/NContentObserverJob.java

@@ -49,7 +49,6 @@ public class NContentObserverJob extends JobService {
                 persistableBundleCompat.putBoolean(FilesSyncJob.SKIP_CUSTOM, true);
 
                 new JobRequest.Builder(FilesSyncJob.TAG)
-                        .addExtras(persistableBundleCompat)
                         .startNow()
                         .setExtras(persistableBundleCompat)
                         .setUpdateCurrent(false)

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
@@ -743,37 +746,40 @@ 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)) {
-            return new RemoteOperationResult(ResultCode.NO_NETWORK_CONNECTION);
+            remoteOperationResult =  new RemoteOperationResult(ResultCode.NO_NETWORK_CONNECTION);
         }
 
         // check that connectivity conditions are met and delays the upload otherwise
         if (mOnWifiOnly && !Device.getNetworkType(mContext).equals(JobRequest.NetworkType.UNMETERED)) {
             Log_OC.d(TAG, "Upload delayed until WiFi is available: " + getRemotePath());
-            return new RemoteOperationResult(ResultCode.DELAYED_FOR_WIFI);
+            remoteOperationResult = new RemoteOperationResult(ResultCode.DELAYED_FOR_WIFI);
         }
 
         // check if charging conditions are met and delays the upload otherwise
-        if (mWhileChargingOnly && !Device.getBatteryStatus(mContext).isCharging()) {
+        if (mWhileChargingOnly && (!Device.getBatteryStatus(mContext).isCharging() && Device.getBatteryStatus(mContext)
+                .getBatteryPercent() < 1)) {
             Log_OC.d(TAG, "Upload delayed until the device is charging: " + getRemotePath());
-            return new RemoteOperationResult(ResultCode.DELAYED_FOR_CHARGING);
+            remoteOperationResult =  new RemoteOperationResult(ResultCode.DELAYED_FOR_CHARGING);
         }
 
         // check that device is not in power save mode
         if (!mIgnoringPowerSaveMode && PowerUtils.isPowerSaveMode(mContext)) {
             Log_OC.d(TAG, "Upload delayed because device is in power save mode: " + getRemotePath());
-            return new RemoteOperationResult(ResultCode.DELAYED_IN_POWER_SAVE_MODE);
+            remoteOperationResult =  new RemoteOperationResult(ResultCode.DELAYED_IN_POWER_SAVE_MODE);
         }
 
         // check if the file continues existing before schedule the operation
         if (!originalFile.exists()) {
             Log_OC.d(TAG, mOriginalStoragePath + " not exists anymore");
-            return new RemoteOperationResult(ResultCode.LOCAL_FILE_NOT_FOUND);
+            remoteOperationResult =  new RemoteOperationResult(ResultCode.LOCAL_FILE_NOT_FOUND);
         }
 
-        return null;
+        return remoteOperationResult;
     }
 
     private RemoteOperationResult normalUpload(OwnCloudClient client) {
@@ -788,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);