From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 21 Nov 2014 17:08:44 +0000 (+0100)
Subject: fix bug #742
X-Git-Tag: oc-android-1.7.0_signed~91^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/580c1f008e1eaeddf26e257a6aefdde5169a76cd

fix bug #742
---

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 34caa028..b5b441e9 100644
--- 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) {
-            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder) + ", ";
+            output = folders.toString() + " " + getResources().getString(R.string.file_list_folder);
         } 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;
     }