Merge 350f9e9ef4927899b8a5459f943a493c128fcad5 into bef25b7bc06e1388929a4dc65fa97a88b139cd5c

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

@@ -993,6 +993,7 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, account.name);
         cv.put(ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED, share.isPasswordProtected() ? 1 : 0);
         cv.put(ProviderTableMeta.OCSHARES_NOTE, share.getNote());
+        cv.put(ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD, share.isHideFileDownload());
 
         if (shareExistsForRemoteId(share.getRemoteId())) {// for renamed files; no more delete and create
             overriden = true;
@@ -1199,6 +1200,7 @@ public class FileDataStorageManager {
             share.setIdRemoteShared(c.getLong(c.getColumnIndex(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED)));
             share.setIsPasswordProtected(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);
         }
         return share;
     }
@@ -1304,6 +1306,7 @@ public class FileDataStorageManager {
                 cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, account.name);
                 cv.put(ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED, share.isPasswordProtected() ? 1 : 0);
                 cv.put(ProviderTableMeta.OCSHARES_NOTE, share.getNote());
+                cv.put(ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD, share.isHideFileDownload());
 
                 if (shareExistsForRemoteId(share.getRemoteId())) {
                     // updating an existing file
@@ -1584,6 +1587,7 @@ public class FileDataStorageManager {
                 cv.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER, account.name);
                 cv.put(ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED, share.isPasswordProtected() ? 1 : 0);
                 cv.put(ProviderTableMeta.OCSHARES_NOTE, share.getNote());
+                cv.put(ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD, share.isHideFileDownload());
 
                 // adding a new share resource
                 operations.add(ContentProviderOperation.newInsert(

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -32,7 +32,7 @@ import com.owncloud.android.MainApp;
 public class ProviderMeta {
 
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 36;
+    public static final int DB_VERSION = 37;
 
     private ProviderMeta() {
     }
@@ -132,6 +132,7 @@ public class ProviderMeta {
         public static final String OCSHARES_ACCOUNT_OWNER = "owner_share";
         public static final String OCSHARES_IS_PASSWORD_PROTECTED = "is_password_protected";
         public static final String OCSHARES_NOTE = "note";
+        public static final String OCSHARES_HIDE_DOWNLOAD = "hide_download";
 
         public static final String OCSHARES_DEFAULT_SORT_ORDER = OCSHARES_FILE_SOURCE
                 + " collate nocase asc";

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

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -37,10 +37,11 @@ import com.owncloud.android.operations.common.SyncOperation;
  */
 public class UpdateShareViaLinkOperation extends SyncOperation {
 
-    private String mPath;
-    private String mPassword;
-    private Boolean mPublicUpload;
-    private long mExpirationDateInMillis;
+    private String path;
+    private String password;
+    private Boolean publicUpload;
+    private Boolean hideFileDownload;
+    private long expirationDateInMillis;
 
     /**
      * Constructor
@@ -48,8 +49,8 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
      * @param path          Full path of the file/folder being shared. Mandatory argument
      */
     public UpdateShareViaLinkOperation(String path) {
-        mPath = path;
-        mExpirationDateInMillis = 0;
+        this.path = path;
+        expirationDateInMillis = 0;
     }
 
     /**
@@ -60,7 +61,7 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
      *                      Null results in no update applied to the password.
      */
     public void setPassword(String password) {
-        mPassword = password;
+        this.password = password;
     }
 
     /**
@@ -72,7 +73,11 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
      *                                  the expiration date.
      */
     public void setExpirationDate(long expirationDateInMillis) {
-        mExpirationDateInMillis = expirationDateInMillis;
+        this.expirationDateInMillis = expirationDateInMillis;
+    }
+
+    public void setHideFileDownload(boolean hideFileDownload) {
+        this.hideFileDownload = hideFileDownload;
     }
 
     /**
@@ -82,32 +87,23 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
      *                        Null results in no update applied to the upload permission.
      */
     public void setPublicUpload(Boolean publicUpload) {
-        mPublicUpload = publicUpload;
+        this.publicUpload = publicUpload;
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
-
-        OCShare publicShare = getStorageManager().getFirstShareByPathAndType(
-                mPath,
-                ShareType.PUBLIC_LINK,
-                ""
-        );
+        OCShare publicShare = getStorageManager().getFirstShareByPathAndType(path, ShareType.PUBLIC_LINK, "");
 
         if (publicShare == null) {
             // TODO try to get remote share before failing?
-            return new RemoteOperationResult(
-                    RemoteOperationResult.ResultCode.SHARE_NOT_FOUND
-            );
+            return new RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND);
         }
 
-        // Update remote share with password
-        UpdateRemoteShareOperation updateOp = new UpdateRemoteShareOperation(
-            publicShare.getRemoteId()
-        );
-        updateOp.setPassword(mPassword);
-        updateOp.setExpirationDate(mExpirationDateInMillis);
-        updateOp.setPublicUpload(mPublicUpload);
+        UpdateRemoteShareOperation updateOp = new UpdateRemoteShareOperation(publicShare.getRemoteId());
+        updateOp.setPassword(password);
+        updateOp.setExpirationDate(expirationDateInMillis);
+        updateOp.setPublicUpload(publicUpload);
+        updateOp.setHideFileDownload(hideFileDownload);
         RemoteOperationResult result = updateOp.execute(client);
 
         if (result.isSuccess()) {
@@ -124,17 +120,17 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
     }
 
     public String getPath() {
-        return mPath;
+        return path;
     }
 
     public String getPassword() {
-        return mPassword;
+        return password;
     }
 
     private void updateData(OCShare share) {
         // Update DB with the response
-        share.setPath(mPath);
-        if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
+        share.setPath(path);
+        if (path.endsWith(FileUtils.PATH_SEPARATOR)) {
             share.setIsFolder(true);
         } else {
             share.setIsFolder(false);
@@ -144,7 +140,7 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
 
         // Update OCFile with data from share: ShareByLink  and publicLink
         // TODO check & remove if not needed
-        OCFile file = getStorageManager().getFileByPath(mPath);
+        OCFile file = getStorageManager().getFileByPath(path);
         if (file != null) {
             file.setPublicLink(share.getShareLink());
             file.setSharedViaLink(true);
@@ -152,4 +148,3 @@ public class UpdateShareViaLinkOperation extends SyncOperation {
         }
     }
 }
-

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -772,7 +772,8 @@ public class FileContentProvider extends ContentProvider {
                 + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + INTEGER
                 + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + TEXT
                 + ProviderTableMeta.OCSHARES_IS_PASSWORD_PROTECTED + INTEGER
-                + ProviderTableMeta.OCSHARES_NOTE + " TEXT );");
+            + ProviderTableMeta.OCSHARES_NOTE + TEXT
+            + ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD + " INTEGER );");
     }
 
     private void createCapabilitiesTable(SQLiteDatabase db) {
@@ -1783,6 +1784,24 @@ public class FileContentProvider extends ContentProvider {
             if (!upgraded) {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
+
+            if (oldVersion < 37 && newVersion >= 37) {
+                Log_OC.i(SQL, "Entering in the #37 add hide-download to share table");
+                db.beginTransaction();
+                try {
+                    db.execSQL(ALTER_TABLE + ProviderTableMeta.OCSHARES_TABLE_NAME +
+                        ADD_COLUMN + ProviderTableMeta.OCSHARES_HIDE_DOWNLOAD + " INTEGER ");
+
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
+            if (!upgraded) {
+                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+            }
         }
 
         @Override

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

@@ -103,6 +103,7 @@ public class OperationsService extends Service {
     public static final String EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS = "SHARE_EXPIRATION_YEAR";
     public static final String EXTRA_SHARE_PERMISSIONS = "SHARE_PERMISSIONS";
     public static final String EXTRA_SHARE_PUBLIC_UPLOAD = "SHARE_PUBLIC_UPLOAD";
+    public static final String EXTRA_SHARE_HIDE_FILE_DOWNLOAD = "HIDE_FILE_DOWNLOAD";
     public static final String EXTRA_SHARE_ID = "SHARE_ID";
     public static final String EXTRA_SHARE_NOTE = "SHARE_NOTE";
     public static final String EXTRA_USER_ID = "USER_ID";
@@ -151,7 +152,7 @@ public class OperationsService extends Service {
             mCookie = cookie;
         }
     }
-    
+
     /**
      * Service initialization
      */
@@ -160,14 +161,14 @@ public class OperationsService extends Service {
         super.onCreate();
         Log_OC.d(TAG, "Creating service");
 
-        /// First worker thread for most of operations 
+        // First worker thread for most of operations
         HandlerThread thread = new HandlerThread("Operations thread",
                 Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
         mOperationsHandler = new ServiceHandler(thread.getLooper(), this);
         mOperationsBinder = new OperationsServiceBinder(mOperationsHandler);
-        
-        /// Separated worker thread for download of folders (WIP)
+
+        // Separated worker thread for download of folders (WIP)
         thread = new HandlerThread("Syncfolder thread", Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
         mSyncFolderHandler = new SyncFolderHandler(thread.getLooper(), this);
@@ -211,7 +212,7 @@ public class OperationsService extends Service {
             msg.arg1 = startId;
             mOperationsHandler.sendMessage(msg);
         }
-        
+
         return START_NOT_STICKY;
     }
 
@@ -316,8 +317,8 @@ public class OperationsService extends Service {
         /**
          * Removes a listener from the list of objects interested in the being reported about
          * the end of operations.
-         * 
-         * @param listener      Object to notify about progress of transfer.    
+         *
+         * @param listener      Object to notify about progress of transfer.
          */
         public void removeOperationListener(OnRemoteOperationListener listener) {
             synchronized (mBoundListeners) {
@@ -339,9 +340,9 @@ public class OperationsService extends Service {
 
         /**
          * Creates and adds to the queue a new operation, as described by operationIntent.
-         * 
+         *
          * Calls startService to make the operation is processed by the ServiceHandler.
-         * 
+         *
          * @param operationIntent       Intent describing a new operation to queue and execute.
          * @return                      Identifier of the operation created, or null if failed.
          */
@@ -351,7 +352,7 @@ public class OperationsService extends Service {
                 mServiceHandler.mPendingOperations.add(itemToQueue);
                 startService(new Intent(OperationsService.this, OperationsService.class));
                 return itemToQueue.second.hashCode();
-                
+
             } else {
                 return Long.MAX_VALUE;
             }
@@ -359,7 +360,7 @@ public class OperationsService extends Service {
 
         public boolean dispatchResultIfFinished(int operationId,
                                                 OnRemoteOperationListener listener) {
-            Pair<RemoteOperation, RemoteOperationResult> undispatched = 
+            Pair<RemoteOperation, RemoteOperationResult> undispatched =
                     mUndispatchedFinishedOperations.remove(operationId);
             if (undispatched != null) {
                 listener.onRemoteOperationFinish(undispatched.first, undispatched.second);
@@ -368,14 +369,14 @@ public class OperationsService extends Service {
                 return !mServiceHandler.mPendingOperations.isEmpty();
             }
         }
-        
+
         /**
          * Returns True when the file described by 'file' in the ownCloud account 'account' is
          * downloading or waiting to download.
-         * 
+         *
          * If 'file' is a directory, returns 'true' if some of its descendant files is downloading
          * or waiting to download.
-         * 
+         *
          * @param account       ownCloud account where the remote file is stored.
          * @param file          File to check if something is synchronizing
          *                      / downloading / uploading inside.
@@ -390,13 +391,13 @@ public class OperationsService extends Service {
     /**
      * Operations worker. Performs the pending operations in the order they were requested.
      *
-     * Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}. 
+     * Created with the Looper of a new thread, started in {@link OperationsService#onCreate()}.
      */
     private static class ServiceHandler extends Handler {
         // don't make it a final class, and don't remove the static ; lint will warn about a p
         // ossible memory leak
-        
-        
+
+
         OperationsService mService;
 
 
@@ -406,8 +407,8 @@ public class OperationsService extends Service {
         private Target mLastTarget;
         private OwnCloudClient mOwnCloudClient;
         private FileDataStorageManager mStorageManager;
-        
-        
+
+
         public ServiceHandler(Looper looper, OperationsService service) {
             super(looper);
             if (service == null) {
@@ -422,21 +423,21 @@ public class OperationsService extends Service {
             Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);
             mService.stopSelf(msg.arg1);
         }
-        
+
         /**
          * Performs the next operation in the queue
          */
         private void nextOperation() {
-            
+
             //Log_OC.e(TAG, "nextOperation init" );
-            
+
             Pair<Target, RemoteOperation> next = null;
             synchronized(mPendingOperations) {
                 next = mPendingOperations.peek();
             }
 
             if (next != null) {
-                
+
                 mCurrentOperation = next.second;
                 RemoteOperationResult result = null;
                 try {
@@ -453,7 +454,7 @@ public class OperationsService extends Service {
                             mOwnCloudClient.setOwnCloudVersion(version);
 
                             mStorageManager = new FileDataStorageManager(
-                                    mLastTarget.mAccount, 
+                                mLastTarget.mAccount,
                                     mService.getContentResolver()
                             );
                         } else {
@@ -492,7 +493,7 @@ public class OperationsService extends Service {
                                 mLastTarget.mAccount.name, e);
                     }
                     result = new RemoteOperationResult(e);
-                    
+
                 } catch (IOException e) {
                     if (mLastTarget.mAccount == null) {
                         Log_OC.e(TAG, "Error while trying to get authorization for a NULL account",
@@ -509,13 +510,13 @@ public class OperationsService extends Service {
                         Log_OC.e(TAG, "Unexpected error for " + mLastTarget.mAccount.name, e);
                     }
                     result = new RemoteOperationResult(e);
-                
+
                 } finally {
                     synchronized(mPendingOperations) {
                         mPendingOperations.poll();
                     }
                 }
-                
+
                 //sendBroadcastOperationFinished(mLastTarget, mCurrentOperation, result);
                 mService.dispatchResultToOperationListeners(mCurrentOperation, result);
             }
@@ -525,9 +526,9 @@ public class OperationsService extends Service {
 
     /**
      * Creates a new operation, as described by operationIntent.
-     * 
+     *
      * TODO - move to ServiceHandler (probably)
-     * 
+     *
      * @param operationIntent       Intent describing a new operation to queue and execute.
      * @return                      Pair with the new operation object and the information about its
      *                              target server.
@@ -536,7 +537,7 @@ public class OperationsService extends Service {
         RemoteOperation operation = null;
         Target target = null;
         try {
-            if (!operationIntent.hasExtra(EXTRA_ACCOUNT) && 
+            if (!operationIntent.hasExtra(EXTRA_ACCOUNT) &&
                     !operationIntent.hasExtra(EXTRA_SERVER_URL)) {
                 Log_OC.e(TAG, "Not enough information provided in intent");
 
@@ -545,11 +546,11 @@ public class OperationsService extends Service {
                 String serverUrl = operationIntent.getStringExtra(EXTRA_SERVER_URL);
                 String cookie = operationIntent.getStringExtra(EXTRA_COOKIE);
                 target = new Target(
-                        account, 
+                    account,
                         (serverUrl == null) ? null : Uri.parse(serverUrl),
                         cookie
                 );
-                
+
                 String action = operationIntent.getAction();
                 String remotePath;
                 String password;
@@ -579,6 +580,10 @@ public class OperationsService extends Service {
                             long expirationDate = operationIntent.getLongExtra(EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, 0);
                             updateLinkOperation.setExpirationDate(expirationDate);
 
+                            boolean hideFileDownload = operationIntent.getBooleanExtra(EXTRA_SHARE_HIDE_FILE_DOWNLOAD,
+                                false);
+                            updateLinkOperation.setHideFileDownload(hideFileDownload);
+
                             if (operationIntent.hasExtra(EXTRA_SHARE_PUBLIC_UPLOAD)) {
                                 updateLinkOperation.setPublicUpload(
                                         operationIntent.getBooleanExtra(EXTRA_SHARE_PUBLIC_UPLOAD, false));
@@ -712,14 +717,14 @@ public class OperationsService extends Service {
                         break;
                 }
             }
-                
+
         } catch (IllegalArgumentException e) {
             Log_OC.e(TAG, "Bad information provided in intent: " + e.getMessage());
             operation = null;
         }
 
         if (operation != null) {
-            return new Pair<Target , RemoteOperation>(target, operation);  
+            return new Pair<Target, RemoteOperation>(target, operation);
         } else {
             return null;
         }
@@ -740,7 +745,7 @@ public class OperationsService extends Service {
         while (listeners.hasNext()) {
             final OnRemoteOperationListener listener = listeners.next();
             final Handler handler = mOperationsBinder.mBoundListeners.get(listener);
-            if (handler != null) { 
+            if (handler != null) {
                 handler.post(new Runnable() {
                     @Override
                     public void run() {

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

@@ -413,7 +413,7 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.UserVi
                                      boolean canEditDelete);
 
         void updateNoteToShare(OCShare share, String note);
-        
+
         /**
          * show a snackbar that this feature is not supported by ownCloud.
          */
@@ -434,5 +434,7 @@ public class UserListAdapter extends RecyclerView.Adapter<UserListAdapter.UserVi
          * @param hideFileListing New state of the permission for editing the folder shared via link.
          */
         void setHideFileListingPermissionsToShare(OCShare share, boolean hideFileListing);
+
+        void setHideFileDownloadPermissionToShare(OCFile file, boolean hideFileDownload);
     }
 }

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

@@ -308,6 +308,8 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 shareByLinkAllowEditing.isChecked(),
                 publicShare.getPermissions()
         );
+        SharingMenuHelper.setupHideFileDownload(menu.findItem(R.id.action_hide_file_download),
+            publicShare.isHideFileDownload(), file.isFolder());
         SharingMenuHelper.setupPasswordMenuItem(
                 menu.findItem(R.id.action_password),
                 publicShare.isPasswordProtected()
@@ -333,16 +335,19 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 }
                 return true;
             }
+            case R.id.action_hide_file_download:
+                item.setChecked(!item.isChecked());
+                setHideFileDownloadPermissionToShare(file, item.isChecked());
+
+                return true;
             case R.id.action_password: {
                 requestPasswordForShareViaLink(false);
                 return true;
             }
             case R.id.action_share_expiration_date: {
                 ExpirationDatePickerDialogFragment dialog = ExpirationDatePickerDialogFragment.newInstance(file, -1);
-                dialog.show(
-                        getActivity().getSupportFragmentManager(),
-                        ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG
-                );
+                dialog.show(getActivity().getSupportFragmentManager(),
+                    ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG);
                 return true;
             }
             case R.id.action_share_send_link: {
@@ -368,6 +373,12 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 setHideFileListingPermissionsToShare(share, hideFileListing);
     }
 
+    @Override
+    public void setHideFileDownloadPermissionToShare(OCFile file, boolean hideFileDownload) {
+        ((FileActivity) getActivity()).getFileOperationsHelper().
+            setHideFileDownloadPermissionsToShare(file, hideFileDownload);
+    }
+
     @Override
     public void showNotSupportedByOcMessage() {
         if (getView() != null) {

src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java

@@ -62,6 +62,21 @@ public final class SharingMenuHelper {
         }
     }
 
+    /**
+     * Sets checked/visibility state on the given {@link MenuItem} based on the given criteria.
+     *
+     * @param fileListing the {@link MenuItem} to be setup
+     * @param isFolder    flag if it is a folder
+     */
+    public static void setupHideFileDownload(MenuItem fileListing, boolean hideFileDownload, boolean isFolder) {
+        if (isFolder) {
+            fileListing.setVisible(false);
+        } else {
+            fileListing.setVisible(true);
+            fileListing.setChecked(hideFileDownload);
+        }
+    }
+
     /**
      * sets up the password {@link MenuItem}'s title based on the fact if a password is present.
      *

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

@@ -535,10 +535,7 @@ public class FileOperationsHelper {
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_PASSWORD,
-                (password == null) ? "" : password
-        );
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PASSWORD, (password == null) ? "" : password);
 
         queueShareIntent(updateShareIntent);
     }
@@ -577,10 +574,7 @@ public class FileOperationsHelper {
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS,
-                expirationTimeInMillis
-        );
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, expirationTimeInMillis);
         queueShareIntent(updateShareIntent);
     }
 
@@ -597,14 +591,8 @@ public class FileOperationsHelper {
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS,
-                expirationTimeInMillis
-        );
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_PERMISSIONS,
-                0
-        );
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_EXPIRATION_DATE_IN_MILLIS, expirationTimeInMillis);
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, 0);
         queueShareIntent(updateShareIntent);
     }
 
@@ -620,10 +608,7 @@ public class FileOperationsHelper {
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_ID, share.getId());
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_PERMISSIONS,
-                permissions
-        );
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PERMISSIONS, permissions);
         queueShareIntent(updateShareIntent);
     }
 
@@ -639,10 +624,7 @@ public class FileOperationsHelper {
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
         updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
         updateShareIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, folder.getRemotePath());
-        updateShareIntent.putExtra(
-                OperationsService.EXTRA_SHARE_PUBLIC_UPLOAD,
-                uploadPermission
-        );
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_PUBLIC_UPLOAD, uploadPermission);
         queueShareIntent(updateShareIntent);
     }
 
@@ -669,6 +651,16 @@ public class FileOperationsHelper {
         queueShareIntent(updateShareIntent);
     }
 
+    public void setHideFileDownloadPermissionsToShare(OCFile file, boolean hideFileDownload) {
+        Intent updateShareIntent = new Intent(mFileActivity, OperationsService.class);
+        updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE);
+        updateShareIntent.putExtra(OperationsService.EXTRA_ACCOUNT, mFileActivity.getAccount());
+        updateShareIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, file.getRemotePath());
+        updateShareIntent.putExtra(OperationsService.EXTRA_SHARE_HIDE_FILE_DOWNLOAD, hideFileDownload);
+
+        queueShareIntent(updateShareIntent);
+    }
+
     public void updateNoteToShare(OCShare share, String note) {
         Intent updateShareIntent = new Intent(mFileActivity, OperationsService.class);
         updateShareIntent.setAction(OperationsService.ACTION_UPDATE_SHARE_NOTE);

src/main/res/menu/file_detail_sharing_link_menu.xml

@@ -28,6 +28,12 @@
         android:title="@string/share_via_link_hide_file_listing_permission_label"
         android:checkable="true"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_hide_file_download"
+        android:showAsAction="never"
+        android:title="@string/share_via_link_hide_download"
+        android:checkable="true"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_password"
         android:showAsAction="never"

src/main/res/values/strings.xml

@@ -829,5 +829,6 @@
     <string name="hint_note">Note</string>
     <string name="no_browser_available">No app available to handle links</string>
     <string name="no_pdf_app_available">No App available to handle PDF</string>
+    <string name="share_via_link_hide_download">Hide download</string>
 
 </resources>