Browse Source

PMD appeased

Some warnings have been supressed.
Iskra Delta 8 years ago
parent
commit
89137a0819

+ 17 - 0
src/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -724,6 +724,23 @@ public class FileDataStorageManager {
                 Log_OC.e(TAG, e.getMessage(), e);
                 throw e;
             }
+        } catch (IOException ex) {
+            ret = false;
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    Log_OC.d(TAG, e.getMessage(), e);
+                }
+            }
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    Log_OC.d(TAG, e.getMessage(), e);
+                }
+            }
         }
 
         ArrayList<ContentProviderOperation> operations = new ArrayList<>(cursor.getCount());

+ 1 - 0
src/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -24,6 +24,7 @@ package com.owncloud.android.operations;
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;

+ 1 - 0
src/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -311,5 +311,6 @@ public class ErrorMessageAdapter {
         return code == ResultCode.WRONG_CONNECTION ||
                 code == ResultCode.TIMEOUT ||
                 code == ResultCode.HOST_NOT_AVAILABLE;
+        }
     }
 }

+ 4 - 4
src/com/owncloud/android/utils/FileStorageUtils.java

@@ -291,7 +291,7 @@ public class FileStorageUtils {
         List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
 
         Collections.sort(files, new Comparator<File>() {
-            @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")
+            @SuppressFBWarnings(value = "Bx")
             public int compare(File o1, File o2) {
             Long obj1 = o1.lastModified();
             return multiplier * obj1.compareTo(o2.lastModified());
@@ -309,7 +309,7 @@ public class FileStorageUtils {
         final int multiplier = mSortAscending ? 1 : -1;
 
         Collections.sort(files, new Comparator<OCFile>() {
-            @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")
+            @SuppressFBWarnings(value = "Bx")
             public int compare(OCFile o1, OCFile o2) {
                 if (o1.isFolder() && o2.isFolder()) {
                     Long obj1 = o1.getFileLength();
@@ -338,7 +338,7 @@ public class FileStorageUtils {
         List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
 
         Collections.sort(files, new Comparator<File>() {
-            @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")
+            @SuppressFBWarnings(value = "Bx")
             public int compare(File o1, File o2) {
                 if (o1.isDirectory() && o2.isDirectory()) {
                     Long obj1 = getFolderSize(o1);
@@ -362,7 +362,7 @@ public class FileStorageUtils {
      * Sorts list by Name
      * @param files     files to sort
      */
-    @SuppressFBWarnings(value = "Bx", justification = "Would require stepping up API level")
+    @SuppressFBWarnings(value = "Bx")
     public static Vector<OCFile> sortOCFilesByName(Vector<OCFile> files){
         final int multiplier = mSortAscending ? 1 : -1;