rebase

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

@@ -55,7 +55,6 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.utils.DisplayUtils;
@@ -475,45 +474,4 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     public boolean isGridMode() {
         return mGridMode;
     }
-
-    public void setNewSelection(int position, boolean checked) {
-        mSelection.put(position, checked);
-        notifyDataSetChanged();
-    }
-
-    public void removeSelection(int position) {
-        mSelection.remove(position);
-        notifyDataSetChanged();
-    }
-
-    public void removeSelection(){
-         mSelection.clear();
-        notifyDataSetChanged();
-    }
-
-    public ArrayList<Integer> getCheckedItemPositions() {
-        ArrayList<Integer> ids = new ArrayList<Integer>();
-
-        for (Map.Entry<Integer, Boolean> entry : mSelection.entrySet()){
-            if (entry.getValue()){
-                ids.add(entry.getKey());
-            }
-        }
-        return ids;
-    }
-
-    public ArrayList<OCFile> getCheckedItems() {
-        ArrayList<OCFile> files = new ArrayList<OCFile>();
-
-        OCFile checkedFile = null;
-        for (Map.Entry<Integer, Boolean> entry : mSelection.entrySet()){
-            if (entry.getValue()){
-                checkedFile = (OCFile) getItem(entry.getKey());
-                if (checkedFile != null) {
-                    files.add((OCFile) getItem(entry.getKey()));
-                }
-            }
-        }
-        return files;
-    }
 }

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

@@ -41,7 +41,6 @@ import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.PopupMenu;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -103,7 +102,6 @@ public class OCFileListFragment extends ExtendedListFragment {
     private FileListListAdapter mAdapter;
     private boolean mJustFolders;
 
-
     private int mStatusBarColorActionMode;
     private int mStatusBarColor;
 
@@ -387,7 +385,8 @@ public class OCFileListFragment extends ExtendedListFragment {
                             targetFiles,
                             mContainerActivity.getStorageManager().getAccount(),
                             mContainerActivity,
-                            getActivity());
+                            getActivity()
+                        );
                         mf.filter(menu);
                     }
                 }