Merge branch 'develop' into refresh_folder_contents_when_browsed_into

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / OCFileListFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index be596eb..26e698a 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -31,6 +31,7 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
+import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
@@ -128,10 +129,25 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         
         if(mFile != null){
             DataStorageManager storageManager = mContainerActivity.getStorageManager();
-            parentDir = storageManager.getFileById(mFile.getParentId());
-            mFile = parentDir;
+            if (mFile.getParentId() == 0) {
+                parentDir = storageManager.getFileById(1);
+            }
+            else {
+                parentDir = storageManager.getFileById(mFile.getParentId());
+            }
+            
+//            // Update folder size on DB
+//            storageManager.calculateFolderSize(mFile.getFileId());
+            
+            mFile = parentDir;           
         }
-        listDirectory(parentDir);
+        
+        if (mFile != null) {
+            listDirectory(mFile);
+
+            mContainerActivity.startSyncFolderOperation(mFile.getRemotePath(), mFile.getFileId());
+        }
+   
     }
     
     @Override
@@ -371,7 +387,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 mList.setSelectionFromTop(0, 0);
             }
             mFile = directory;
-
         }
     }
     
@@ -396,6 +411,8 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         public void startMediaPreview(OCFile file, int i, boolean b);
 
         public void startImagePreview(OCFile file);
+        
+        public void startSyncFolderOperation(String remotePath, long parentId);
 
         /**
          * Getter for the current DataStorageManager in the container activity