소스 검색

Simplify

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 년 전
부모
커밋
dcc31bb7ca
1개의 변경된 파일2개의 추가작업 그리고 22개의 파일을 삭제
  1. 2 22
      src/main/java/com/owncloud/android/files/services/FileUploader.java

+ 2 - 22
src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -359,30 +359,10 @@ public class FileUploader extends Service
         private boolean checkIfUploadCanBeRetried(OCUpload ocUpload, boolean gotWifi, boolean isCharging) {
             boolean needsWifi = ocUpload.isUseWifiOnly();
             boolean needsCharging = ocUpload.isWhileChargingOnly();
-            
-            boolean works = true;
 
-            if (needsCharging) {
-                if (isCharging) {
-                    works = true;
-                } else {
-                    return false;
-                }
-            }
-
-            if (needsWifi) {
-                if (gotWifi) {
-                    works = true;
-                } else {
-                    return false;
-                }
-            }
-
-            if (!new File(ocUpload.getLocalPath()).exists()) {
-                works = false;
-            }
+            return new File(ocUpload.getLocalPath()).exists() && !(needsCharging && !isCharging) &&
+                    !(needsWifi && !gotWifi);
 
-            return works;
         }
 
         /**