Merge remote-tracking branch 'remotes/upstream/master' into beta

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

diff --git a/src/com/owncloud/android/operations/GetSharesForFileOperation.java b/src/com/owncloud/android/operations/GetSharesForFileOperation.java
index f6a5e06..a04d415 100644 (file)
--- a/src/com/owncloud/android/operations/GetSharesForFileOperation.java
+++ b/src/com/owncloud/android/operations/GetSharesForFileOperation.java
@@ -21,16 +21,15 @@
 
 package com.owncloud.android.operations;
 
 
 package com.owncloud.android.operations;
 

-import java.util.ArrayList;
-
-import com.owncloud.android.MainApp;

 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClient;

-import com.owncloud.android.lib.resources.shares.OCShare;

 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;

+import com.owncloud.android.lib.resources.shares.OCShare;

 import com.owncloud.android.operations.common.SyncOperation;
 
 import com.owncloud.android.operations.common.SyncOperation;
 

+import java.util.ArrayList;
+

 /**
  * Provide a list shares for a specific file.
  */
 /**
  * Provide a list shares for a specific file.
  */


@@ -61,7 +60,7 @@ public class GetSharesForFileOperation extends SyncOperation {
     protected RemoteOperationResult run(OwnCloudClient client) {
         GetRemoteSharesForFileOperation operation = new GetRemoteSharesForFileOperation(mPath,
                 mReshares, mSubfiles);
     protected RemoteOperationResult run(OwnCloudClient client) {
         GetRemoteSharesForFileOperation operation = new GetRemoteSharesForFileOperation(mPath,
                 mReshares, mSubfiles);

-        RemoteOperationResult result = operation.execute(client, MainApp.getUserAgent());
+        RemoteOperationResult result = operation.execute(client);

 
         if (result.isSuccess()) {
 
 
         if (result.isSuccess()) {
 


@@ -73,6 +72,11 @@ public class GetSharesForFileOperation extends SyncOperation {
             }
 
             getStorageManager().saveSharesDB(shares);
             }
 
             getStorageManager().saveSharesDB(shares);

+
+        } else if (result.getCode() == RemoteOperationResult.ResultCode.SHARE_NOT_FOUND) {
+            // no share on the file - remove local shares
+            getStorageManager().removeSharesForFile(mPath);
+

         }
 
         return result;
         }
 
         return result;