X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d9219441b145bc48302934430b05dfb001501d57..700d4449779ee9702437103695a79a1cf7169e9c:/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 17151abf..b563790f 100644
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -32,19 +32,17 @@ 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.common.utils.Log_OC;
 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();
     
-    // 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;
 
@@ -59,20 +57,20 @@ public class CreateShareOperation extends SyncOperation {
     /**
      * Constructor
      * @param path          Full path of the file/folder being shared. Mandatory argument
-     * @param shareType     ‘0’ = user, ‘1’ = group, ‘3’ = Public link. Mandatory argument
+     * @param shareType     0 = user, 1 = group, 3 = Public link. Mandatory argument
      * @param shareWith     User/group ID with who the file should be shared.  This is mandatory for shareType of 0 or 1
-     * @param publicUpload  If ‘false’ (default) public cannot upload to a public shared folder. 
-     *                      If ‘true’ public can upload to a shared folder. Only available for public link shares
+     * @param publicUpload  If false (default) public cannot upload to a public shared folder. 
+     *                      If true public can upload to a shared folder. Only available for public link shares
      * @param password      Password to protect a public link share. Only available for public link shares
-     * @param permissions   1 - Read only – Default for “public” shares
+     * @param permissions   1 - Read only - Default for public shares
      *                      2 - Update
      *                      4 - Create
      *                      8 - Delete
      *                      16- Re-share
-     *                      31- All above – Default for “private” shares
+     *                      31- All above - Default for private shares
      *                      For user or group shares.
      *                      To obtain combinations, add the desired values together.  
-     *                      For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27.
+     *                      For instance, for Re-Share, delete, read, update, add 16+8+2+1 = 27.
      */
     public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, 
             String password, int permissions, Intent sendIntent) {
@@ -94,25 +92,18 @@ public class CreateShareOperation extends SyncOperation {
         operation = new GetRemoteSharesForFileOperation(mPath, false, false);
         RemoteOperationResult result = ((GetRemoteSharesForFileOperation)operation).execute(client);
 
+        if (!result.isSuccess() || result.getData().size() <= 0) {
+            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);
-                // 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;
     }