Merge pull request #3580 from nextcloud/lombokLib

use lombok in library

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

@@ -1202,10 +1202,10 @@ public class FileDataStorageManager {
             share.setToken(c.getString(c.getColumnIndex(ProviderTableMeta.OCSHARES_TOKEN)));
             share.setSharedWithDisplayName(
                     c.getString(c.getColumnIndex(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME)));
-            share.setIsFolder(c.getInt(c.getColumnIndex(ProviderTableMeta.OCSHARES_IS_DIRECTORY)) == 1);
+            share.setFolder(c.getInt(c.getColumnIndex(ProviderTableMeta.OCSHARES_IS_DIRECTORY)) == 1);
             share.setUserId(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_USER_ID)));
-            share.setIdRemoteShared(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED)));
-            share.setIsPasswordProtected(c.getInt(c.getColumnIndex(ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED)) == 1);
+            share.setRemoteId(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED)));
+            share.setPasswordProtected(c.getInt(c.getColumnIndex(ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED)) == 1);
             share.setNote(c.getString(c.getColumnIndex(ProviderTableMeta.OCSHARES_NOTE)));
             share.setHideFileDownload(c.getInt(c.getColumnIndex(ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD)) == 1);
         }
@@ -1913,7 +1913,7 @@ public class FileDataStorageManager {
                 capability.getFilesSharingFederationOutgoing().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING,
                 capability.getFilesSharingFederationIncoming().getValue());
-        cv.put(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING, capability.getFilesBigFileChuncking().getValue());
+        cv.put(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING, capability.getFilesBigFileChunking().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE, capability.getFilesUndelete().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_VERSIONING, capability.getFilesVersioning().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_FILES_DROP, capability.getFilesFileDrop().getValue());
@@ -1929,13 +1929,13 @@ public class FileDataStorageManager {
                 .getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_SERVER_BACKGROUND_PLAIN, capability.getServerBackgroundPlain()
                 .getValue());
-        cv.put(ProviderTableMeta.CAPABILITIES_ACTIVITY, capability.isActivityEnabled().getValue());
+        cv.put(ProviderTableMeta.CAPABILITIES_ACTIVITY, capability.getActivity().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT, capability.getRichDocuments().getValue());
         cv.put(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_MIMETYPE_LIST,
                 TextUtils.join(",", capability.getRichDocumentsMimeTypeList()));
         cv.put(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_DIRECT_EDITING, capability.getRichDocumentsDirectEditing()
             .getValue());
-        cv.put(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_TEMPLATES, capability.getRichdocumentsTemplatesAvailable()
+        cv.put(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_TEMPLATES, capability.getRichDocumentsTemplatesAvailable()
             .getValue());
 
         if (capabilityExists(account.name)) {
@@ -2065,7 +2065,7 @@ public class FileDataStorageManager {
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_OUTGOING))));
             capability.setFilesSharingFederationIncoming(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_SHARING_FEDERATION_INCOMING))));
-            capability.setFilesBigFileChuncking(CapabilityBooleanType.fromValue(c.getInt(c
+            capability.setFilesBigFileChunking(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_BIGFILECHUNKING))));
             capability.setFilesUndelete(CapabilityBooleanType.fromValue(c.getInt(c
                     .getColumnIndex(ProviderTableMeta.CAPABILITIES_FILES_UNDELETE))));
@@ -2096,7 +2096,7 @@ public class FileDataStorageManager {
                     c.getColumnIndex(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT))));
             capability.setRichDocumentsDirectEditing(CapabilityBooleanType.fromValue(c.getInt(
                 c.getColumnIndex(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_DIRECT_EDITING))));
-            capability.setRichdocumentsTemplatesAvailable(CapabilityBooleanType.fromValue(c.getInt(
+            capability.setRichDocumentsTemplatesAvailable(CapabilityBooleanType.fromValue(c.getInt(
                 c.getColumnIndex(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_TEMPLATES))));
             String mimetypes = c.getString(c.getColumnIndex(ProviderTableMeta.CAPABILITIES_RICHDOCUMENT_MIMETYPE_LIST));
             if (mimetypes == null) {

src/main/java/com/owncloud/android/operations/CreateShareViaLinkOperation.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author masensio
@@ -21,11 +21,6 @@
 
 package com.owncloud.android.operations;
 
-/**
- * Creates a new public share for a given file
- */
-
-
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
@@ -39,36 +34,29 @@ import com.owncloud.android.operations.common.SyncOperation;
 
 import java.util.ArrayList;
 
-public class CreateShareViaLinkOperation extends SyncOperation {
-
-    private String mPath;
-    private String mPassword;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
-    /**
-     * Constructor
-     * @param path          Full path of the file/folder being shared. Mandatory argument
-     * @param password      Password to protect a public link share.
-     *                      Only available for public link shares
-     */
-    public CreateShareViaLinkOperation(
-            String path,
-            String password
-    ) {
+/**
+ * Creates a new public share for a given file
+ */
+@AllArgsConstructor
+@Getter
+public class CreateShareViaLinkOperation extends SyncOperation {
 
-        mPath = path;
-        mPassword = password;
-    }
+    private String path;
+    private String password;
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         // Check if the share link already exists
-        RemoteOperation operation = new GetRemoteSharesForFileOperation(mPath, false, false);
+        RemoteOperation operation = new GetRemoteSharesForFileOperation(path, false, false);
         RemoteOperationResult result = operation.execute(client);
 
         // Create public link if doesn't exist yet
         boolean publicShareExists = false;
         if (result.isSuccess()) {
-            OCShare share = null;
+            OCShare share;
             for (int i=0 ; i<result.getData().size(); i++) {
                 share = (OCShare) result.getData().get(i);
                 if (ShareType.PUBLIC_LINK.equals(share.getShareType())) {
@@ -79,11 +67,11 @@ public class CreateShareViaLinkOperation extends SyncOperation {
         }
         if (!publicShareExists) {
             CreateRemoteShareOperation createOp = new CreateRemoteShareOperation(
-                    mPath,
+                path,
                     ShareType.PUBLIC_LINK,
                     "",
                     false,
-                    mPassword,
+                password,
                     OCShare.DEFAULT_PERMISSION
             );
             createOp.setGetShareDetails(true);
@@ -110,32 +98,23 @@ public class CreateShareViaLinkOperation extends SyncOperation {
         return result;
     }
 
-    public String getPath() {
-        return mPath;
-    }
-
-    public String getPassword() {
-        return mPassword;
-    }
-
     private void updateData(OCShare share) {
         // Update DB with the response
-        share.setPath(mPath);
-        if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setIsFolder(true);
+        share.setPath(path);
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setFolder(true);
         } else {
-            share.setIsFolder(false);
+            share.setFolder(false);
         }
 
         getStorageManager().saveShare(share);
 
         // Update OCFile with data from share: ShareByLink  and publicLink
-        OCFile file = getStorageManager().getFileByPath(mPath);
+        OCFile file = getStorageManager().getFileByPath(path);
         if (file!=null) {
             file.setPublicLink(share.getShareLink());
             file.setSharedViaLink(true);
             getStorageManager().saveFile(file);
         }
     }
-
 }

src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java

@@ -35,6 +35,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import lombok.Getter;
+
 /**
  * Creates a new private share for a given file.
  */
@@ -42,10 +44,10 @@ public class CreateShareWithShareeOperation extends SyncOperation {
 
     protected FileDataStorageManager mStorageManager;
 
-    private String mPath;
-    private String mShareeName;
-    private ShareType mShareType;
-    private int mPermissions;
+    @Getter private String path;
+    private String shareeName;
+    private ShareType shareType;
+    private int permissions;
 
     private static final List<ShareType> supportedShareTypes = new ArrayList<>(Arrays.asList(ShareType.USER,
             ShareType.GROUP, ShareType.FEDERATED, ShareType.EMAIL, ShareType.ROOM));
@@ -64,22 +66,22 @@ public class CreateShareWithShareeOperation extends SyncOperation {
         if (!supportedShareTypes.contains(shareType)) {
             throw new IllegalArgumentException("Illegal share type " + shareType);
         }
-        mPath = path;
-        mShareeName = shareeName;
-        mShareType = shareType;
-        mPermissions = permissions;
+        this.path = path;
+        this.shareeName = shareeName;
+        this.shareType = shareType;
+        this.permissions = permissions;
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
         CreateRemoteShareOperation operation = new CreateRemoteShareOperation(
-                mPath,
-                mShareType,
-                mShareeName,
+            path,
+            shareType,
+            shareeName,
                 false,
                 "",
-                mPermissions
+            permissions
         );
         operation.setGetShareDetails(true);
         RemoteOperationResult result = operation.execute(client);
@@ -93,19 +95,15 @@ public class CreateShareWithShareeOperation extends SyncOperation {
         return result;
     }
 
-    public String getPath() {
-        return mPath;
-    }
-
     private void updateData(OCShare share) {
         // Update DB with the response
-        share.setPath(mPath);
-        share.setIsFolder(mPath.endsWith(FileUtils.PATH_SEPARATOR));
+        share.setPath(path);
+        share.setFolder(path.endsWith(FileUtils.PATH_SEPARATOR));
 
         getStorageManager().saveShare(share);
 
         // Update OCFile with data from share: ShareByLink  and publicLink
-        OCFile file = getStorageManager().getFileByPath(mPath);
+        OCFile file = getStorageManager().getFileByPath(path);
         if (file!=null) {
             file.setSharedWithSharee(true);    // TODO - this should be done by the FileContentProvider, as part of getStorageManager().saveShare(share)
             getStorageManager().saveFile(file);

src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -174,7 +174,7 @@ public class DownloadFileOperation extends RemoteOperation {
         while (listener.hasNext()) {
             mDownloadOperation.addDatatransferProgressListener(listener.next());
         }
-        result = mDownloadOperation.execute(client, client.useNextcloudUserAgent());
+        result = mDownloadOperation.execute(client, client.isUseNextcloudUserAgent());
 
         if (result.isSuccess()) {
             mModificationTimestamp = mDownloadOperation.getModificationTimestamp();

src/main/java/com/owncloud/android/operations/UpdateSharePermissionsOperation.java

@@ -32,17 +32,20 @@ import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.UpdateRemoteShareOperation;
 import com.owncloud.android.operations.common.SyncOperation;
 
+import lombok.Getter;
+import lombok.Setter;
+
 
 /**
  * Updates an existing private share for a given file.
  */
 public class UpdateSharePermissionsOperation extends SyncOperation {
 
-    private long mShareId;
-    private int mPermissions;
-    private long mExpirationDateInMillis;
-    private String mPassword;
-    private String mPath;
+    private long shareId;
+    @Setter private int permissions;
+    @Setter private long expirationDateInMillis;
+    @Getter @Setter private String password;
+    @Getter private String path;
 
     /**
      * Constructor
@@ -50,62 +53,29 @@ public class UpdateSharePermissionsOperation extends SyncOperation {
      * @param shareId Private {@link OCShare} to update. Mandatory argument
      */
     public UpdateSharePermissionsOperation(long shareId) {
-        mShareId = shareId;
-        mPermissions = -1;
-        mExpirationDateInMillis = 0L;
-        mPassword = null;
-    }
-
-    /**
-     * Set password to update in private share.
-     *
-     * @param password      Password to set to the private share.
-     *                      Empty string clears the current password.
-     *                      Null results in no update applied to the password.
-     */
-    public void setPassword(String password) {
-        mPassword = password;
-    }
-
-    /**
-     * Set permissions to update in private share.
-     *
-     * @param permissions   Permissions to set to the private share.
-     *                      Values <= 0 result in no update applied to the permissions.
-     */
-    public void setPermissions(int permissions) {
-        mPermissions = permissions;
-    }
-
-    /**
-     * Set expiration date to update private share.
-     *
-     * @param expirationDateInMillis    Expiration date to set to the public link.
-     *                                  A negative value clears the current expiration date.
-     *                                  Zero value (start-of-epoch) results in no update done on
-     *                                  the expiration date.
-     */
-    public void setExpirationDate(long expirationDateInMillis) {
-        mExpirationDateInMillis = expirationDateInMillis;
+        this.shareId = shareId;
+        permissions = -1;
+        expirationDateInMillis = 0L;
+        password = null;
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
-        OCShare share = getStorageManager().getShareById(mShareId); // ShareType.USER | ShareType.GROUP
+        OCShare share = getStorageManager().getShareById(shareId); // ShareType.USER | ShareType.GROUP
 
         if (share == null) {
             // TODO try to get remote share before failing?
             return new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
         }
 
-        mPath = share.getPath();
+        path = share.getPath();
 
         // Update remote share with password
         UpdateRemoteShareOperation updateOp = new UpdateRemoteShareOperation(share.getRemoteId());
-        updateOp.setPassword(mPassword);
-        updateOp.setPermissions(mPermissions);
-        updateOp.setExpirationDate(mExpirationDateInMillis);
+        updateOp.setPassword(password);
+        updateOp.setPermissions(permissions);
+        updateOp.setExpirationDate(expirationDateInMillis);
         RemoteOperationResult result = updateOp.execute(client);
 
         if (result.isSuccess()) {
@@ -121,24 +91,16 @@ public class UpdateSharePermissionsOperation extends SyncOperation {
         return result;
     }
 
-    public String getPath() {
-        return mPath;
-    }
-
-    public String getPassword() {
-        return mPassword;
-    }
-
     private void updateData(OCShare share) {
         // Update DB with the response
-        share.setPath(mPath);   // TODO - check if may be moved to UpdateRemoteShareOperation
-        if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setIsFolder(true);
+        share.setPath(path);   // TODO - check if may be moved to UpdateRemoteShareOperation
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setFolder(true);
         } else {
-            share.setIsFolder(false);
+            share.setFolder(false);
         }
 
-        share.setIsPasswordProtected(!TextUtils.isEmpty(mPassword));
+        share.setPasswordProtected(!TextUtils.isEmpty(password));
         getStorageManager().saveShare(share);
     }
 }

src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java

@@ -31,17 +31,21 @@ import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.lib.resources.shares.UpdateRemoteShareOperation;
 import com.owncloud.android.operations.common.SyncOperation;
 
+import lombok.Getter;
+import lombok.Setter;
+
 
 /**
  * Updates an existing public share for a given file
  */
 public class UpdateShareViaLinkOperation extends SyncOperation {
 
-    private String path;
-    private String password;
-    private Boolean publicUpload;
-    private Boolean hideFileDownload;
-    private long expirationDateInMillis;
+    @Getter private String path;
+    @Getter @Setter private String password;
+    /** Enable upload permissions to update in Share resource. */
+    @Setter private Boolean publicUpload;
+    @Setter private Boolean hideFileDownload;
+    @Setter private long expirationDateInMillis;
 
     /**
      * Constructor
@@ -53,43 +57,6 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         expirationDateInMillis = 0;
     }
 
-    /**
-     * Set password to update in public link.
-     *
-     * @param password      Password to set to the public link.
-     *                      Empty string clears the current password.
-     *                      Null results in no update applied to the password.
-     */
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    /**
-     * Set expiration date to update in Share resource.
-     *
-     * @param expirationDateInMillis    Expiration date to set to the public link.
-     *                                  A negative value clears the current expiration date.
-     *                                  Zero value (start-of-epoch) results in no update done on
-     *                                  the expiration date.
-     */
-    public void setExpirationDate(long expirationDateInMillis) {
-        this.expirationDateInMillis = expirationDateInMillis;
-    }
-
-    public void setHideFileDownload(boolean hideFileDownload) {
-        this.hideFileDownload = hideFileDownload;
-    }
-
-    /**
-     * Enable upload permissions to update in Share resource.
-     *
-     * @param publicUpload    Upload Permission to set to the public link.
-     *                        Null results in no update applied to the upload permission.
-     */
-    public void setPublicUpload(Boolean publicUpload) {
-        this.publicUpload = publicUpload;
-    }
-
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
         OCShare publicShare = getStorageManager().getFirstShareByPathAndType(path, ShareType.PUBLIC_LINK, "");
@@ -119,21 +86,13 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         return result;
     }
 
-    public String getPath() {
-        return path;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
     private void updateData(OCShare share) {
         // Update DB with the response
         share.setPath(path);
         if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
-            share.setIsFolder(true);
+            share.setFolder(true);
         } else {
-            share.setIsFolder(false);
+            share.setFolder(false);
         }
 
         getStorageManager().saveShare(share);   // TODO info about having a password? ask to Gonzalo

src/main/java/com/owncloud/android/services/OperationsService.java

@@ -578,7 +578,7 @@ public class OperationsService extends Service {
                             updateLinkOperation.setPassword(password);
 
                             long expirationDate = operationIntent.getLongExtra(EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, 0);
-                            updateLinkOperation.setExpirationDate(expirationDate);
+                            updateLinkOperation.setExpirationDateInMillis(expirationDate);
 
                             boolean hideFileDownload = operationIntent.getBooleanExtra(EXTRA_SHARE_HIDE_FILE_DOWNLOAD,
                                 false);
@@ -597,7 +597,7 @@ public class OperationsService extends Service {
 
                             long expirationDateInMillis = operationIntent
                                     .getLongExtra(EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, 0L);
-                            updateShare.setExpirationDate(expirationDateInMillis);
+                            updateShare.setExpirationDateInMillis(expirationDateInMillis);
 
                             password = operationIntent.getStringExtra(EXTRA_SHARE_PASSWORD);
                             updateShare.setPassword(password);

src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

@@ -91,7 +91,7 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
 
         OCCapability capability = fileActivity.getCapabilities();
         if (capability.getRichDocuments().isTrue() && capability.getRichDocumentsDirectEditing().isTrue() &&
-            capability.getRichdocumentsTemplatesAvailable().isTrue()) {
+            capability.getRichDocumentsTemplatesAvailable().isTrue()) {
             templates.setVisibility(View.VISIBLE);
         }
 

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

@@ -76,7 +76,7 @@ public final class DrawerMenuUtil {
     }
 
     public static void filterActivityMenuItem(Menu menu, @Nullable OCCapability capability) {
-        if (capability != null && capability.isActivityEnabled().isFalse()) {
+        if (capability != null && capability.getActivity().isFalse()) {
             filterMenuItems(menu, R.id.nav_activity);
         }
     }

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

@@ -188,12 +188,12 @@ public final class FileStorageUtils {
         file.setEtag(remote.getEtag());
         file.setPermissions(remote.getPermissions());
         file.setRemoteId(remote.getRemoteId());
-        file.setFavorite(remote.getIsFavorite());
+        file.setFavorite(remote.isFavorite());
         if (file.isFolder()) {
-            file.setEncrypted(remote.getIsEncrypted());
+            file.setEncrypted(remote.isEncrypted());
         }
         file.setMountType(remote.getMountType());
-        file.setPreviewAvailable(remote.hasPreview());
+        file.setPreviewAvailable(remote.isHasPreview());
         file.setUnreadCommentsCount(remote.getUnreadCommentsCount());
 
         return file;