OC-574: Show size in list from local database. OC-523

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 16c74d3..032981b 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -163,20 +163,11 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 \r
             } \r
             else {\r
-               \r
-               getDirectorySizeNumber(file,true);\r
-               if (lastModifiedOfAllSubdirectories == null)\r
-               {\r
-                   lastModV.setVisibility(View.GONE);\r
-                   fileSizeV.setVisibility(View.GONE);\r
-               }\r
-               else\r
-               {\r
-                   lastModV.setVisibility(View.VISIBLE);\r
-                   lastModV.setText(DisplayUtils.unixTimeToHumanReadable(lastModifiedOfAllSubdirectories));\r
-                   fileSizeV.setVisibility(View.VISIBLE);\r
-                   fileSizeV.setText(DisplayUtils.bytesToHumanReadable((totalSizeOfDirectoriesRecursive == null) ? 0 : totalSizeOfDirectoriesRecursive));\r
-               }\r
+                \r
+                fileSizeV.setVisibility(View.VISIBLE);\r
+                fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
+                lastModV.setVisibility(View.VISIBLE);\r
+                lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
                checkBoxV.setVisibility(View.GONE);\r
                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
             }\r
@@ -184,40 +175,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
 \r
         return view;\r
     }\r
-    \r
-    \r
-    /**\r
-     * - This method counts recursively all subdirectories and their files from the root directory. \r
-     * - It also shows a timestamp of the last modificated file inside the root directory\r
-     * \r
-     *   @param OCFile  : startDirectory\r
-     *   @param boolean :  counting starts from here ?\r
-     */\r
-    private void getDirectorySizeNumber(OCFile directory,boolean startOfRecursive) {\r
-        if (startOfRecursive) {\r
-            totalSizeOfDirectoriesRecursive = null;\r
-        }\r
-        Vector<OCFile> files  = mStorageManager.getDirectoryContent(directory);\r
-        for (OCFile file : files) {\r
-            if(!file.isDirectory()) {\r
-                if (totalSizeOfDirectoriesRecursive == null) {\r
-                    totalSizeOfDirectoriesRecursive = file.getFileLength();\r
-                    lastModifiedOfAllSubdirectories = file.getModificationTimestamp();\r
-                    continue;\r
-                }\r
-                \r
-                totalSizeOfDirectoriesRecursive += file.getFileLength();\r
-                if (lastModifiedOfAllSubdirectories < file.getModificationTimestamp()) {\r
-                    lastModifiedOfAllSubdirectories = file.getModificationTimestamp();\r
-                }\r
-            }\r
-            else {\r
-                this.getDirectorySizeNumber(file, false);\r
-            }\r
-        }\r
-    }\r
-    \r
-    \r
+\r
     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r