Explorar o código

Formated the code

Kilian Périsset %!s(int64=5) %!d(string=hai) anos
pai
achega
f9a47e6b3b

+ 5 - 1
src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java

@@ -56,7 +56,11 @@ public class SyncFileNotEnoughSpaceDialogFragment extends ConfirmationDialogFrag
         // Defining title, message and resources
         args.putInt(ARG_TITLE_ID, R.string.sync_not_enough_space_dialog_title);
         args.putInt(ARG_MESSAGE_RESOURCE_ID, R.string.sync_not_enough_space_dialog_placeholder);
-        args.putStringArray(ARG_MESSAGE_ARGUMENTS, new String[]{file.getFileName(), properFileSize, properDiskAvailableSpace});
+        args.putStringArray(ARG_MESSAGE_ARGUMENTS,
+                            new String[] {
+                                file.getFileName(),
+                                properFileSize,
+                                properDiskAvailableSpace});
         args.putParcelable(ARG_PASSED_FILE, file);
 
         // Defining buttons

+ 3 - 4
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1727,11 +1727,10 @@ public class OCFileListFragment extends ExtendedListFragment implements
     private void syncAndCheckFiles(Collection<OCFile> files) {
         for (OCFile file : files) {
             // Get the remaining space on device (after file download)
-            long remainingSpaceOnDevice = FileOperationsHelper.getRemainingSpaceOnDevice(file);
-            // Get the total available space on device (before file download)
-            long availableSpaceOnDevice = file.getFileLength() + remainingSpaceOnDevice;
+            long availableSpaceOnDevice = FileOperationsHelper.getAvailableSpaceOnDevice();
+
             // Determine if space is enough to download the file
-            boolean isSpaceEnough = remainingSpaceOnDevice > 0;
+            boolean isSpaceEnough = availableSpaceOnDevice > file.getFileLength();
 
             if (isSpaceEnough) {
                 mContainerActivity.getFileOperationsHelper().syncFile(file);

+ 2 - 2
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -1038,7 +1038,7 @@ public class FileOperationsHelper {
         return new SimpleDateFormat("yyyy-MM-dd_HHmmss", Locale.US).format(new Date()) + ".jpg";
     }
 
-    public static Long getRemainingSpaceOnDevice(OCFile file) {
+    public static Long getAvailableSpaceOnDevice() {
         StatFs stat = new StatFs(MainApp.getStoragePath());
         long availableBytesOnDevice;
 
@@ -1048,7 +1048,7 @@ public class FileOperationsHelper {
             availableBytesOnDevice = (long) stat.getBlockSize() * (long) stat.getAvailableBlocks();
         }
 
-        return availableBytesOnDevice - file.getFileLength();
+        return availableBytesOnDevice;
     }