X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0368e8fa547b26afabd9e80de68a3760cf21bdc8..6361dd0a26eea4488da3e004968a03024dc41891:/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 4135ba3d..0b5264bc 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -68,11 +68,14 @@ import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.oc_framework.operations.OnRemoteOperationListener;
-import com.owncloud.android.oc_framework.operations.RemoteOperation;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.operations.GetSharedFilesOperation;
+
+import com.owncloud.android.operations.GetSharesOperation;
+
+import com.owncloud.android.lib.operations.common.OnRemoteOperationListener;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
+
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
@@ -247,11 +250,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             setFile(file);
             setNavigationListWithFolder(file);
             
-            /// get the shared files
-            if (isSharedSupported()) {
-                startGetSharedFiles();
-            }
-            
             if (!stateWasRecovered) {
                 Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
                 initFragmentsWithFile();
@@ -923,6 +921,11 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                     && mStorageManager != null
                     ) {  
 
+                /// get the shared files
+                if (isSharedSupported()) {
+                    startGetShares();
+                }
+                
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 
                 OCFile currentFile = (getFile() == null) ? null : mStorageManager.getFileByPath(getFile().getRemotePath());
@@ -1285,8 +1288,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         } else if (operation instanceof CreateFolderOperation) {
             onCreateFolderOperationFinish((CreateFolderOperation)operation, result);
             
-        } else if (operation instanceof GetSharedFilesOperation) {
-            onGetSharedFilesOperationFinish((GetSharedFilesOperation) operation, result);
+        } else if (operation instanceof GetSharesOperation) {
+            onGetSharesOperationFinish((GetSharesOperation) operation, result);
         }
     }
 
@@ -1296,10 +1299,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      * @param operation     Get Shared Files
      * @param result        Result of the operation
      */
-    private void onGetSharedFilesOperationFinish(GetSharedFilesOperation operation, RemoteOperationResult result) {
+    private void onGetSharesOperationFinish(GetSharesOperation operation, RemoteOperationResult result) {
         // TODO
         // Refresh the filelist with the information
-        refeshListOfFilesFragment();
+        refeshListOfFilesFragment();    
         
     }
 
@@ -1512,10 +1515,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
 
     
-    private void startGetSharedFiles() {
+    private void startGetShares() {
         // Get shared files/folders
-        RemoteOperation getSharedFiles = new GetSharedFilesOperation();
-        getSharedFiles.execute(getAccount(), this, null, null, this);
+        RemoteOperation getShares = new GetSharesOperation(mStorageManager);
+        getShares.execute(getAccount(), this, this, mHandler, this);
         
     }