Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
index f02dcde,4b37a3b..1ddbd4a
--- 1/src/com/owncloud/android/files/FileOperationsHelper.java
--- 2/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -28,10 -28,9 +28,9 @@@ import android.widget.Toast
  
  import com.owncloud.android.R;
  import com.owncloud.android.datamodel.OCFile;
 -import com.owncloud.android.lib.accounts.OwnCloudAccount;
 -import com.owncloud.android.lib.network.webdav.WebdavUtils;
 +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
 +import com.owncloud.android.lib.common.network.WebdavUtils;
- import com.owncloud.android.lib.resources.shares.ShareType;
- import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.services.OperationsService;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.dialog.ActivityChooserDialog;
  import com.owncloud.android.utils.Log_OC;

diff --cc src/com/owncloud/android/files/services/FileDownloader.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/operations/CreateShareOperation.java
Simple merge

diff --cc src/com/owncloud/android/operations/GetSharesOperation.java
Simple merge

diff --cc src/com/owncloud/android/operations/UnshareLinkOperation.java
index 0000000,d4f9c37..2bacc4b
mode 000000,100644..100644
--- /dev/null
--- 2/src/com/owncloud/android/operations/UnshareLinkOperation.java
+++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java
@@@ -1,0 -1,93 +1,93 @@@
 -import com.owncloud.android.lib.network.OwnCloudClient;
 -import com.owncloud.android.lib.operations.common.OCShare;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation;
+ /* ownCloud Android client application
+  *   Copyright (C) 2014 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,
+  *   as published by the Free Software Foundation.
+  *
+  *   This program is distributed in the hope that it will be useful,
+  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *   GNU General Public License for more details.
+  *
+  *   You should have received a copy of the GNU General Public License
+  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
+  */
+ 
+ package com.owncloud.android.operations;
+ 
+ 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.resources.files.ExistenceCheckRemoteOperation;
++import com.owncloud.android.lib.resources.shares.OCShare;
+ import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation;
+ import com.owncloud.android.operations.common.SyncOperation;
+ import com.owncloud.android.utils.Log_OC;
+ 
+ /**
+  * Unshare file/folder
+  * Save the data in Database
+  * 
+  * @author masensio
+  */
+ public class UnshareLinkOperation extends SyncOperation {
+ 
+     private static final String TAG = UnshareLinkOperation.class.getSimpleName();
+     
+     private String mRemotePath;
+     private Context mContext;
+     
+     
+     public UnshareLinkOperation(String remotePath, Context context) {
+         mRemotePath = remotePath;
+         mContext = context;
+     }
+ 
+     @Override
+     protected RemoteOperationResult run(OwnCloudClient client) {
+         RemoteOperationResult result  = null;
+         
+         // Get Share for a file
+         OCShare share = getStorageManager().getShareByPath(mRemotePath);
+         
+         if (share != null) {
+             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);
+                 file.setShareByLink(false);
+                 file.setPublicLink("");
+                 getStorageManager().saveFile(file);
+                 getStorageManager().removeShare(share);
+                 
+                 if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
+                     if (existsFile(client, file.getRemotePath())) {
+                         result = new RemoteOperationResult(ResultCode.OK);
+                     } else {
+                         getStorageManager().removeFile(file, true, true);
+                     }
+                 }
+             } 
+                 
+         } else {
+             result = new RemoteOperationResult(ResultCode.SHARE_NOT_FOUND);
+         }
+ 
+         return result;
+     }
+     
+     private boolean existsFile(OwnCloudClient client, String remotePath){
+         ExistenceCheckRemoteOperation existsOperation = new ExistenceCheckRemoteOperation(remotePath, mContext, false);
+         RemoteOperationResult result = existsOperation.execute(client);
+         return result.isSuccess();
+     }
+ 
+ }

diff --cc src/com/owncloud/android/services/OperationsService.java
index 258f0aa,200d7a3..80caea7
--- 1/src/com/owncloud/android/services/OperationsService.java
--- 2/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@@ -21,13 -24,16 +24,15 @@@ import java.util.Map
  import java.util.concurrent.ConcurrentLinkedQueue;
  
  import com.owncloud.android.datamodel.FileDataStorageManager;
--
 -import com.owncloud.android.lib.network.OwnCloudClientFactory;
 -import com.owncloud.android.lib.network.OwnCloudClient;
 +import com.owncloud.android.lib.common.OwnCloudClientFactory;
 +import com.owncloud.android.lib.common.OwnCloudClient;
- import com.owncloud.android.operations.GetSharesOperation;
- import com.owncloud.android.operations.common.SyncOperation;
++import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 +import com.owncloud.android.lib.common.operations.RemoteOperation;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult;
++import com.owncloud.android.lib.resources.shares.ShareType;
++import com.owncloud.android.operations.common.SyncOperation;
+ import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.operations.UnshareLinkOperation;
 -import com.owncloud.android.operations.common.SyncOperation;
 -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.ShareType;
  import com.owncloud.android.utils.Log_OC;
  
  import android.accounts.Account;

diff --cc src/com/owncloud/android/ui/activity/FileActivity.java
index ddf7ca7,dc3ad0d..42b90ae
--- 1/src/com/owncloud/android/ui/activity/FileActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@@ -38,12 -42,15 +42,15 @@@ import com.owncloud.android.authenticat
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.FileOperationsHelper;
 -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.lib.common.operations.OnRemoteOperationListener;
 +import com.owncloud.android.lib.common.operations.RemoteOperation;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.operations.UnshareLinkOperation;
  
+ import com.owncloud.android.services.OperationsService;
+ import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
  import com.owncloud.android.ui.dialog.LoadingDialog;
  import com.owncloud.android.utils.Log_OC;
  

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 374a53b,548a27b..ece3991
--- 1/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
--- 2/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@@ -45,6 -45,12 +45,12 @@@ import com.owncloud.android.files.servi
  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.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.lib.common.operations.OnRemoteOperationListener;
++import com.owncloud.android.lib.common.operations.RemoteOperation;
++import com.owncloud.android.lib.common.operations.RemoteOperationResult;
++import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
+ import com.owncloud.android.operations.CreateShareOperation;
+ import com.owncloud.android.operations.UnshareLinkOperation;
  import com.owncloud.android.ui.activity.FileActivity;
  import com.owncloud.android.ui.activity.FileDisplayActivity;
  import com.owncloud.android.ui.activity.PinCodeActivity;

diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
Simple merge