removed unnecessary code

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 3b2d1b4..9eb5143 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -154,10 +154,8 @@ public class UploadFilesActivity extends FileActivity implements
             }
             case R.id.actionbar_select_all:{
                 if(selectAllToggled){
             }
             case R.id.actionbar_select_all:{
                 if(selectAllToggled){

-                    // deselect all

                     toggleOffSelectAll();
                 }else{
                     toggleOffSelectAll();
                 }else{

-                    // select alls

                     toggleOnSelectAll(item);
                 }
                 break;
                     toggleOnSelectAll(item);
                 }
                 break;


@@ -170,7 +168,6 @@ public class UploadFilesActivity extends FileActivity implements
     public void toggleOffSelectAll(MenuItem item){
         selectAllToggled = false;
         item.setIcon(android.R.drawable.checkbox_off_background);
     public void toggleOffSelectAll(MenuItem item){
         selectAllToggled = false;
         item.setIcon(android.R.drawable.checkbox_off_background);

-//        mFileListFragment.listDirectory()

         mFileListFragment.deselectAll();
     }
     public void toggleOffSelectAll(){
         mFileListFragment.deselectAll();
     }
     public void toggleOffSelectAll(){


@@ -179,8 +176,7 @@ public class UploadFilesActivity extends FileActivity implements
     }
     public void toggleOnSelectAll(MenuItem item){
         selectAllToggled = true;
     }
     public void toggleOnSelectAll(MenuItem item){
         selectAllToggled = true;

-        item.setIcon(android.R.drawable.checkbox_on_background);
-        
+        item.setIcon(android.R.drawable.checkbox_on_background);        

         mFileListFragment.selectAll();
     }
     
         mFileListFragment.selectAll();
     }
     

diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 4cdf80f..2ce3745 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -101,13 +101,10 @@ public class LocalFileListFragment extends ExtendedListFragment {
         int numberOfFiles = mAdapter.getCount();
         for(int i = 0; i < numberOfFiles; i++){
             File file = (File) mAdapter.getItem(i);
         int numberOfFiles = mAdapter.getCount();
         for(int i = 0; i < numberOfFiles; i++){
             File file = (File) mAdapter.getItem(i);

-            if (file != null) {
-                /// Click on a directory
-                if (file.isDirectory()) {                    
-                
-                } else {    /// Click on a file
-                    getListView().setItemChecked(i, true);
-                       
+            if (file != null) {                
+                if (!file.isDirectory()) {  
+                    /// Click on a file
+                    getListView().setItemChecked(i, true);                       

                     // notify the change to the container Activity
                     mContainerActivity.onFileClick(file);
                 }
                     // notify the change to the container Activity
                     mContainerActivity.onFileClick(file);
                 }


@@ -115,24 +112,7 @@ public class LocalFileListFragment extends ExtendedListFragment {
         }
     }
     
         }
     }
     

-    public void deselectAll(){
-        /*
-        int numberOfFiles = mAdapter.getCount();
-        for(int i = 0; i < numberOfFiles; i++){
-            File file = (File) mAdapter.getItem(i);
-            if (file != null) {
-                /// Click on a directory
-                if (file.isDirectory()) {                    
-                
-                } else {    /// Click on a file
-                    if(getListView().isItemChecked(i)){
-                        getListView().setItemChecked(i, false);
-                    }     
-                    // notify the change to the container Activity
-                    mContainerActivity.onFileClick(file);
-                }
-            }
-        }*/
+    public void deselectAll(){        

         mAdapter = new LocalFileListAdapter(mContainerActivity.getInitialDirectory(), getActivity());
         setListAdapter(mAdapter);
     }
         mAdapter = new LocalFileListAdapter(mContainerActivity.getInitialDirectory(), getActivity());
         setListAdapter(mAdapter);
     }