Actions menu filtering based on all checked items

src/com/owncloud/android/files/FileMenuFilter.java

@@ -35,6 +35,7 @@ import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -43,29 +44,28 @@ import java.util.List;
  */
 public class FileMenuFilter {
 
-    private OCFile mFile;
+    private static final int SINGLE_SELECT_ITEMS = 1;
+
+    private List<OCFile> mFiles;
     private ComponentsGetter mComponentsGetter;
     private Account mAccount;
     private Context mContext;
-    private boolean mMultiSelect;
 
     /**
      * Constructor
      *
-     * @param targetFile        {@link OCFile} target of the action to filter in the {@link Menu}.
+     * @param targetFiles       List of {@link OCFile} file targets of the action to filter in the {@link Menu}.
      * @param account           ownCloud {@link Account} holding targetFile.
      * @param cg                Accessor to app components, needed to access the
      *                          {@link FileUploader} and {@link FileDownloader} services
      * @param context           Android {@link Context}, needed to access build setup resources.
-     * @param multiSelect       Flag that indicates if a multiSelect mode is activated.
      */
-    public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg,
-                          Context context, boolean multiSelect) {
-        mFile = targetFile;
+    public FileMenuFilter(List<OCFile> targetFiles, Account account, ComponentsGetter cg,
+                          Context context) {
+        mFiles = targetFiles;
         mAccount = account;
         mComponentsGetter = cg;
         mContext = context;
-        mMultiSelect = multiSelect;
     }
 
     /**
@@ -79,7 +79,7 @@ public class FileMenuFilter {
      */
     public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg,
                           Context context) {
-        this(targetFile, account, cg, context, false);
+        this(Arrays.asList(new OCFile[]{targetFile}), account, cg, context);
     }
 
     /**
@@ -123,24 +123,24 @@ public class FileMenuFilter {
      */
     private void filter(List<Integer> toShow, List <Integer> toHide) {
         boolean synchronizing = false;
-        if (mComponentsGetter != null && mFile != null && mAccount != null) {
+        if (mComponentsGetter != null && !mFiles.isEmpty() && mAccount != null) {
             OperationsServiceBinder opsBinder = mComponentsGetter.getOperationsServiceBinder();
             FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder();
             FileDownloaderBinder downloaderBinder = mComponentsGetter.getFileDownloaderBinder();
             synchronizing = (
                 // comparing local and remote
-                (opsBinder != null && opsBinder.isSynchronizing(mAccount, mFile.getRemotePath())) ||
+                (opsBinder != null && opsBinder.isSynchronizing(mAccount, mFiles)) ||
                 // downloading
-                (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFile)) ||
+                (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, mFiles)) ||
                 // uploading
-                (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFile))
+                (uploaderBinder != null && uploaderBinder.isUploading(mAccount, mFiles))
             );
         }
 
         /// decision is taken for each possible action on a file in the menu
 
         // DOWNLOAD 
-        if (mFile == null || mFile.isDown() || mFile.isFolder() || synchronizing) {
+        if (mFiles.isEmpty() || containsFolder() || anyFileDown() || synchronizing) {
             toHide.add(R.id.action_download_file);
 
         } else {
@@ -148,7 +148,7 @@ public class FileMenuFilter {
         }
 
         // RENAME
-        if (mFile == null || synchronizing || mMultiSelect) {
+        if (!isSingleSelect() || synchronizing) {
             toHide.add(R.id.action_rename_file);
 
         } else {
@@ -156,7 +156,7 @@ public class FileMenuFilter {
         }
 
         // MOVE & COPY
-        if (mFile == null || synchronizing) {
+        if (mFiles.isEmpty() || synchronizing) {
             toHide.add(R.id.action_move);
             toHide.add(R.id.action_copy);
         } else {
@@ -165,7 +165,7 @@ public class FileMenuFilter {
         }
 
         // REMOVE
-        if (mFile == null || synchronizing) {
+        if (mFiles.isEmpty() || synchronizing) {
             toHide.add(R.id.action_remove_file);
 
         } else {
@@ -173,7 +173,7 @@ public class FileMenuFilter {
         }
 
         // OPEN WITH (different to preview!)
-        if (mFile == null || mFile.isFolder() || !mFile.isDown() || synchronizing || mMultiSelect) {
+        if (!isFile() || !anyFileDown() || synchronizing) {
             toHide.add(R.id.action_open_file_with);
 
         } else {
@@ -181,7 +181,7 @@ public class FileMenuFilter {
         }
 
         // CANCEL SYNCHRONIZATION
-        if (mFile == null || !synchronizing) {
+        if (mFiles.isEmpty() || !synchronizing) {
             toHide.add(R.id.action_cancel_sync);
 
         } else {
@@ -189,7 +189,7 @@ public class FileMenuFilter {
         }
 
         // SYNC CONTENTS (BOTH FILE AND FOLDER)
-        if (mFile == null || (!mFile.isFolder() && !mFile.isDown()) || synchronizing) {
+        if (mFiles.isEmpty() || (!anyFileDown() && !containsFolder()) || synchronizing) {
             toHide.add(R.id.action_sync_file);
 
         } else {
@@ -207,14 +207,14 @@ public class FileMenuFilter {
                 (capability.getFilesSharingApiEnabled().isTrue() ||
                         capability.getFilesSharingApiEnabled().isUnknown()
                 );
-        if ((!shareViaLinkAllowed && !shareWithUsersAllowed) ||  mFile == null || !shareApiEnabled || mMultiSelect) {
+        if ((!shareViaLinkAllowed && !shareWithUsersAllowed) || !isSingleSelect() || !shareApiEnabled) {
             toHide.add(R.id.action_share_file);
         } else {
             toShow.add(R.id.action_share_file);
         }
 
         // SEE DETAILS
-        if (mFile == null || mFile.isFolder() || mMultiSelect) {
+        if (!isFile()) {
             toHide.add(R.id.action_see_details);
         } else {
             toShow.add(R.id.action_see_details);
@@ -223,21 +223,21 @@ public class FileMenuFilter {
         // SEND
         boolean sendAllowed = (mContext != null &&
                 mContext.getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on"));
-        if (mFile == null || !sendAllowed || mFile.isFolder() || synchronizing || mMultiSelect) {
+        if (!isFile() || !sendAllowed || synchronizing) {
             toHide.add(R.id.action_send_file);
         } else {
             toShow.add(R.id.action_send_file);
         }
 
         // FAVORITES
-        if (mFile == null || synchronizing || mFile.isFolder() || mFile.isFavorite() || mMultiSelect) {
+        if (!isFile() || synchronizing || allFavorites()) {
             toHide.add(R.id.action_favorite_file);
         } else {
             toShow.add(R.id.action_favorite_file);
         }
 
         // UNFAVORITES
-        if (mFile == null || synchronizing || mFile.isFolder() || !mFile.isFavorite() || mMultiSelect) {
+        if (!isFile() || synchronizing || allUnfavorites()) {
             toHide.add(R.id.action_unfavorite_file);
         } else {
             toShow.add(R.id.action_unfavorite_file);
@@ -245,4 +245,48 @@ public class FileMenuFilter {
 
     }
 
+    private boolean isSingleSelect() {
+        return mFiles.size() == SINGLE_SELECT_ITEMS;
+    }
+
+    private boolean isFile() {
+        return isSingleSelect() && !mFiles.get(0).isFolder();
+    }
+
+    private boolean containsFolder() {
+        for(OCFile file: mFiles) {
+            if(file.isFolder()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean anyFileDown() {
+        for(OCFile file: mFiles) {
+            if(file.isDown()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean allFavorites() {
+        for(OCFile file: mFiles) {
+            if(!file.isFavorite()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean allUnfavorites() {
+        for(OCFile file: mFiles) {
+            if(file.isFavorite()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 }

src/com/owncloud/android/files/services/FileDownloader.java

@@ -62,6 +62,7 @@ import java.io.File;
 import java.util.AbstractList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -301,6 +302,26 @@ public class FileDownloader extends Service
             return (mPendingDownloads.contains(account.name, file.getRemotePath()));
         }
 
+        /**
+         * 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 any of its descendant files is downloading or
+         * waiting to download.
+         *
+         * @param account ownCloud account where the remote file is stored.
+         * @param files    A list of files that could contains someone in the queue of downloads.
+         */
+        public boolean isDownloading(Account account, List<OCFile> files) {
+            if (account == null || files.isEmpty()) return false;
+            for(OCFile file: files) {
+                if(mPendingDownloads.contains(account.name, file.getRemotePath())) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
 
         /**
          * Adds a listener interested in the progress of the download for a concrete file.

src/com/owncloud/android/files/services/FileUploader.java

@@ -70,6 +70,7 @@ import com.owncloud.android.utils.ErrorMessageAdapter;
 import java.util.AbstractList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
@@ -734,6 +735,26 @@ public class FileUploader extends Service
             );
         }
 
+        /**
+         * Returns True when the file described by 'file' is being uploaded to
+         * the ownCloud account 'account' or waiting for it
+         *
+         * If 'file' is a directory, returns 'true' if some of its descendant files
+         * is uploading or waiting to upload.
+         *
+         * @param account   ownCloud account where the remote file will be stored.
+         * @param files      A list of files that could contains someone in the queue of pending uploads
+         */
+        public boolean isUploading(Account account, List<OCFile> files) {
+            if (account == null || files.isEmpty()) return false;
+            for(OCFile file: files) {
+                if(mPendingUploads.contains(account.name, file.getRemotePath())) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
 
         /**
          * Adds a listener interested in the progress of the upload for a concrete file.

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

@@ -71,6 +71,7 @@ import com.owncloud.android.operations.common.SyncOperation;
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
@@ -379,11 +380,31 @@ public class OperationsService extends Service {
          * or waiting to download.
          * 
          * @param account       ownCloud account where the remote file is stored.
-         * @param remotePath    Path of the folder to check if something is synchronizing
+         * @param file          File to check if something is synchronizing
          *                      / downloading / uploading inside.
          */
-        public boolean isSynchronizing(Account account, String remotePath) {
-            return mSyncFolderHandler.isSynchronizing(account, remotePath);
+        public boolean isSynchronizing(Account account, OCFile file) {
+            return mSyncFolderHandler.isSynchronizing(account, file.getRemotePath());
+        }
+
+        /**
+         * 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 files         List of files to check if something is synchronizing
+         *                      / downloading / uploading inside.
+         */
+        public boolean isSynchronizing(Account account, List<OCFile> files) {
+            for(OCFile file: files) {
+                if(isSynchronizing(account, file)) {
+                    return true;
+                }
+            }
+            return false;
         }
 
     }

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -41,14 +41,12 @@ import android.content.res.Resources.NotFoundException;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.os.Parcelable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
-import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -60,7 +58,6 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader;
@@ -95,7 +92,7 @@ import com.owncloud.android.utils.PermissionUtil;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
 
 import static com.owncloud.android.db.PreferenceManager.*;
 
@@ -1753,6 +1750,11 @@ public class FileDisplayActivity extends HookActivity
     }
 
 
+    /**
+     * Request stopping the upload/download operation in progress over the given {@link OCFile} file.
+     *
+     * @param file {@link OCFile} file which operation are wanted to be cancel
+     */
     public void cancelTransference(OCFile file) {
         getFileOperationsHelper().cancelTransference(file);
         if (mWaitingToPreview != null &&
@@ -1766,6 +1768,17 @@ public class FileDisplayActivity extends HookActivity
         onTransferStateChanged(file, false, false);
     }
 
+    /**
+     * Request stopping all upload/download operations in progress over the given {@link OCFile} files.
+     *
+     * @param files list of {@link OCFile} files which operations are wanted to be cancel
+     */
+    public void cancelTransference(List<OCFile> files) {
+        for(OCFile file: files) {
+            cancelTransference(file);
+        }
+    }
+
     @Override
     public void onRefresh(boolean ignoreETag) {
         refreshList(ignoreETag);

src/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -268,7 +268,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 
                     if ( //synchronizing
                                 opsBinder != null &&
-                                opsBinder.isSynchronizing(mAccount, file.getRemotePath())
+                                opsBinder.isSynchronizing(mAccount, file)
                             ) {
                         localStateView.setImageResource(R.drawable.ic_synchronizing);
                         localStateView.setVisibility(View.VISIBLE);

src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -72,6 +72,7 @@ import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A Fragment that lists all files and folders in a given path.
@@ -96,8 +97,6 @@ public class OCFileListFragment extends ExtendedListFragment {
 
     private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
 
-    private static final int MIN_FILES_FOR_MULTISELECT = 2;
-
     private FileFragment.ContainerActivity mContainerActivity;
 
     private OCFile mFile = null;
@@ -355,7 +354,7 @@ public class OCFileListFragment extends ExtendedListFragment {
             @Override
             public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
                 final int checkedCount = getListView().getCheckedItemCount();
-                // TODO Tobi extract to values
+
                 mode.setTitle(checkedCount + " selected");
 
                 if (checked) {
@@ -364,24 +363,19 @@ public class OCFileListFragment extends ExtendedListFragment {
                     mAdapter.removeSelection(position);
                 }
 
-                OCFile targetFile = null;
-                if (checkedCount > 0 && checkedCount <= MIN_FILES_FOR_MULTISELECT) {
-                    targetFile = (checkedCount == MIN_FILES_FOR_MULTISELECT)
-                        ? mFile : mAdapter.getCheckedItems().get(0);
+                if (checkedCount > 0) {
+                    List<OCFile> targetFiles = mAdapter.getCheckedItems();
 
                     if (mContainerActivity.getStorageManager() != null) {
                         FileMenuFilter mf = new FileMenuFilter(
-                            targetFile,
+                            targetFiles,
                             mContainerActivity.getStorageManager().getAccount(),
                             mContainerActivity,
-                            getActivity(),
-                            mAdapter.getCheckedItems().size() == MIN_FILES_FOR_MULTISELECT
+                            getActivity()
                         );
                         mf.filter(menu);
                     }
-
                 }
-
             }
 
             @Override
@@ -674,6 +668,10 @@ public class OCFileListFragment extends ExtendedListFragment {
                     mContainerActivity.getFileOperationsHelper().syncFiles(mTargetFiles);
                     return true;
                 }
+                case R.id.action_cancel_sync: {
+                    ((FileDisplayActivity) mContainerActivity).cancelTransference(mTargetFiles);
+                    return true;
+                }
                 case R.id.action_move: {
                     Intent action = new Intent(getActivity(), FolderPickerActivity.class);
                     action.putParcelableArrayListExtra(FolderPickerActivity.EXTRA_FILES, mTargetFiles);