OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file

[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 7659d16..7277b3a 100644 (file)
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -24,14 +24,16 @@ package com.owncloud.android.operations;
  *
  */
 
  *
  */
 

+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.RemoteOperationResult;
+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;
 
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.Log_OC;
 


@@ -47,6 +49,7 @@ public class CreateShareOperation extends SyncOperation {
     private boolean mPublicUpload;
     private String mPassword;
     private int mPermissions;
     private boolean mPublicUpload;
     private String mPassword;
     private int mPermissions;

+    private Intent mSendIntent;

 
     /**
      * Constructor
 
     /**
      * Constructor


@@ -67,7 +70,7 @@ public class CreateShareOperation extends SyncOperation {
      *                      For instance, for \93Re-Share\94, \93delete\94, \93read\94, \93update\94, add 16+8+2+1 = 27.
      */
     public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, 
      *                      For instance, for \93Re-Share\94, \93delete\94, \93read\94, \93update\94, add 16+8+2+1 = 27.
      */
     public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, 

-            String password, int permissions) {
+            String password, int permissions, Intent sendIntent) {

 
         mPath = path;
         mShareType = shareType;
 
         mPath = path;
         mShareType = shareType;


@@ -75,11 +78,12 @@ public class CreateShareOperation extends SyncOperation {
         mPublicUpload = publicUpload;
         mPassword = password;
         mPermissions = permissions;
         mPublicUpload = publicUpload;
         mPassword = password;
         mPermissions = permissions;

+        mSendIntent = sendIntent;

     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
     }
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {

-        CreateShareRemoteOperation operation = new CreateShareRemoteOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);
+        CreateRemoteShareOperation operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions);

         RemoteOperationResult result = operation.execute(client);
 
         if (result.isSuccess()) {
         RemoteOperationResult result = operation.execute(client);
 
         if (result.isSuccess()) {


@@ -88,13 +92,11 @@ public class CreateShareOperation extends SyncOperation {
                 OCShare share = (OCShare) result.getData().get(0);
 
                 // Update DB with the response
                 OCShare share = (OCShare) result.getData().get(0);
 
                 // Update DB with the response

+                share.setPath(mPath);

                 if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {
                 if (mPath.endsWith(FileUtils.PATH_SEPARATOR)) {

-                    share.setPath(mPath.substring(0, mPath.length()-1));
-                    share.setIsDirectory(true);
-                    
+                    share.setIsFolder(true);

                 } else {
                 } else {

-                    share.setPath(mPath);
-                    share.setIsDirectory(false);
+                    share.setIsFolder(false);

                 }
                 share.setPermissions(mPermissions);
                 
                 }
                 share.setPermissions(mPermissions);
                 


@@ -103,7 +105,9 @@ public class CreateShareOperation extends SyncOperation {
                 // Update OCFile with data from share: ShareByLink  and publicLink
                 OCFile file = getStorageManager().getFileByPath(mPath);
                 if (file!=null) {
                 // 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.setPublicLink(share.getShareLink());

+                    file.setShareByLink(true);

                     getStorageManager().saveFile(file);
                     Log_OC.d(TAG, "Public Link = " + file.getPublicLink());
 
                     getStorageManager().saveFile(file);
                     Log_OC.d(TAG, "Public Link = " + file.getPublicLink());
 


@@ -114,5 +118,10 @@ public class CreateShareOperation extends SyncOperation {
 
         return result;
     }
 
         return result;
     }

+    
+    
+    public Intent getSendIntent() {
+        return mSendIntent;
+    }

 
 }
 
 }