From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 09:16:31 +0000 (+0200)
Subject: Add comment removed when fixing conflict in merge
X-Git-Tag: oc-android-1.7.0_signed~134^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/583194a19a8360ac06c5ed1af6ec362b3228be84?hp=--cc

Add comment removed when fixing conflict in merge
---

583194a19a8360ac06c5ed1af6ec362b3228be84
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index b679030a..1bf28eae 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -242,6 +242,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                 }
             } 
             else {
+                  // TODO Re-enable when server supports folder-size calculation
 //                if (FileStorageUtils.getDefaultSavePathFor(mAccount.name, file) != null){
 //                    fileSizeV.setVisibility(View.VISIBLE);
 //                    fileSizeV.setText(getFolderSizeHuman(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file)));