Merge branch 'develop' into share_link_show_shared_files

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / GetSharedFilesOperation.java

diff --git a/src/com/owncloud/android/operations/GetSharedFilesOperation.java b/src/com/owncloud/android/operations/GetSharedFilesOperation.java
index 4ee4cb6..174ebbc 100644 (file)
--- a/src/com/owncloud/android/operations/GetSharedFilesOperation.java
+++ b/src/com/owncloud/android/operations/GetSharedFilesOperation.java
@@ -22,14 +22,13 @@ import java.util.ArrayList;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCShare;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.OCShare;

-import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
-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.ShareRemoteFile;
-import com.owncloud.android.oc_framework.operations.ShareType;
-import com.owncloud.android.oc_framework.operations.remote.GetRemoteSharedFilesOperation;
-import com.owncloud.android.oc_framework.utils.FileUtils;
+import com.owncloud.android.lib.network.OwnCloudClient;
+import com.owncloud.android.lib.operations.common.RemoteOperation;
+import com.owncloud.android.lib.operations.common.RemoteOperationResult;
+import com.owncloud.android.lib.operations.common.ShareRemoteFile;
+import com.owncloud.android.lib.operations.common.ShareType;
+import com.owncloud.android.lib.operations.remote.GetRemoteSharedFilesOperation;
+import com.owncloud.android.lib.utils.FileUtils;

 import com.owncloud.android.utils.Log_OC;
 
 /**
 import com.owncloud.android.utils.Log_OC;
 
 /**


@@ -53,12 +52,14 @@ public class GetSharedFilesOperation extends RemoteOperation {
     }
 
     @Override
     }
 
     @Override

-    protected RemoteOperationResult run(WebdavClient client) {
+    protected RemoteOperationResult run(OwnCloudClient client) {

         GetRemoteSharedFilesOperation operation = new GetRemoteSharedFilesOperation(mUrlServer);
         RemoteOperationResult result = operation.execute(client);
         
         if (result.isSuccess()) {
             
         GetRemoteSharedFilesOperation operation = new GetRemoteSharedFilesOperation(mUrlServer);
         RemoteOperationResult result = operation.execute(client);
         
         if (result.isSuccess()) {
             

+            // Clean Share data in filelist table
+            mStorageManager.cleanShareFile();

             // Update DB with the response
             ArrayList<ShareRemoteFile> shareRemoteFiles = operation.getSharedFiles();
             Log_OC.d(TAG, "Share list size = " + shareRemoteFiles.size());
             // Update DB with the response
             ArrayList<ShareRemoteFile> shareRemoteFiles = operation.getSharedFiles();
             Log_OC.d(TAG, "Share list size = " + shareRemoteFiles.size());