Merge branch 'develop' into review_build_process

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 2d44f13..6f14c64 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -58,9 +58,8 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.Log_OC;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.Log_OC;

+import com.owncloud.android.MainApp;

 import com.owncloud.android.R;
 import com.owncloud.android.R;

-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;


@@ -103,7 +102,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     private ArrayAdapter<String> mDirectories;
 
     /** Access point to the cached database for the current ownCloud {@link Account} */
     private ArrayAdapter<String> mDirectories;
 
     /** Access point to the cached database for the current ownCloud {@link Account} */

-    private DataStorageManager mStorageManager = null;
+    private FileDataStorageManager mStorageManager = null;

 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;


@@ -150,7 +149,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
 
         mHandler = new Handler();
         super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
 
         mHandler = new Handler();

-
+        

         /// bindings to transference services
         mUploadConnection = new ListServiceConnection(); 
         mDownloadConnection = new ListServiceConnection();
         /// bindings to transference services
         mUploadConnection = new ListServiceConnection(); 
         mDownloadConnection = new ListServiceConnection();


@@ -193,6 +192,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
         setSupportProgressBarIndeterminateVisibility(mSyncInProgress);    // always AFTER setContentView(...) ; to work around bug in its implementation        
         
         getSupportActionBar().setHomeButtonEnabled(true);       // mandatory since Android ICS, according to the official documentation
         setSupportProgressBarIndeterminateVisibility(mSyncInProgress);    // always AFTER setContentView(...) ; to work around bug in its implementation        
         

+        
+        

         Log_OC.d(TAG, "onCreate() end");
     }
 
         Log_OC.d(TAG, "onCreate() end");
     }
 


@@ -217,37 +218,35 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
             /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
             OCFile file = getFile();
 
             /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
             OCFile file = getFile();

+            // get parent from path
+            String parentPath = "";

             if (file != null) {
                 if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
                     // upload in progress - right now, files are not inserted in the local cache until the upload is successful
             if (file != null) {
                 if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
                     // upload in progress - right now, files are not inserted in the local cache until the upload is successful

-                    if (mStorageManager.getFileById(file.getParentId()) == null) {
-                        file = null;    // not able to know the directory where the file is uploading
-                    }
+                    // get parent from path
+                    parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName()));
+                    if (mStorageManager.getFileByPath(parentPath) ==  null)
+                        file = null; // not able to know the directory where the file is uploading

                 } else {
                     file = mStorageManager.getFileByPath(file.getRemotePath());   // currentDir = null if not in the current Account
                 }
             }
             if (file == null) {
                 // fall back to root folder
                 } else {
                     file = mStorageManager.getFileByPath(file.getRemotePath());   // currentDir = null if not in the current Account
                 }
             }
             if (file == null) {
                 // fall back to root folder

-                file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);  // never returns null
+                file = mStorageManager.getFileByPath(OCFile.ROOT_PATH);  // never returns null

             }
             setFile(file);
             }
             setFile(file);

-            mDirectories.clear();
-            OCFile fileIt = file;
-            while(fileIt != null && fileIt.getFileName() != OCFile.PATH_SEPARATOR) {
-                if (fileIt.isDirectory()) {
-                    mDirectories.add(fileIt.getFileName());
-                }
-                fileIt = mStorageManager.getFileById(fileIt.getParentId());
-            }
-            mDirectories.add(OCFile.PATH_SEPARATOR);
+            setNavigationListWithFolder(file);

             if (!stateWasRecovered) {
                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();
             if (!stateWasRecovered) {
                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();

+                if (file.isFolder()) {
+                    startSyncFolderOperation(file);
+                }

                 
             } else {
                 
             } else {

-                updateFragmentsVisibility(!file.isDirectory());
-                updateNavigationElementsInActionBar(file.isDirectory() ? null : file);
+                updateFragmentsVisibility(!file.isFolder());
+                updateNavigationElementsInActionBar(file.isFolder() ? null : file);

             }
             
             
             }
             
             


@@ -257,6 +256,23 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
 
 
     }
 
 

+    private void setNavigationListWithFolder(OCFile file) {
+        mDirectories.clear();
+        OCFile fileIt = file;
+        String parentPath;
+        while(fileIt != null && fileIt.getFileName() != OCFile.ROOT_PATH) {
+            if (fileIt.isFolder()) {
+                mDirectories.add(fileIt.getFileName());
+            }
+            //fileIt = mStorageManager.getFileById(fileIt.getParentId());
+            // get parent from path
+            parentPath = fileIt.getRemotePath().substring(0, fileIt.getRemotePath().lastIndexOf(fileIt.getFileName()));
+            fileIt = mStorageManager.getFileByPath(parentPath);
+        }
+        mDirectories.add(OCFile.PATH_SEPARATOR);
+    }
+
+

     private void createMinFragments() {
         OCFileListFragment listOfFiles = new OCFileListFragment();
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
     private void createMinFragments() {
         OCFileListFragment listOfFiles = new OCFileListFragment();
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();


@@ -299,7 +315,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;
 
     private Fragment chooseInitialSecondFragment(OCFile file) {
         Fragment secondFragment = null;

-        if (file != null && !file.isDirectory()) {
+        if (file != null && !file.isFolder()) {

             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file) 
                     && file.getLastSyncDateForProperties() > 0  // temporal fix
                     ) {
             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file) 
                     && file.getLastSyncDateForProperties() > 0  // temporal fix
                     ) {


@@ -403,12 +419,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                 // the user browsed to other file ; forget the automatic preview 
                 mWaitingToPreview = null;
 
                 // the user browsed to other file ; forget the automatic preview 
                 mWaitingToPreview = null;
 

-            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
+            } else if (downloadEvent.equals(FileDownloader.getDownloadAddedMessage())) {

                 // grant that the right panel updates the progress bar
                 detailsFragment.listenForTransferProgress();
                 detailsFragment.updateFileDetails(true, false);
 
                 // grant that the right panel updates the progress bar
                 detailsFragment.listenForTransferProgress();
                 detailsFragment.updateFileDetails(true, false);
 

-            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+            } else if (downloadEvent.equals(FileDownloader.getDownloadFinishMessage())) {

                 //  update the right panel
                 boolean detailsFragmentChanged = false;
                 if (waitedPreview) {
                 //  update the right panel
                 boolean detailsFragmentChanged = false;
                 if (waitedPreview) {


@@ -477,26 +493,33 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
 
     private void startSynchronization() {
     }
 
     private void startSynchronization() {

-        ContentResolver.cancelSync(null, AccountAuthenticator.AUTHORITY);   // cancel the current synchronizations of any ownCloud account
+        ContentResolver.cancelSync(null, MainApp.getAuthTokenType());   // cancel the current synchronizations of any ownCloud account

         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(
                 getAccount(),
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(
                 getAccount(),

-                AccountAuthenticator.AUTHORITY, bundle);
+                MainApp.getAuthTokenType(), bundle);

     }
 
 
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {
     }
 
 
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {

-        int i = itemPosition;
-        while (i-- != 0) {
-            onBackPressed();
-        }
-        // the next operation triggers a new call to this method, but it's necessary to 
-        // ensure that the name exposed in the action bar is the current directory when the 
-        // user selected it in the navigation list
-        if (itemPosition != 0)
+        if (itemPosition != 0) {
+            String targetPath = "";
+            for (int i=itemPosition; i < mDirectories.getCount() - 1; i++) {
+                targetPath = mDirectories.getItem(i) + OCFile.PATH_SEPARATOR + targetPath; 
+            }
+            targetPath = OCFile.PATH_SEPARATOR + targetPath;
+            OCFile targetFolder = mStorageManager.getFileByPath(targetPath);
+            if (targetFolder != null) {
+                browseTo(targetFolder);
+            }
+            
+            // the next operation triggers a new call to this method, but it's necessary to 
+            // ensure that the name exposed in the action bar is the current directory when the 
+            // user selected it in the navigation list

             getSupportActionBar().setSelectedNavigationItem(0);
             getSupportActionBar().setSelectedNavigationItem(0);

+        }

         return true;
     }
 
         return true;
     }
 


@@ -601,8 +624,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                     finish();
                     return;
                 }
                     finish();
                     return;
                 }

-                popDirname();
-                listOfFiles.onBrowseUp();
+                int levelsUp = listOfFiles.onBrowseUp();
+                for (int i=0; i < levelsUp && mDirectories.getCount() > 1 ; i++) {
+                    popDirname();
+                }

             }
         }
         if (listOfFiles != null) {  // should never be null, indeed
             }
         }
         if (listOfFiles != null) {  // should never be null, indeed


@@ -631,18 +656,18 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         Log_OC.e(TAG, "onResume() start");
 
         // Listen for sync messages
         Log_OC.e(TAG, "onResume() start");
 
         // Listen for sync messages

-        IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
+        IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.getSyncMessage());

         mSyncBroadcastReceiver = new SyncBroadcastReceiver();
         registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 
         // Listen for upload messages
         mSyncBroadcastReceiver = new SyncBroadcastReceiver();
         registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
 
         // Listen for upload messages

-        IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
+        IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.getUploadFinishMessage());

         mUploadFinishReceiver = new UploadFinishReceiver();
         registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
 
         // Listen for download messages
         mUploadFinishReceiver = new UploadFinishReceiver();
         registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
 
         // Listen for download messages

-        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
-        downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
+        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage());
+        downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage());

         mDownloadFinishReceiver = new DownloadFinishReceiver();
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
     
         mDownloadFinishReceiver = new DownloadFinishReceiver();
         registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
     


@@ -807,10 +832,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     /**
      * Pushes a directory to the drop down list
      * @param directory to push
     /**
      * Pushes a directory to the drop down list
      * @param directory to push

-     * @throws IllegalArgumentException If the {@link OCFile#isDirectory()} returns false.
+     * @throws IllegalArgumentException If the {@link OCFile#isFolder()} returns false.

      */
     public void pushDirname(OCFile directory) {
      */
     public void pushDirname(OCFile directory) {

-        if(!directory.isDirectory()){
+        if(!directory.isFolder()){

             throw new IllegalArgumentException("Only directories may be pushed!");
         }
         mDirectories.insert(directory.getFileName(), 0);
             throw new IllegalArgumentException("Only directories may be pushed!");
         }
         mDirectories.insert(directory.getFileName(), 0);


@@ -862,74 +887,46 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         public void onReceive(Context context, Intent intent) {
             boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);
             String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);
         public void onReceive(Context context, Intent intent) {
             boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);
             String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);

-
-            Log_OC.d(TAG, "sync of account " + accountName + " is in_progress: " + inProgress);
-            

             RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);
             RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);

-            
-            if (getAccount() != null && accountName.equals(getAccount().name)) {  
+
+            if (getAccount() != null && accountName.equals(getAccount().name)
+                    && mStorageManager != null
+                    ) {  

 
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 
 
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 

-                /*
-                boolean fillBlankRoot = false;
-                if (currentDir == null) {
-                    currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
-                    fillBlankRoot = (currentDir != null);                   
-                }
-                */
+                OCFile currentFile = (getFile() == null) ? null : mStorageManager.getFileByPath(getFile().getRemotePath());
+                OCFile currentDir = (getCurrentDir() == null) ? null : mStorageManager.getFileByPath(getCurrentDir().getRemotePath());

 
 

-                OCFile currentDir = mStorageManager.getFileById(getCurrentDir().getFileId());

                 if (currentDir == null) {
                     // current folder was removed from the server 
                 if (currentDir == null) {
                     // current folder was removed from the server 

-                    Toast.makeText(FileDisplayActivity.this, getString(R.string.sync_current_folder_was_removed), Toast.LENGTH_LONG)
+                    Toast.makeText( FileDisplayActivity.this, 
+                                    String.format(getString(R.string.sync_current_folder_was_removed), mDirectories.getItem(0)), 
+                                    Toast.LENGTH_LONG)

                         .show();
                         .show();

-                    onBackPressed();
-                    
-                } else if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
+                    browseToRoot();

                     
                     

-                    /*OCFile synchDir = getStorageManager().getFileByPath(synchFolderRemotePath);
-                    //boolean needToRefresh = false;
-                    if (synchDir == null) {
-                        // after synchronizing the current folder does not exist (was deleted in the server) ; need to move to other
-                        /*
-                        String synchPath = synchFolderRemotePath;
-                        do { 
-                            String synchParentPath = new File(synchPath).getParent();
-                            synchParentPath = synchParentPath.endsWith(OCFile.PATH_SEPARATOR) ? synchParentPath : synchParentPath + OCFile.PATH_SEPARATOR;
-                            synchDir = getStorageManager().getFileByPath(synchParentPath);
-                            popDirname();
-                            synchPath = synchParentPath;
-                        }  while (synchDir == null);    // sooner of later will get ROOT, that never is null
-                        currentDir = synchDir;
-                        *-/
-                        Toast.makeText(FileDisplayActivity.this, 
-                                        String.format(getString(R.string.sync_current_folder_was_removed), "LOLO"), 
-                                        Toast.LENGTH_LONG).show();
-                        //needToRefresh = true;
-                        onBackPressed();
-                    } else {*/
-                    
-                    OCFileListFragment fileListFragment = getListOfFilesFragment();
-                    if (fileListFragment != null) {
-                        fileListFragment.listDirectory(currentDir);
+                } else {
+                    if (currentFile == null && !getFile().isFolder()) {
+                        // currently selected file was removed in the server, and now we know it
+                        cleanSecondFragment();
+                        currentFile = currentDir;

                     }
                     }

-                    //boolean existsSecondFragment = (getSecondFragment() != null); 
-                    //if (!existsSecondFragment) {
-                    if (getSecondFragment() == null) {
-                        setFile(currentDir);
+                
+                    if (synchFolderRemotePath != null && currentDir.getRemotePath().equals(synchFolderRemotePath)) {
+                        OCFileListFragment fileListFragment = getListOfFilesFragment();
+                        if (fileListFragment != null) {
+                            fileListFragment.listDirectory(currentDir);
+                        }

                     }
                     }

-                    //updateFragmentsVisibility(existsSecondFragment);
-                    //updateNavigationElementsInActionBar(existsSecondFragment ? getFile() : null);
+                    setFile(currentFile);

                 }
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);
                 removeStickyBroadcast(intent);
                 }
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);
                 removeStickyBroadcast(intent);

-                

                 mSyncInProgress = inProgress;
 
             }
                 mSyncInProgress = inProgress;
 
             }

-

             
             if (synchResult != null) {
                 if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
             
             if (synchResult != null) {
                 if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {


@@ -999,11 +996,43 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override

-    public DataStorageManager getStorageManager() {
+    public FileDataStorageManager getStorageManager() {

         return mStorageManager;
     }
 
 
         return mStorageManager;
     }
 
 

+    public void browseToRoot() {
+        OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+        if (listOfFiles != null) {  // should never be null, indeed
+            while (mDirectories.getCount() > 1) {
+                popDirname();
+            }
+            OCFile root = mStorageManager.getFileByPath(OCFile.ROOT_PATH);
+            listOfFiles.listDirectory(root);
+            setFile(listOfFiles.getCurrentFile());
+            startSyncFolderOperation(root);
+        }
+        cleanSecondFragment();
+    }
+    
+    
+    public void browseTo(OCFile folder) {
+        if (folder == null || !folder.isFolder()) {
+            throw new IllegalArgumentException("Trying to browse to invalid folder " + folder);
+        }
+        OCFileListFragment listOfFiles = getListOfFilesFragment(); 
+        if (listOfFiles != null) {
+            setNavigationListWithFolder(folder);
+            listOfFiles.listDirectory(folder);
+            setFile(listOfFiles.getCurrentFile());
+            startSyncFolderOperation(folder);
+        } else {
+            Log_OC.e(TAG, "Unexpected null when accessing list fragment");
+        }
+        cleanSecondFragment();
+    }
+
+

     /**
      * {@inheritDoc}
      * 
     /**
      * {@inheritDoc}
      * 


@@ -1015,7 +1044,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         cleanSecondFragment();
         
         // Sync Folder
         cleanSecondFragment();
         
         // Sync Folder

-        startSyncFolderOperation(directory.getRemotePath(), directory.getFileId());
+        startSyncFolderOperation(directory);

         
     }
 
         
     }
 


@@ -1416,30 +1445,29 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     private OCFile getCurrentDir() {
         OCFile file = getFile();
         if (file != null) {
     private OCFile getCurrentDir() {
         OCFile file = getFile();
         if (file != null) {

-            if (file.isDirectory()) {
+            if (file.isFolder()) {

                 return file;
             } else if (mStorageManager != null) {
                 return file;
             } else if (mStorageManager != null) {

-                return mStorageManager.getFileById(file.getParentId());
+                String parentPath = file.getRemotePath().substring(0, file.getRemotePath().lastIndexOf(file.getFileName()));
+                return mStorageManager.getFileByPath(parentPath);

             }
         }
         return null;
     }
     
             }
         }
         return null;
     }
     

-    public void startSyncFolderOperation(String remotePath, long parentId) {
+    public void startSyncFolderOperation(OCFile folder) {

         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;
                 
         // perform folder synchronization
         long currentSyncTime = System.currentTimeMillis(); 
         
         mSyncInProgress = true;
                 
         // perform folder synchronization

-        RemoteOperation synchFolderOp = new SynchronizeFolderOperation(  remotePath, 
-                                                                                    currentSyncTime, 
-                                                                                    parentId, 
-                                                                                    false,
-                                                                                    false,
-                                                                                    getStorageManager(), 
-                                                                                    getAccount(), 
-                                                                                    getApplicationContext()
-                                                                                  );
+        RemoteOperation synchFolderOp = new SynchronizeFolderOperation( folder,  
+                                                                        currentSyncTime, 
+                                                                        false,
+                                                                        getStorageManager(), 
+                                                                        getAccount(), 
+                                                                        getApplicationContext()
+                                                                      );

         synchFolderOp.execute(getAccount(), this, null, null, this);
         
         setSupportProgressBarIndeterminateVisibility(true);
         synchFolderOp.execute(getAccount(), this, null, null, this);
         
         setSupportProgressBarIndeterminateVisibility(true);