OC-2678: Save the new Share resource in the Shares database

diff --git a/owncloud-android-library b/owncloud-android-library
index 8ab453d..280701e 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 8ab453d630458fc6cdcd1bf68493d82365f1c6d3
+Subproject commit 280701ea8d864f553609f6cdce32e686b74087c6

diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java
index 1582f8f..7659d16 100644 (file)
--- a/src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/src/com/owncloud/android/operations/CreateShareOperation.java
@@ -25,14 +25,18 @@ package com.owncloud.android.operations;
  */
 
 import com.owncloud.android.datamodel.FileDataStorageManager;
  */
 
 import com.owncloud.android.datamodel.FileDataStorageManager;

+import com.owncloud.android.datamodel.OCFile;

 import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.lib.network.OwnCloudClient;

-import com.owncloud.android.lib.operations.common.RemoteOperation;
+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.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.operations.common.SyncOperation;
+import com.owncloud.android.utils.Log_OC;
+
+public class CreateShareOperation extends SyncOperation {

 
 

-public class CreateShareOperation extends RemoteOperation {
-    

     private static final String TAG = CreateShareOperation.class.getSimpleName();
 
     protected FileDataStorageManager mStorageManager;
     private static final String TAG = CreateShareOperation.class.getSimpleName();
 
     protected FileDataStorageManager mStorageManager;


@@ -43,7 +47,7 @@ public class CreateShareOperation extends RemoteOperation {
     private boolean mPublicUpload;
     private String mPassword;
     private int mPermissions;
     private boolean mPublicUpload;
     private String mPassword;
     private int mPermissions;

-    
+

     /**
      * Constructor
      * @param path          Full path of the file/folder being shared. Mandatory argument
     /**
      * Constructor
      * @param path          Full path of the file/folder being shared. Mandatory argument


@@ -79,11 +83,35 @@ public class CreateShareOperation extends RemoteOperation {
         RemoteOperationResult result = operation.execute(client);
 
         if (result.isSuccess()) {
         RemoteOperationResult result = operation.execute(client);
 
         if (result.isSuccess()) {

-            // TODO
-            // Update DB with the response

 
 

+            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.setIsDirectory(true);
+                    
+                } else {
+                    share.setPath(mPath);
+                    share.setIsDirectory(false);
+                }
+                share.setPermissions(mPermissions);
+                
+                getStorageManager().saveShare(share);
+                
+                // Update OCFile with data from share: ShareByLink  and publicLink
+                OCFile file = getStorageManager().getFileByPath(mPath);
+                if (file!=null) {
+                    file.setPublicLink(share.getShareLink());
+                    getStorageManager().saveFile(file);
+                    Log_OC.d(TAG, "Public Link = " + file.getPublicLink());
+
+                }
+            }

         }
 
         }
 

+

         return result;
     }
 
         return result;
     }
 

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 676e90a..1927d75 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1570,10 +1570,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         
     }
 
         
     }
 

-    @Override
+

     public void shareFileWithLink(OCFile file) {
             CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1);
     public void shareFileWithLink(OCFile file) {
             CreateShareOperation createShare = new CreateShareOperation(file.getRemotePath(), ShareType.PUBLIC_LINK, "", false, "", 1);

-            createShare.execute(getAccount(), this, this, mHandler, this);
+            createShare.execute(getStorageManager(), this, this, mHandler, this);

         
     }
     
         
     }
     

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 7bf0527..5925e08 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -55,9 +55,6 @@ 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.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.operations.common.ShareType;
-import com.owncloud.android.lib.operations.remote.CreateShareRemoteOperation;
-import com.owncloud.android.operations.CreateShareOperation;

 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 326c835..ae7b756 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -285,7 +285,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         mTargetFile = (OCFile) mAdapter.getItem(info.position);
         switch (item.getItemId()) {
             case R.id.action_share_file: {
         mTargetFile = (OCFile) mAdapter.getItem(info.position);
         switch (item.getItemId()) {
             case R.id.action_share_file: {

-                    mContainerActivity.shareFileWithLink(getCurrentFile());
+                    mContainerActivity.shareFileWithLink(mTargetFile);

                 return true;
             }
             case R.id.action_rename_file: {
                 return true;
             }
             case R.id.action_rename_file: {