added "x folders and y files" to end of list

diff --git a/res/layout/list_footer.xml b/res/layout/list_footer.xml
new file mode 100644 (file)
index 0000000..b20f9e9
--- /dev/null
+++ b/res/layout/list_footer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="7dip"
+    android:paddingBottom="7dip"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+    <LinearLayout 
+        android:id="@+id/footer_layout" 
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_gravity="center">
+
+    
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/setup_text_hint" />
+
+</LinearLayout> 
\ No newline at end of file

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f75db1..e95f262 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,10 @@
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
     <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>

+    <string name="file_list_folder">folder and</string>
+    <string name="file_list_folders">folders and</string>
+    <string name="file_list_file">file</string>
+    <string name="file_list_files">files</string>

     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_size">Size:</string>
     <string name="filedetails_type">Type:</string>
     <string name="filedetails_select_file">Tap on a file to display additional information.</string>
     <string name="filedetails_size">Size:</string>
     <string name="filedetails_type">Type:</string>

diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index a57fb09..2b9653e 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -18,50 +18,54 @@
 
 package com.owncloud.android.ui.fragment;
 
 
 package com.owncloud.android.ui.fragment;
 

-import com.actionbarsherlock.app.SherlockFragment;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.ui.ExtendedListView;
-
-

 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;

-import android.widget.ListAdapter;

 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemClickListener;

+import android.widget.ListAdapter;

 import android.widget.ListView;
 
 import android.widget.ListView;
 

+import com.actionbarsherlock.app.SherlockFragment;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.ui.ExtendedListView;
+

 /**
 /**

- *  TODO extending SherlockListFragment instead of SherlockFragment 
+ * TODO extending SherlockListFragment instead of SherlockFragment

  */
 public class ExtendedListFragment extends SherlockFragment implements OnItemClickListener {
  */
 public class ExtendedListFragment extends SherlockFragment implements OnItemClickListener {

-    
+

     private static final String TAG = ExtendedListFragment.class.getSimpleName();
 
     private static final String TAG = ExtendedListFragment.class.getSimpleName();
 

-    private static final String KEY_SAVED_LIST_POSITION = "SAVED_LIST_POSITION"; 
+    private static final String KEY_SAVED_LIST_POSITION = "SAVED_LIST_POSITION";

 
     protected ExtendedListView mList;
 
     protected ExtendedListView mList;

-    
+

     public void setListAdapter(ListAdapter listAdapter) {
         mList.setAdapter(listAdapter);
         mList.invalidate();
     }
 
     public void setListAdapter(ListAdapter listAdapter) {
         mList.setAdapter(listAdapter);
         mList.invalidate();
     }
 

+    public void setFooterView(View footer) {
+        mList.addFooterView(footer);
+        mList.invalidate();
+    }
+

     public ListView getListView() {
         return mList;
     }
     public ListView getListView() {
         return mList;
     }

-    
-    
+

     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Log_OC.e(TAG, "onCreateView");
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         Log_OC.e(TAG, "onCreateView");

-        //mList = new ExtendedListView(getActivity());
+        // mList = new ExtendedListView(getActivity());

         View v = inflater.inflate(R.layout.list_fragment, null);
         View v = inflater.inflate(R.layout.list_fragment, null);

-        mList = (ExtendedListView)(v.findViewById(R.id.list_root));
+        mList = (ExtendedListView) (v.findViewById(R.id.list_root));

         mList.setOnItemClickListener(this);
         mList.setOnItemClickListener(this);

-        //mList.setEmptyView(v.findViewById(R.id.empty_list_view));     // looks like it's not a cool idea 
+        // mList.setEmptyView(v.findViewById(R.id.empty_list_view)); // looks
+        // like it's not a cool idea

         mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator));
         mList.setDividerHeight(1);
 
         mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator));
         mList.setDividerHeight(1);
 


@@ -69,11 +73,10 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
             int referencePosition = savedInstanceState.getInt(KEY_SAVED_LIST_POSITION);
             setReferencePosition(referencePosition);
         }
             int referencePosition = savedInstanceState.getInt(KEY_SAVED_LIST_POSITION);
             setReferencePosition(referencePosition);
         }

-        
+

         return v;
     }
 
         return v;
     }
 

-    

     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);


@@ -81,14 +84,16 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
         savedInstanceState.putInt(KEY_SAVED_LIST_POSITION, getReferencePosition());
     }
 
         savedInstanceState.putInt(KEY_SAVED_LIST_POSITION, getReferencePosition());
     }
 

-    

     /**
     /**

-     * Calculates the position of the item that will be used as a reference to reposition the visible items in the list when
-     * the device is turned to other position. 
+     * Calculates the position of the item that will be used as a reference to
+     * reposition the visible items in the list when the device is turned to
+     * other position.

      * 
      * 

-     * THe current policy is take as a reference the visible item in the center of the screen.  
+     * THe current policy is take as a reference the visible item in the center
+     * of the screen.

      * 
      * 

-     * @return      The position in the list of the visible item in the center of the screen.
+     * @return The position in the list of the visible item in the center of the
+     *         screen.

      */
     protected int getReferencePosition() {
         if (mList != null) {
      */
     protected int getReferencePosition() {
         if (mList != null) {


@@ -98,11 +103,11 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
         }
     }
 
         }
     }
 

-    

     /**
      * Sets the visible part of the list from the reference position.
      * 
     /**
      * Sets the visible part of the list from the reference position.
      * 

-     * @param   position    Reference position previously returned by {@link LocalFileListFragment#getReferencePosition()}
+     * @param position Reference position previously returned by
+     *            {@link LocalFileListFragment#getReferencePosition()}

      */
     protected void setReferencePosition(int position) {
         if (mList != null) {
      */
     protected void setReferencePosition(int position) {
         if (mList != null) {


@@ -112,8 +117,7 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic
 
     @Override
     public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
 
     @Override
     public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {

-        // to be @overriden  
+        // to be @overriden

     }
 
     }
 

-    

 }
 }

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index a3c6d3b..45fe0b0 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -20,6 +20,21 @@ package com.owncloud.android.ui.fragment;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

+import java.util.Vector;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.TextView;

 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;


@@ -43,39 +58,30 @@ import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationD
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 

-
-import android.accounts.Account;
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.ContextMenu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-

 /**
  * A Fragment that lists all files and folders in a given path.
  * 
  * @author Bartek Przybylski
  * 
  */
 /**
  * A Fragment that lists all files and folders in a given path.
  * 
  * @author Bartek Przybylski
  * 
  */

-public class OCFileListFragment extends ExtendedListFragment implements EditNameDialogListener, ConfirmationDialogFragmentListener {
-    
+public class OCFileListFragment extends ExtendedListFragment implements EditNameDialogListener,
+        ConfirmationDialogFragmentListener {
+

     private static final String TAG = OCFileListFragment.class.getSimpleName();
 
     private static final String TAG = OCFileListFragment.class.getSimpleName();
 

-    private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "com.owncloud.android.ui.fragment";
+    private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class
+            .getPackage().getName() : "com.owncloud.android.ui.fragment";

     private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE";
     private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE";

-    
+

     private OCFileListFragment.ContainerActivity mContainerActivity;
     private OCFileListFragment.ContainerActivity mContainerActivity;

-    
+

     private OCFile mFile = null;
     private FileListListAdapter mAdapter;
     private OCFile mFile = null;
     private FileListListAdapter mAdapter;

-    
+    private View mFooterView;
+

     private Handler mHandler;
     private OCFile mTargetFile;
     private Handler mHandler;
     private OCFile mTargetFile;

-    
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -86,11 +92,11 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         try {
             mContainerActivity = (ContainerActivity) activity;
         } catch (ClassCastException e) {
         try {
             mContainerActivity = (ContainerActivity) activity;
         } catch (ClassCastException e) {

-            throw new ClassCastException(activity.toString() + " must implement " + OCFileListFragment.ContainerActivity.class.getSimpleName());
+            throw new ClassCastException(activity.toString() + " must implement "
+                    + OCFileListFragment.ContainerActivity.class.getSimpleName());

         }
     }
         }
     }

-    
-    
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -98,86 +104,103 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         Log_OC.e(TAG, "onActivityCreated() start");
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         Log_OC.e(TAG, "onActivityCreated() start");

+
+        mFooterView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(
+                R.layout.list_footer, null, false);
+        setFooterView(mFooterView);
+

         mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
         if (savedInstanceState != null) {
             mFile = savedInstanceState.getParcelable(EXTRA_FILE);
         }
         setListAdapter(mAdapter);
         mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
         if (savedInstanceState != null) {
             mFile = savedInstanceState.getParcelable(EXTRA_FILE);
         }
         setListAdapter(mAdapter);

-        
+

         registerForContextMenu(getListView());
         registerForContextMenu(getListView());

-        getListView().setOnCreateContextMenuListener(this);        
-        
+        getListView().setOnCreateContextMenuListener(this);
+

         mHandler = new Handler();
 
     }
         mHandler = new Handler();
 
     }

-    
+

     /**
      * Saves the current listed folder.
      */
     @Override
     /**
      * Saves the current listed folder.
      */
     @Override

-    public void onSaveInstanceState (Bundle outState) {
+    public void onSaveInstanceState(Bundle outState) {

         super.onSaveInstanceState(outState);
         outState.putParcelable(EXTRA_FILE, mFile);
     }
 
         super.onSaveInstanceState(outState);
         outState.putParcelable(EXTRA_FILE, mFile);
     }
 

-

     /**
      * Call this, when the user presses the up button.
      * 
     /**
      * Call this, when the user presses the up button.
      * 

-     * Tries to move up the current folder one level. If the parent folder was removed from the database, 
-     * it continues browsing up until finding an existing folders.
+     * Tries to move up the current folder one level. If the parent folder was
+     * removed from the database, it continues browsing up until finding an
+     * existing folders.

      * 
      * 

-     * return       Count of folder levels browsed up.
+     * return Count of folder levels browsed up.

      */
     public int onBrowseUp() {
         OCFile parentDir = null;
         int moveCount = 0;
      */
     public int onBrowseUp() {
         OCFile parentDir = null;
         int moveCount = 0;

-        
-        if(mFile != null){
+
+        if (mFile != null) {

             FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
             FileDataStorageManager storageManager = mContainerActivity.getStorageManager();

-            
+

             String parentPath = null;
             if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {
                 parentPath = new File(mFile.getRemotePath()).getParent();
             String parentPath = null;
             if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {
                 parentPath = new File(mFile.getRemotePath()).getParent();

-                parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR;
+                parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath
+                        + OCFile.PATH_SEPARATOR;

                 parentDir = storageManager.getFileByPath(parentPath);
                 moveCount++;
             } else {
                 parentDir = storageManager.getFileByPath(parentPath);
                 moveCount++;
             } else {

-                parentDir = storageManager.getFileByPath(OCFile.ROOT_PATH);    // never returns null; keep the path in root folder
+                parentDir = storageManager.getFileByPath(OCFile.ROOT_PATH); // never
+                                                                            // returns
+                                                                            // null;
+                                                                            // keep
+                                                                            // the
+                                                                            // path
+                                                                            // in
+                                                                            // root
+                                                                            // folder

             }
             while (parentDir == null) {
                 parentPath = new File(parentPath).getParent();
             }
             while (parentDir == null) {
                 parentPath = new File(parentPath).getParent();

-                parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR;
+                parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath
+                        + OCFile.PATH_SEPARATOR;

                 parentDir = storageManager.getFileByPath(parentPath);
                 moveCount++;
                 parentDir = storageManager.getFileByPath(parentPath);
                 moveCount++;

-            }   // exit is granted because storageManager.getFileByPath("/") never returns null
-            mFile = parentDir;           
+            } // exit is granted because storageManager.getFileByPath("/") never
+              // returns null
+            mFile = parentDir;

         }
         }

-        
+

         if (mFile != null) {
             listDirectory(mFile);
 
             mContainerActivity.startSyncFolderOperation(mFile);
         if (mFile != null) {
             listDirectory(mFile);
 
             mContainerActivity.startSyncFolderOperation(mFile);

-        }   // else - should never happen now
-   
+        } // else - should never happen now
+

         return moveCount;
     }
         return moveCount;
     }

-    
+

     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {
         OCFile file = (OCFile) mAdapter.getItem(position);
         if (file != null) {
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {
         OCFile file = (OCFile) mAdapter.getItem(position);
         if (file != null) {

-            if (file.isFolder()) { 
+            if (file.isFolder()) {

                 // update state and view of this fragment
                 listDirectory(file);
                 // update state and view of this fragment
                 listDirectory(file);

-                // then, notify parent activity to let it update its state and view, and other fragments
+                // then, notify parent activity to let it update its state and
+                // view, and other fragments

                 mContainerActivity.onBrowsedDownTo(file);
                 mContainerActivity.onBrowsedDownTo(file);

-                
-            } else { /// Click on a file
+
+            } else { // / Click on a file

                 if (PreviewImageFragment.canBePreviewed(file)) {
                     // preview image - it handles the download, if needed
                     mContainerActivity.startImagePreview(file);
                 if (PreviewImageFragment.canBePreviewed(file)) {
                     // preview image - it handles the download, if needed
                     mContainerActivity.startImagePreview(file);

-                    
+

                 } else if (file.isDown()) {
                     if (PreviewMediaFragment.canBePreviewed(file)) {
                         // media preview
                 } else if (file.isDown()) {
                     if (PreviewMediaFragment.canBePreviewed(file)) {
                         // media preview


@@ -186,33 +209,33 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                         // open with
                         mContainerActivity.openFile(file);
                     }
                         // open with
                         mContainerActivity.openFile(file);
                     }

-                    
+

                 } else {
                     // automatic download, preview on finish
                     mContainerActivity.startDownloadForPreview(file);
                 }
                 } else {
                     // automatic download, preview on finish
                     mContainerActivity.startDownloadForPreview(file);
                 }

-                    
+

             }
             }

-            
+

         } else {
             Log_OC.d(TAG, "Null object in ListAdapter!!");
         }
         } else {
             Log_OC.d(TAG, "Null object in ListAdapter!!");
         }

-        
+

     }
     }

-    
+

     /**
      * {@inheritDoc}
      */
     @Override
     /**
      * {@inheritDoc}
      */
     @Override

-    public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {

         super.onCreateContextMenu(menu, v, menuInfo);
         MenuInflater inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.file_actions_menu, menu);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         OCFile targetFile = (OCFile) mAdapter.getItem(info.position);
         super.onCreateContextMenu(menu, v, menuInfo);
         MenuInflater inflater = getActivity().getMenuInflater();
         inflater.inflate(R.menu.file_actions_menu, menu);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         OCFile targetFile = (OCFile) mAdapter.getItem(info.position);

-        List<Integer> toHide = new ArrayList<Integer>();    
-        List<Integer> toDisable = new ArrayList<Integer>();  
-        
+        List<Integer> toHide = new ArrayList<Integer>();
+        List<Integer> toDisable = new ArrayList<Integer>();
+

         MenuItem item = null;
         if (targetFile.isFolder()) {
             // contextual menu for folders
         MenuItem item = null;
         if (targetFile.isFolder()) {
             // contextual menu for folders


@@ -222,37 +245,42 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             toHide.add(R.id.action_cancel_upload);
             toHide.add(R.id.action_sync_file);
             toHide.add(R.id.action_see_details);
             toHide.add(R.id.action_cancel_upload);
             toHide.add(R.id.action_sync_file);
             toHide.add(R.id.action_see_details);

-            if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
-                    mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
+            if (mContainerActivity.getFileDownloaderBinder().isDownloading(
+                    AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)
+                    || mContainerActivity.getFileUploaderBinder().isUploading(
+                            AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {

                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);
                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);

-                
+

             }
             }

-            
+

         } else {
             // contextual menu for regular files
         } else {
             // contextual menu for regular files

-            
-            // new design: 'download' and 'open with' won't be available anymore in context menu
+
+            // new design: 'download' and 'open with' won't be available anymore
+            // in context menu

             toHide.add(R.id.action_download_file);
             toHide.add(R.id.action_open_file_with);
             toHide.add(R.id.action_download_file);
             toHide.add(R.id.action_open_file_with);

-            
+

             if (targetFile.isDown()) {
                 toHide.add(R.id.action_cancel_download);
                 toHide.add(R.id.action_cancel_upload);
             if (targetFile.isDown()) {
                 toHide.add(R.id.action_cancel_download);
                 toHide.add(R.id.action_cancel_upload);

-                
+

             } else {
                 toHide.add(R.id.action_sync_file);
             }
             } else {
                 toHide.add(R.id.action_sync_file);
             }

-            if ( mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {
+            if (mContainerActivity.getFileDownloaderBinder().isDownloading(
+                    AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {

                 toHide.add(R.id.action_cancel_upload);
                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);
                 toHide.add(R.id.action_cancel_upload);
                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);

-                    
-            } else if ( mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {
+
+            } else if (mContainerActivity.getFileUploaderBinder().isUploading(
+                    AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)) {

                 toHide.add(R.id.action_cancel_download);
                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);
                 toHide.add(R.id.action_cancel_download);
                 toDisable.add(R.id.action_rename_file);
                 toDisable.add(R.id.action_remove_file);

-                    
+

             } else {
                 toHide.add(R.id.action_cancel_download);
                 toHide.add(R.id.action_cancel_upload);
             } else {
                 toHide.add(R.id.action_cancel_download);
                 toHide.add(R.id.action_cancel_upload);


@@ -266,7 +294,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 item.setEnabled(false);
             }
         }
                 item.setEnabled(false);
             }
         }

-        
+

         for (int i : toDisable) {
             item = menu.findItem(i);
             if (item != null) {
         for (int i : toDisable) {
             item = menu.findItem(i);
             if (item != null) {


@@ -274,103 +302,101 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             }
         }
     }
             }
         }
     }

-    
-    
+

     /**
      * {@inhericDoc}
      */
     @Override
     /**
      * {@inhericDoc}
      */
     @Override

-    public boolean onContextItemSelected (MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();        
+    public boolean onContextItemSelected(MenuItem item) {
+        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();

         mTargetFile = (OCFile) mAdapter.getItem(info.position);
         switch (item.getItemId()) {
         mTargetFile = (OCFile) mAdapter.getItem(info.position);
         switch (item.getItemId()) {

-            case R.id.action_rename_file: {
-                String fileName = mTargetFile.getFileName();
-                int extensionStart = mTargetFile.isFolder() ? -1 : fileName.lastIndexOf(".");
-                int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length();
-                EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0, selectionEnd, this);
-                dialog.show(getFragmentManager(), EditNameDialog.TAG);
-                return true;
-            }
-            case R.id.action_remove_file: {
-                int messageStringId = R.string.confirmation_remove_alert;
-                int posBtnStringId = R.string.confirmation_remove_remote;
-                int neuBtnStringId = -1;
-                if (mTargetFile.isFolder()) {
-                    messageStringId = R.string.confirmation_remove_folder_alert;
-                    posBtnStringId = R.string.confirmation_remove_remote_and_local;
-                    neuBtnStringId = R.string.confirmation_remove_folder_local;
-                } else if (mTargetFile.isDown()) {
-                    posBtnStringId = R.string.confirmation_remove_remote_and_local;
-                    neuBtnStringId = R.string.confirmation_remove_local;
-                }
-                ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(
-                        messageStringId,
-                        new String[]{mTargetFile.getFileName()},
-                        posBtnStringId,
-                        neuBtnStringId,
-                        R.string.common_cancel);
-                confDialog.setOnConfirmationListener(this);
-                confDialog.show(getFragmentManager(), FileDetailFragment.FTAG_CONFIRMATION);
-                return true;
-            }
-            case R.id.action_sync_file: {
-                Account account = AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity());
-                RemoteOperation operation = new SynchronizeFileOperation(mTargetFile, null, mContainerActivity.getStorageManager(), account, true, getSherlockActivity());
-                operation.execute(account, getSherlockActivity(), mContainerActivity, mHandler, getSherlockActivity());
-                ((FileDisplayActivity) getSherlockActivity()).showLoadingDialog();
-                return true;
-            }
-            case R.id.action_cancel_download: {
-                FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
-                Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
-                if (downloaderBinder != null && downloaderBinder.isDownloading(account, mTargetFile)) {
-                    downloaderBinder.cancel(account, mTargetFile);
-                    listDirectory();
-                    mContainerActivity.onTransferStateChanged(mTargetFile, false, false);
-                }
-                return true;
+        case R.id.action_rename_file: {
+            String fileName = mTargetFile.getFileName();
+            int extensionStart = mTargetFile.isFolder() ? -1 : fileName.lastIndexOf(".");
+            int selectionEnd = (extensionStart >= 0) ? extensionStart : fileName.length();
+            EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.rename_dialog_title), fileName, 0,
+                    selectionEnd, this);
+            dialog.show(getFragmentManager(), EditNameDialog.TAG);
+            return true;
+        }
+        case R.id.action_remove_file: {
+            int messageStringId = R.string.confirmation_remove_alert;
+            int posBtnStringId = R.string.confirmation_remove_remote;
+            int neuBtnStringId = -1;
+            if (mTargetFile.isFolder()) {
+                messageStringId = R.string.confirmation_remove_folder_alert;
+                posBtnStringId = R.string.confirmation_remove_remote_and_local;
+                neuBtnStringId = R.string.confirmation_remove_folder_local;
+            } else if (mTargetFile.isDown()) {
+                posBtnStringId = R.string.confirmation_remove_remote_and_local;
+                neuBtnStringId = R.string.confirmation_remove_local;

             }
             }

-            case R.id.action_cancel_upload: {
-                FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
-                Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
-                if (uploaderBinder != null && uploaderBinder.isUploading(account, mTargetFile)) {
-                    uploaderBinder.cancel(account, mTargetFile);
-                    listDirectory();
-                    mContainerActivity.onTransferStateChanged(mTargetFile, false, false);
-                }
-                return true;
+            ConfirmationDialogFragment confDialog = ConfirmationDialogFragment.newInstance(messageStringId,
+                    new String[] { mTargetFile.getFileName() }, posBtnStringId, neuBtnStringId, R.string.common_cancel);
+            confDialog.setOnConfirmationListener(this);
+            confDialog.show(getFragmentManager(), FileDetailFragment.FTAG_CONFIRMATION);
+            return true;
+        }
+        case R.id.action_sync_file: {
+            Account account = AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity());
+            RemoteOperation operation = new SynchronizeFileOperation(mTargetFile, null,
+                    mContainerActivity.getStorageManager(), account, true, getSherlockActivity());
+            operation.execute(account, getSherlockActivity(), mContainerActivity, mHandler, getSherlockActivity());
+            ((FileDisplayActivity) getSherlockActivity()).showLoadingDialog();
+            return true;
+        }
+        case R.id.action_cancel_download: {
+            FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
+            Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
+            if (downloaderBinder != null && downloaderBinder.isDownloading(account, mTargetFile)) {
+                downloaderBinder.cancel(account, mTargetFile);
+                listDirectory();
+                mContainerActivity.onTransferStateChanged(mTargetFile, false, false);

             }
             }

-            case R.id.action_see_details: {
-                ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile);
-                return true;
+            return true;
+        }
+        case R.id.action_cancel_upload: {
+            FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
+            Account account = AccountUtils.getCurrentOwnCloudAccount(getActivity());
+            if (uploaderBinder != null && uploaderBinder.isUploading(account, mTargetFile)) {
+                uploaderBinder.cancel(account, mTargetFile);
+                listDirectory();
+                mContainerActivity.onTransferStateChanged(mTargetFile, false, false);

             }
             }

-            default:
-                return super.onContextItemSelected(item); 
+            return true;
+        }
+        case R.id.action_see_details: {
+            ((FileFragment.ContainerActivity) getActivity()).showDetails(mTargetFile);
+            return true;
+        }
+        default:
+            return super.onContextItemSelected(item);

         }
     }
         }
     }

-    

 
     /**
 
     /**

-     * Use this to query the {@link OCFile} that is currently
-     * being displayed by this fragment
+     * Use this to query the {@link OCFile} that is currently being displayed by
+     * this fragment
+     * 

      * @return The currently viewed OCFile
      */
      * @return The currently viewed OCFile
      */

-    public OCFile getCurrentFile(){
+    public OCFile getCurrentFile() {

         return mFile;
     }
         return mFile;
     }

-    
+

     /**
     /**

-     * Calls {@link OCFileListFragment#listDirectory(OCFile)} with a null parameter
+     * Calls {@link OCFileListFragment#listDirectory(OCFile)} with a null
+     * parameter

      */
      */

-    public void listDirectory(){
+    public void listDirectory() {

         listDirectory(null);
     }
         listDirectory(null);
     }

-    
+

     /**
      * Lists the given directory on the view. When the input parameter is null,
     /**
      * Lists the given directory on the view. When the input parameter is null,

-     * it will either refresh the last known directory. list the root
-     * if there never was a directory.
+     * it will either refresh the last known directory. list the root if there
+     * never was a directory.

      * 
      * @param directory File to be listed
      */
      * 
      * @param directory File to be listed
      */


@@ -379,18 +405,18 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         if (storageManager != null) {
 
             // Check input parameters for null
         if (storageManager != null) {
 
             // Check input parameters for null

-            if(directory == null){
-                if(mFile != null){
+            if (directory == null) {
+                if (mFile != null) {

                     directory = mFile;
                 } else {
                     directory = storageManager.getFileByPath("/");
                     directory = mFile;
                 } else {
                     directory = storageManager.getFileByPath("/");

-                    if (directory == null) return; // no files, wait for sync
+                    if (directory == null)
+                        return; // no files, wait for sync

                 }
             }
                 }
             }

-        
-        
+

             // If that's not a directory -> List its parent
             // If that's not a directory -> List its parent

-            if(!directory.isFolder()){
+            if (!directory.isFolder()) {

                 Log_OC.w(TAG, "You see, that is not a directory -> " + directory.toString());
                 directory = storageManager.getFileById(directory.getParentId());
             }
                 Log_OC.w(TAG, "You see, that is not a directory -> " + directory.toString());
                 directory = storageManager.getFileById(directory.getParentId());
             }


@@ -400,99 +426,143 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 mList.setSelectionFromTop(0, 0);
             }
             mFile = directory;
                 mList.setSelectionFromTop(0, 0);
             }
             mFile = directory;

+
+            // Update Footer
+            TextView footerText = (TextView) mFooterView.findViewById(R.id.footerText);
+            Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));
+            footerText.setText(generateFooterText(directory));
+            Log_OC.d("footer", String.valueOf(System.currentTimeMillis()));

         }
     }
         }
     }

-    
-    
-    
+
+    private String generateFooterText(OCFile directory) {
+        Integer files = 0;
+        Integer folders = 0;
+
+        FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
+        Vector<OCFile> mFiles = storageManager.getFolderContent(mFile);
+
+        for (OCFile ocFile : mFiles) {
+            if (ocFile.isFolder()) {
+                folders++;
+            } else {
+                files++;
+            }
+        }
+
+        String output = "";
+
+        if (folders == 1) {
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder);
+        } else if (folders > 1) {
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folders);
+        }
+        if (files == 1) {
+            output = output + " " + files.toString() + " " + getResources().getString(R.string.file_list_file);
+        } else {
+            output = output + " " + files.toString() + " " + getResources().getString(R.string.file_list_files);
+        }
+        return output;
+    }
+

     /**
     /**

-     * Interface to implement by any Activity that includes some instance of FileListFragment
+     * Interface to implement by any Activity that includes some instance of
+     * FileListFragment

      * 
      * @author David A. Velasco
      */
     public interface ContainerActivity extends TransferServiceGetter, OnRemoteOperationListener, FileHandler {
 
         /**
      * 
      * @author David A. Velasco
      */
     public interface ContainerActivity extends TransferServiceGetter, OnRemoteOperationListener, FileHandler {
 
         /**

-         * Callback method invoked when a the user browsed into a different folder through the list of files
-         *  
+         * Callback method invoked when a the user browsed into a different
+         * folder through the list of files
+         * 

          * @param file
          */
         public void onBrowsedDownTo(OCFile folder);
          * @param file
          */
         public void onBrowsedDownTo(OCFile folder);

-        
+

         public void startDownloadForPreview(OCFile file);
 
         public void startMediaPreview(OCFile file, int i, boolean b);
 
         public void startImagePreview(OCFile file);
         public void startDownloadForPreview(OCFile file);
 
         public void startMediaPreview(OCFile file, int i, boolean b);
 
         public void startImagePreview(OCFile file);

-        
+

         public void startSyncFolderOperation(OCFile folder);
 
         /**
          * Getter for the current DataStorageManager in the container activity
          */
         public FileDataStorageManager getStorageManager();
         public void startSyncFolderOperation(OCFile folder);
 
         /**
          * Getter for the current DataStorageManager in the container activity
          */
         public FileDataStorageManager getStorageManager();

-        
-        
+

         /**
         /**

-         * Callback method invoked when a the 'transfer state' of a file changes.
+         * Callback method invoked when a the 'transfer state' of a file
+         * changes.

          * 
          * 

-         * This happens when a download or upload is started or ended for a file.
+         * This happens when a download or upload is started or ended for a
+         * file.

          * 
          * 

-         * This method is necessary by now to update the user interface of the double-pane layout in tablets
-         * because methods {@link FileDownloaderBinder#isDownloading(Account, OCFile)} and {@link FileUploaderBinder#isUploading(Account, OCFile)}
-         * won't provide the needed response before the method where this is called finishes. 
+         * This method is necessary by now to update the user interface of the
+         * double-pane layout in tablets because methods
+         * {@link FileDownloaderBinder#isDownloading(Account, OCFile)} and
+         * {@link FileUploaderBinder#isUploading(Account, OCFile)} won't provide
+         * the needed response before the method where this is called finishes.

          * 
          * 

-         * TODO Remove this when the transfer state of a file is kept in the database (other thing TODO)
+         * TODO Remove this when the transfer state of a file is kept in the
+         * database (other thing TODO)

          * 
          * 

-         * @param file          OCFile which state changed.
-         * @param downloading   Flag signaling if the file is now downloading.
-         * @param uploading     Flag signaling if the file is now uploading.
+         * @param file OCFile which state changed.
+         * @param downloading Flag signaling if the file is now downloading.
+         * @param uploading Flag signaling if the file is now uploading.

          */
         public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
          */
         public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);

-        
+

     }
     }

-    
-    
+

     @Override
     public void onDismiss(EditNameDialog dialog) {
         if (dialog.getResult()) {
             String newFilename = dialog.getNewFilename();
             Log_OC.d(TAG, "name edit dialog dismissed with new name " + newFilename);
     @Override
     public void onDismiss(EditNameDialog dialog) {
         if (dialog.getResult()) {
             String newFilename = dialog.getNewFilename();
             Log_OC.d(TAG, "name edit dialog dismissed with new name " + newFilename);

-            RemoteOperation operation = new RenameFileOperation(mTargetFile, 
-                                                                AccountUtils.getCurrentOwnCloudAccount(getActivity()), 
-                                                                newFilename, 
-                                                                mContainerActivity.getStorageManager());
-            operation.execute(AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity()), getSherlockActivity(), mContainerActivity, mHandler, getSherlockActivity());
+            RemoteOperation operation = new RenameFileOperation(mTargetFile,
+                    AccountUtils.getCurrentOwnCloudAccount(getActivity()), newFilename,
+                    mContainerActivity.getStorageManager());
+            operation.execute(AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity()), getSherlockActivity(),
+                    mContainerActivity, mHandler, getSherlockActivity());

             ((FileDisplayActivity) getActivity()).showLoadingDialog();
         }
     }
 
             ((FileDisplayActivity) getActivity()).showLoadingDialog();
         }
     }
 

-    

     @Override
     public void onConfirmation(String callerTag) {
         if (callerTag.equals(FileDetailFragment.FTAG_CONFIRMATION)) {
             if (mContainerActivity.getStorageManager().getFileById(mTargetFile.getFileId()) != null) {
     @Override
     public void onConfirmation(String callerTag) {
         if (callerTag.equals(FileDetailFragment.FTAG_CONFIRMATION)) {
             if (mContainerActivity.getStorageManager().getFileById(mTargetFile.getFileId()) != null) {

-                RemoteOperation operation = new RemoveFileOperation( mTargetFile, 
-                                                                    true, 
-                                                                    mContainerActivity.getStorageManager());
-                operation.execute(AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity()), getSherlockActivity(), mContainerActivity, mHandler, getSherlockActivity());
-                
+                RemoteOperation operation = new RemoveFileOperation(mTargetFile, true,
+                        mContainerActivity.getStorageManager());
+                operation.execute(AccountUtils.getCurrentOwnCloudAccount(getSherlockActivity()), getSherlockActivity(),
+                        mContainerActivity, mHandler, getSherlockActivity());
+

                 ((FileDisplayActivity) getActivity()).showLoadingDialog();
             }
         }
     }
                 ((FileDisplayActivity) getActivity()).showLoadingDialog();
             }
         }
     }

-    
+

     @Override
     public void onNeutral(String callerTag) {
     @Override
     public void onNeutral(String callerTag) {

-        mContainerActivity.getStorageManager().removeFile(mTargetFile, false, true);    // TODO perform in background task / new thread
+        mContainerActivity.getStorageManager().removeFile(mTargetFile, false, true); // TODO
+                                                                                     // perform
+                                                                                     // in
+                                                                                     // background
+                                                                                     // task
+                                                                                     // /
+                                                                                     // new
+                                                                                     // thread

         listDirectory();
         mContainerActivity.onTransferStateChanged(mTargetFile, false, false);
     }
         listDirectory();
         mContainerActivity.onTransferStateChanged(mTargetFile, false, false);
     }

-    
+

     @Override
     public void onCancel(String callerTag) {
         Log_OC.d(TAG, "REMOVAL CANCELED");
     }
 
     @Override
     public void onCancel(String callerTag) {
         Log_OC.d(TAG, "REMOVAL CANCELED");
     }
 

-

 }
 }