Add new string for share_groups_indicator

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

diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java
index 218573e..3859388 100644 (file)
--- a/src/com/owncloud/android/operations/UnshareLinkOperation.java
+++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2014 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author masensio
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -20,20 +23,21 @@ package com.owncloud.android.operations;
 import android.content.Context;
 
 import com.owncloud.android.datamodel.OCFile;
 import android.content.Context;
 
 import com.owncloud.android.datamodel.OCFile;

+

 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;

+import com.owncloud.android.lib.common.utils.Log_OC;

 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation;

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

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

-import com.owncloud.android.utils.Log_OC;

 
 /**
  * Unshare file/folder
  * Save the data in Database
 
 /**
  * Unshare file/folder
  * Save the data in Database

- * 
- * @author masensio

  */
 public class UnshareLinkOperation extends SyncOperation {
 
  */
 public class UnshareLinkOperation extends SyncOperation {
 


@@ -53,17 +57,19 @@ public class UnshareLinkOperation extends SyncOperation {
         RemoteOperationResult result  = null;
         
         // Get Share for a file
         RemoteOperationResult result  = null;
         
         // Get Share for a file

-        OCShare share = getStorageManager().getShareByPath(mRemotePath);
+        OCShare share = getStorageManager().getFirstShareByPathAndType(mRemotePath,
+                ShareType.PUBLIC_LINK);

         
         if (share != null) {
         
         if (share != null) {

-            RemoveRemoteShareOperation operation = new RemoveRemoteShareOperation((int) share.getIdRemoteShared());
+            RemoveRemoteShareOperation operation =
+                    new RemoveRemoteShareOperation((int) share.getIdRemoteShared());

             result = operation.execute(client);
 
             if (result.isSuccess() || result.getCode() == ResultCode.SHARE_NOT_FOUND) {
                 Log_OC.d(TAG, "Share id = " + share.getIdRemoteShared() + " deleted");
 
                 OCFile file = getStorageManager().getFileByPath(mRemotePath);
             result = operation.execute(client);
 
             if (result.isSuccess() || result.getCode() == ResultCode.SHARE_NOT_FOUND) {
                 Log_OC.d(TAG, "Share id = " + share.getIdRemoteShared() + " deleted");
 
                 OCFile file = getStorageManager().getFileByPath(mRemotePath);

-                file.setShareByLink(false);
+                file.setShareViaLink(false);

                 file.setPublicLink("");
                 getStorageManager().saveFile(file);
                 getStorageManager().removeShare(share);
                 file.setPublicLink("");
                 getStorageManager().saveFile(file);
                 getStorageManager().removeShare(share);


@@ -85,7 +91,8 @@ public class UnshareLinkOperation extends SyncOperation {
     }
     
     private boolean existsFile(OwnCloudClient client, String remotePath){
     }
     
     private boolean existsFile(OwnCloudClient client, String remotePath){

-        ExistenceCheckRemoteOperation existsOperation = new ExistenceCheckRemoteOperation(remotePath, mContext, false);
+        ExistenceCheckRemoteOperation existsOperation =
+                new ExistenceCheckRemoteOperation(remotePath, mContext, false);

         RemoteOperationResult result = existsOperation.execute(client);
         return result.isSuccess();
     }
         RemoteOperationResult result = existsOperation.execute(client);
         return result.isSuccess();
     }