use lombok for has preview

rename
cleanup
fix warnings

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -476,7 +476,7 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.FILE_FAVORITE, file.isFavorite());
         cv.put(ProviderTableMeta.FILE_IS_ENCRYPTED, file.isEncrypted());
         cv.put(ProviderTableMeta.FILE_MOUNT_TYPE, file.getMountType().ordinal());
-        cv.put(ProviderTableMeta.FILE_HAS_PREVIEW, file.hasPreview() ? 1 : 0);
+        cv.put(ProviderTableMeta.FILE_HAS_PREVIEW, file.isPreviewAvailable() ? 1 : 0);
         return cv;
     }
 
@@ -970,7 +970,7 @@ public class FileDataStorageManager {
             }
             file.setMountType(WebdavEntry.MountType.values()[c.getInt(
                     c.getColumnIndex(ProviderTableMeta.FILE_MOUNT_TYPE))]);
-            file.setHasPreview(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_HAS_PREVIEW)) == 1);
+            file.setPreviewAvailable(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_HAS_PREVIEW)) == 1);
         }
         return file;
     }

src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -54,14 +54,18 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
 
     private static final String TAG = OCFile.class.getSimpleName();
 
-    /** android internal ID of the file */
-    @Getter @Setter private long fileId;
+    @Getter
+    @Setter
+    private long fileId; // android internal ID of the file
     @Getter @Setter private long parentId;
     @Getter @Setter private long fileLength;
-    /** UNIX timestamp of the time the file was created */
-    @Getter @Setter private long creationTimestamp;
-    /** UNIX timestamp of the file modification time */
-    @Getter @Setter private long modificationTimestamp;
+    @Getter
+    @Setter
+    private long creationTimestamp; // UNIX timestamp of the time the file was created
+
+    @Getter
+    @Setter
+    private long modificationTimestamp; // UNIX timestamp of the file modification time
     /** UNIX timestamp of the modification time, corresponding to the value returned by the server
      * in the last synchronization of THE CONTENTS of this file.
      */
@@ -73,29 +77,24 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     @Getter @Setter private long lastSyncDateForProperties;
     @Getter @Setter private long lastSyncDateForData;
     @Getter @Setter private boolean availableOffline;
-    private boolean mHasPreview;
-
+    @Getter
+    @Setter
+    private boolean previewAvailable;
     @Getter private String etag;
-
     @Getter @Setter private boolean sharedViaLink;
     @Getter @Setter private String publicLink;
-
     @Getter @Setter private String permissions;
-    /** The fileid namespaced by the instance fileId, globally unique */
-    @Getter @Setter private String remoteId;
-
+    @Getter
+    @Setter
+    private String remoteId; // The fileid namespaced by the instance fileId, globally unique
     @Getter @Setter private boolean updateThumbnailNeeded;
-
     @Getter @Setter private boolean downloading;
-
-    @Getter @Setter private String etagInConflict;    // Save file etag in the server, when there is a conflict. No conflict =  null
-
+    @Getter
+    @Setter
+    private String etagInConflict; // Only saves file etag in the server, when there is a conflict
     @Getter @Setter private boolean sharedWithSharee;
-
     @Getter @Setter private boolean favorite;
-
     @Getter @Setter private boolean encrypted;
-
     @Getter @Setter private WebdavEntry.MountType mountType;
 
     /**
@@ -241,7 +240,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
      * @return true if it is a folder
      */
     public boolean isFolder() {
-        return mimeType != null && mimeType.equals(MimeType.DIRECTORY);
+        return MimeType.DIRECTORY.equals(mimeType);
     }
 
 
@@ -305,7 +304,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     }
 
 
-    public Uri getLegacyExposedFileUri(Context context) {
+    public Uri getLegacyExposedFileUri() {
         if (localPath == null || localPath.length() == 0) {
             return null;
         }
@@ -333,7 +332,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
             } catch (IllegalArgumentException ex) {
                 // Could not share file using FileProvider URI scheme.
                 // Fall back to legacy URI parsing.
-                getLegacyExposedFileUri(context);
+                getLegacyExposedFileUri();
             }
         }
 
@@ -370,7 +369,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     public void setFileName(String name) {
         Log_OC.d(TAG, "OCFile name changing from " + remotePath);
         if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) &&
-                !remotePath.equals(ROOT_PATH)) {
+            !ROOT_PATH.equals(remotePath)) {
             String parent = new File(this.getRemotePath()).getParent();
             parent = parent.endsWith(PATH_SEPARATOR) ? parent : parent + PATH_SEPARATOR;
             remotePath = parent + name;
@@ -459,10 +458,11 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         return 31 * (int) (fileId ^ (fileId >>> 32)) + (int) (parentId ^ (parentId >>> 32));
     }
 
+    @NonNull
     @Override
     public String toString() {
         String asString = "[fileId=%s, name=%s, mime=%s, downloaded=%s, local=%s, remote=%s, " +
-                "parentId=%s, availableOffline=%s etag=%s favourite=%s]";
+            "parentId=%s, availableOffline=%s etag=%s favourite=%s]";
         return String.format(asString, fileId, getFileName(), mimeType, isDown(),
             localPath, remotePath, parentId, availableOffline,
             etag, favorite);
@@ -497,7 +497,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     }
 
     public boolean isInConflict() {
-        return etagInConflict != null && !etagInConflict.equals("");
+        return etagInConflict != null && !"".equals(etagInConflict);
     }
 
     public boolean isSharedWithMe() {
@@ -515,14 +515,6 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         return permissions != null && permissions.contains(PERMISSION_CAN_WRITE);
     }
 
-    public boolean hasPreview() {
-        return mHasPreview;
-    }
-
-    public void setHasPreview(boolean hasPreview) {
-        this.mHasPreview = hasPreview;
-    }
-
     public static final Parcelable.Creator<OCFile> CREATOR = new Parcelable.Creator<OCFile>() {
 
         @Override

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -163,28 +163,21 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     }
 
     public void setFavoriteAttributeForItemID(String fileId, boolean favorite) {
-        int filesSize = mFiles.size();
-        for (int i = 0; i < filesSize; i++) {
-            if (mFiles.get(i).getRemoteId().equals(fileId)) {
-                mFiles.get(i).setFavorite(favorite);
+        for (OCFile file : mFiles) {
+            if (file.getRemoteId().equals(fileId)) {
+                file.setFavorite(favorite);
                 break;
             }
         }
 
-        filesSize = mFilesAll.size();
-        for (int i = 0; i < filesSize; i++) {
-            if (mFilesAll.get(i).getRemoteId().equals(fileId)) {
-                mFilesAll.get(i).setFavorite(favorite);
+        for (OCFile file : mFilesAll) {
+            if (file.getRemoteId().equals(fileId)) {
+                file.setFavorite(favorite);
                 break;
             }
         }
 
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
+        new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
     }
 
     public void setEncryptionAttributeForItemID(String fileId, boolean encrypted) {
@@ -204,12 +197,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
         }
 
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
+        new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
     }
 
     @Override
@@ -382,7 +370,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                     mContext));
         } else {
             if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) && file.getRemoteId() != null &&
-                file.hasPreview()) {
+                file.isPreviewAvailable()) {
                 // Thumbnail in cache?
                 Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                         ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId()
@@ -501,12 +489,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             sharedIconView.setImageResource(R.drawable.ic_unshared);
             sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
         }
-        sharedIconView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ocFileListFragmentInterface.onShareIconClick(file);
-            }
-        });
+        sharedIconView.setOnClickListener(view -> ocFileListFragmentInterface.onShareIconClick(file));
     }
 
     /**
@@ -514,7 +497,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      *  @param directory             New folder to adapt. Can be NULL, meaning
      *                              "no content to adapt".
      * @param updatedStorageManager Optional updated storage manager; used to replace
-     * @param limitToMimeType
+     * @param limitToMimeType   show only files of this mimeType
      */
     public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager,
                               boolean onlyOnDevice, String limitToMimeType) {
@@ -586,12 +569,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         mFilesAll.clear();
         mFilesAll.addAll(mFiles);
 
-        new Handler(Looper.getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                notifyDataSetChanged();
-            }
-        });
+        new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
     }
 
     private void parseShares(List<Object> objects) {
@@ -685,24 +663,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         mStorageManager.saveVirtuals(type, contentValues);
     }
 
-    /**
-     * Filter for getting only the folders
-     *
-     * @param files Collection of files to filter
-     * @return Folders in the input
-     */
-    public List<OCFile> getFolders(List<OCFile> files) {
-        List<OCFile> ret = new ArrayList<>();
-
-        for (OCFile file : files) {
-            if (file.isFolder()) {
-                ret.add(file);
-            }
-        }
-
-        return ret;
-    }
-
 
     public void setSortOrder(OCFile folder, FileSortOrder sortOrder) {
         PreferenceManager.setSortOrder(mContext, folder, sortOrder);
@@ -759,8 +719,10 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             return results;
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         protected void publishResults(CharSequence constraint, Filter.FilterResults results) {
+
             Vector<OCFile> ocFiles = (Vector<OCFile>) results.values;
             mFiles.clear();
             if (ocFiles != null && ocFiles.size() > 0) {
@@ -783,7 +745,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
      * @param files Collection of files to filter
      * @return Non-hidden files
      */
-    public List<OCFile> filterHiddenFiles(List<OCFile> files) {
+    private List<OCFile> filterHiddenFiles(List<OCFile> files) {
         List<OCFile> ret = new ArrayList<>();
 
         for (OCFile file : files) {
@@ -825,7 +787,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         gridView = bool;
     }
 
-    static class OCFileListItemViewHolder extends OCFileListGridItemViewHolder {
+    private static class OCFileListItemViewHolder extends OCFileListGridItemViewHolder {
         private final TextView fileSize;
         private final TextView lastModification;
         private final ImageView overflowMenu;
@@ -871,7 +833,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
-    static class OCFileListFooterViewHolder extends RecyclerView.ViewHolder {
+    private static class OCFileListFooterViewHolder extends RecyclerView.ViewHolder {
         private final TextView footerText;
 
         private OCFileListFooterViewHolder(View itemView) {

src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -372,7 +372,7 @@ public class FileOperationsHelper {
                 Arrays.asList(officeExtensions).contains(file.getFileName().substring(file.getFileName().
                         lastIndexOf(".") + 1)) &&
                 !file.getStoragePath().startsWith(MainApp.getAppContext().getFilesDir().getAbsolutePath())) {
-            return file.getLegacyExposedFileUri(mFileActivity);
+            return file.getLegacyExposedFileUri();
         } else {
             return file.getExposedFileUri(mFileActivity);
         }

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author David A. Velasco
@@ -177,7 +177,7 @@ public final class FileStorageUtils {
             file.setEncrypted(remote.getIsEncrypted());
         }
         file.setMountType(remote.getMountType());
-        file.setHasPreview(remote.hasPreview());
+        file.setPreviewAvailable(remote.hasPreview());
 
         return file;
     }