fix bug #742

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 34caa02..b5b441e 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -420,14 +420,19 @@ public class OCFileListFragment extends ExtendedListFragment {
         String output = "";
 
         if (folders == 1) {
         String output = "";
 
         if (folders == 1) {

-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder) + ", ";
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder);

         } else if (folders > 1) {
         } else if (folders > 1) {

-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folders) + ", ";
+            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);
+        if (folders > 0 && files > 0){
+            output = output + ", ";
+        }
+        if (files > 0){
+            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;
     }
         }
         return output;
     }