Merge branch 'develop' into share_link__reuse_link_shared_in_server

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

diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java
index bf462a2..17151ab 100644 (file)
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -28,18 +28,23 @@ import android.content.Intent;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;

-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.ShareType;
-import com.owncloud.android.lib.operations.remote.CreateShareRemoteOperation;
-import com.owncloud.android.lib.utils.FileUtils;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;

 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.Log_OC;
 
 public class CreateShareOperation extends SyncOperation {
 
     private static final String TAG = CreateShareOperation.class.getSimpleName();
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.Log_OC;
 
 public class CreateShareOperation extends SyncOperation {
 
     private static final String TAG = CreateShareOperation.class.getSimpleName();

+    
+    // String to build the link with the token of a share: server address + "/public.php?service=files&t=" + token
+    private final String SHARING_LINK_TOKEN = "/public.php?service=files&t=";

 
     protected FileDataStorageManager mStorageManager;
 
 
     protected FileDataStorageManager mStorageManager;
 


@@ -83,41 +88,31 @@ public class CreateShareOperation extends SyncOperation {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {

-        CreateShareRemoteOperation operation = new CreateShareRemoteOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);
-        RemoteOperationResult result = operation.execute(client);
+        RemoteOperation operation = null;
+        
+        // Check if the share link already exists
+        operation = new GetRemoteSharesForFileOperation(mPath, false, false);
+        RemoteOperationResult result = ((GetRemoteSharesForFileOperation)operation).execute(client);

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

-

             if (result.getData().size() > 0) {
                 OCShare share = (OCShare) result.getData().get(0);
             if (result.getData().size() > 0) {
                 OCShare share = (OCShare) result.getData().get(0);

-
-                // Update DB with the response
-                if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
-                    share.setPath(mPath.substring(0, mPath.length()-1));
-                    share.setIsFolder(true);
-                    
-                } else {
-                    share.setPath(mPath);
-                    share.setIsFolder(false);
-                }
-                share.setPermissions(mPermissions);
-                
-                getStorageManager().saveShare(share);
-                
-                // Update OCFile with data from share: ShareByLink  and publicLink
-                OCFile file = getStorageManager().getFileByPath(mPath);
-                if (file!=null) {
-                    mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
-                    file.setPublicLink(share.getShareLink());
-                    file.setShareByLink(true);
-                    getStorageManager().saveFile(file);
-                    Log_OC.d(TAG, "Public Link = " + file.getPublicLink());
-
+                // Update the link, build it with the token: server address + "/public.php?service=files&t=" + token
+                share.setShareLink(client.getBaseUri() + SHARING_LINK_TOKEN + share.getToken());
+                Log_OC.d(TAG, "Build Share link= " + share.getShareLink());
+                updateData(share);
+            } else {
+                operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);
+                result = ((CreateRemoteShareOperation)operation).execute(client);
+
+                if (result.isSuccess()) {
+                    if (result.getData().size() > 0) {
+                        OCShare share = (OCShare) result.getData().get(0);
+                        updateData(share);
+                    }

                 }
             }
         }
                 }
             }
         }

-
-

         return result;
     }
     
         return result;
     }
     


@@ -125,5 +120,29 @@ public class CreateShareOperation extends SyncOperation {
     public Intent getSendIntent() {
         return mSendIntent;
     }
     public Intent getSendIntent() {
         return mSendIntent;
     }

+    
+    private void updateData(OCShare share) {
+        // Update DB with the response
+        share.setPath(mPath);
+        if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
+            share.setIsFolder(true);
+        } else {
+            share.setIsFolder(false);
+        }
+        share.setPermissions(mPermissions);
+        
+        getStorageManager().saveShare(share);
+        
+        // Update OCFile with data from share: ShareByLink  and publicLink
+        OCFile file = getStorageManager().getFileByPath(mPath);
+        if (file!=null) {
+            mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
+            file.setPublicLink(share.getShareLink());
+            file.setShareByLink(true);
+            getStorageManager().saveFile(file);
+            Log_OC.d(TAG, "Public Link = " + file.getPublicLink());
+
+        }
+    }

 
 }
 
 }