From: masensio <masensio@solidgear.es>
Date: Tue, 1 Oct 2013 10:58:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_brows... 
X-Git-Tag: oc-android-1.5.5~155^2~32
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5ff0989eb47fbc9d5211cc294f17cf692f7eff50?hp=--cc

Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into
---

5ff0989eb47fbc9d5211cc294f17cf692f7eff50
diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
index eaeaf985,5f6321d8..c60cdacc
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@@ -678,9 -674,8 +678,8 @@@ public class FileDataStorageManager imp
          
          OCFile file; 
  
 -        while (parentId != 0) {
 +        while (parentId != DataStorageManager.ROOT_PARENT_ID) {
              
-             Log_OC.d(TAG, "parent = " + parentId);
              // Update the size of the parent
              calculateFolderSize(parentId);