Browse Source

Update for codacy warnings

Mario Danic 8 years ago
parent
commit
0ee60c5529

+ 1 - 1
src/com/owncloud/android/services/FileAlterationMagicListener.java

@@ -96,7 +96,7 @@ public class FileAlterationMagicListener implements FileAlterationListener {
             Long dateFolder = file.lastModified();
             final Locale current = context.getResources().getConfiguration().locale;
 
-            if (mimetypeString.equalsIgnoreCase("image/jpeg") || mimetypeString.equals("image/tiff")) {
+            if ("image/jpeg".equalsIgnoreCase(mimetypeString) || "image/tiff".equalsIgnoreCase(mimetypeString)) {
                 try {
                     ExifInterface exifInterface = new ExifInterface(file.getAbsolutePath());
                     if (!TextUtils.isEmpty(exifInterface.getAttribute(ExifInterface.TAG_DATETIME))) {

+ 3 - 1
src/com/owncloud/android/services/observer/FileAlterationMagicObserver.java

@@ -59,7 +59,7 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
     private Comparator<File> comparator;
     private SyncedFolder syncedFolder;
 
-    static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0];
+    private static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0];
 
 
     public FileAlterationMagicObserver(SyncedFolder syncedFolder, FileFilter fileFilter) {
@@ -144,6 +144,7 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
      *
      */
     public void initialize() {
+        // does nothing - hack the monitor
     }
 
 
@@ -165,6 +166,7 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
      * @throws Exception if an error occurs
      */
     public void destroy() throws Exception {
+        // does nothing
     }
 
     /**

+ 0 - 5
src/com/owncloud/android/services/observer/SyncedFolderObserverService.java

@@ -28,7 +28,6 @@ import android.os.Binder;
 import android.os.IBinder;
 
 import com.owncloud.android.MainApp;
-import com.owncloud.android.datamodel.SerializablePair;
 import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.lib.common.utils.Log_OC;
@@ -37,11 +36,9 @@ import com.owncloud.android.services.FileAlterationMagicListener;
 import org.apache.commons.io.monitor.FileAlterationListener;
 import org.apache.commons.io.monitor.FileAlterationMonitor;
 import org.apache.commons.io.monitor.FileAlterationObserver;
-import org.apache.commons.io.monitor.FileEntry;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 public class SyncedFolderObserverService extends Service {
     private static final String TAG = "SyncedFolderObserverService";
@@ -49,8 +46,6 @@ public class SyncedFolderObserverService extends Service {
     private final IBinder mBinder = new SyncedFolderObserverBinder();
     private FileAlterationMonitor monitor;
     private FileFilter fileFilter;
-    private CopyOnWriteArrayList<SerializablePair<SyncedFolder, FileEntry>> pairArrayList = new CopyOnWriteArrayList<>();
-    private File file;
 
     @Override
     public void onCreate() {