flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #113 from owncloud/edit_public_share_permission

Browse Source 
Edit public share permission
This commit is contained in:
David A. Velasco 2016-03-21 09:35:05 +01:00
commit e7891c4acb
2 changed files with 105 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
View File

@ -25,28 +25,28 @@
package com.owncloud.android.lib.resources.shares; package com.owncloud.android.lib.resources.shares;
import android.net.Uri; import android.net.Uri;
import android.util.Pair; import android.util.Pair;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.methods.StringRequestEntity;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
/** /**
* Updates parameters of an existing Share resource, known its remote ID. * Updates parameters of an existing Share resource, known its remote ID.
* * <p/>
* Allow updating several parameters, triggering a request to the server per parameter. * Allow updating several parameters, triggering a request to the server per parameter.
*/ */
@ -57,42 +57,57 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
private static final String PARAM_PASSWORD = "password"; private static final String PARAM_PASSWORD = "password";
private static final String PARAM_EXPIRATION_DATE = "expireDate"; private static final String PARAM_EXPIRATION_DATE = "expireDate";
private static final String PARAM_PERMISSIONS = "permissions"; private static final String PARAM_PERMISSIONS = "permissions";
private static final String PARAM_PUBLIC_UPLOAD = "publicUpload";
private static final String FORMAT_EXPIRATION_DATE = "yyyy-MM-dd"; private static final String FORMAT_EXPIRATION_DATE = "yyyy-MM-dd";
private static final String ENTITY_CONTENT_TYPE = "application/x-www-form-urlencoded"; private static final String ENTITY_CONTENT_TYPE = "application/x-www-form-urlencoded";
private static final String ENTITY_CHARSET = "UTF-8"; private static final String ENTITY_CHARSET = "UTF-8";
/** Identifier of the share to update */ /**
* Identifier of the share to update
*/
private long mRemoteId; private long mRemoteId;
/** Password to set for the public link */ /**
* Password to set for the public link
*/
private String mPassword; private String mPassword;
/** Expiration date to set for the public link */ /**
* Expiration date to set for the public link
*/
private long mExpirationDateInMillis; private long mExpirationDateInMillis;
/** Access permissions for the file bound to the share */ /**
* Access permissions for the file bound to the share
*/
private int mPermissions; private int mPermissions;
/**
* Upload permissions for the public link (only folders)
*/
private Boolean mPublicUpload;
/** /**
* Constructor. No update is initialized by default, need to be applied with setters below. * Constructor. No update is initialized by default, need to be applied with setters below.
* *
* @param remoteId Identifier of the share to update. * @param remoteId Identifier of the share to update.
*/ */
public UpdateRemoteShareOperation(long remoteId) { public UpdateRemoteShareOperation(long remoteId) {
mRemoteId = remoteId; mRemoteId = remoteId;
mPassword = null; // no update mPassword = null; // no update
mExpirationDateInMillis = 0; // no update mExpirationDateInMillis = 0; // no update
mPublicUpload = null;
} }
/** /**
* Set password to update in Share resource. * Set password to update in Share resource.
* *
* @param password Password to set to the target share. * @param password Password to set to the target share.
* Empty string clears the current password. * Empty string clears the current password.
* Null results in no update applied to the password. * Null results in no update applied to the password.
*/ */
public void setPassword(String password) { public void setPassword(String password) {
mPassword = password; mPassword = password;
@ -102,10 +117,10 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
/** /**
* Set expiration date to update in Share resource. * Set expiration date to update in Share resource.
* *
* @param expirationDateInMillis Expiration date to set to the target share. * @param expirationDateInMillis Expiration date to set to the target share.
* A negative value clears the current expiration date. * A negative value clears the current expiration date.
* Zero value (start-of-epoch) results in no update done on * Zero value (start-of-epoch) results in no update done on
* the expiration date. * the expiration date.
*/ */
public void setExpirationDate(long expirationDateInMillis) { public void setExpirationDate(long expirationDateInMillis) {
mExpirationDateInMillis = expirationDateInMillis; mExpirationDateInMillis = expirationDateInMillis;
@ -115,13 +130,22 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
/** /**
* Set permissions to update in Share resource. * Set permissions to update in Share resource.
* *
* @param permissions Permissions date to set to the target share. * @param permissions Permissions to set to the target share.
* Values <= 0 result in no update applied to the permissions. * Values <= 0 result in no update applied to the permissions.
*/ */
public void setPermissions(int permissions) { public void setPermissions(int permissions) {
mPermissions = permissions; mPermissions = permissions;
} }
/**
* Enable upload permissions to update in Share resource.
*
* @param publicUpload Upload Permission to set to the target share.
*/
public void setPublicUpload(boolean publicUpload) {
mPublicUpload = publicUpload;
}
@Override @Override
protected RemoteOperationResult run(OwnCloudClient client) { protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null; RemoteOperationResult result = null;
@ -150,17 +174,15 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
parametersToUpdate.add(new Pair(PARAM_PERMISSIONS, Integer.toString(mPermissions))); parametersToUpdate.add(new Pair(PARAM_PERMISSIONS, Integer.toString(mPermissions)));
} }
/* TODO complete rest of parameters
if (mPublicUpload != null) { if (mPublicUpload != null) {
parametersToUpdate.add(new Pair("publicUpload", mPublicUpload.toString()); parametersToUpdate.add(new Pair(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)));
} }
*/
/// perform required PUT requests /// perform required PUT requests
PutMethod put = null; PutMethod put = null;
String uriString = null; String uriString = null;
try{ try {
Uri requestUri = client.getBaseUri(); Uri requestUri = client.getBaseUri();
Uri.Builder uriBuilder = requestUri.buildUpon(); Uri.Builder uriBuilder = requestUri.buildUpon();
uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1)); uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
@ -174,9 +196,9 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
put = new PutMethod(uriString); put = new PutMethod(uriString);
put.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE); put.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
put.setRequestEntity(new StringRequestEntity( put.setRequestEntity(new StringRequestEntity(
parameter.first + "=" + parameter.second, parameter.first + "=" + parameter.second,
ENTITY_CONTENT_TYPE, ENTITY_CONTENT_TYPE,
ENTITY_CHARSET ENTITY_CHARSET
)); ));
status = client.executeMethod(put); status = client.executeMethod(put);

49
test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java
View File

@ -64,13 +64,18 @@ public class UpdatePublicShareTest extends RemoteTest {
/* File to share and update.*/ /* File to share and update.*/
private static final String FILE_TO_SHARE = "/fileToShare.txt"; private static final String FILE_TO_SHARE = "/fileToShare.txt";
/* Folder to share and update */
private static final String FOLDER_TO_SHARE = "/folderToShare";
// Data for tests // Data for tests
private static final String PASSWORD = "password"; private static final String PASSWORD = "password";
private static final String PASS_SPECIAL_CHARS = "p@ssw<73>rd"; private static final String PASS_SPECIAL_CHARS = "p@ssw<73>rd";
private String mFullPath2FileToShare; private String mFullPath2FileToShare;
private String mFullPath2FolderToShare;
private OCShare mShare; private OCShare mShare;
private OCShare mFolderShare;
String mServerUri, mUser, mPass; String mServerUri, mUser, mPass;
OwnCloudClient mClient = null; OwnCloudClient mClient = null;
@ -107,7 +112,7 @@ public class UpdatePublicShareTest extends RemoteTest {
Log.v(LOG_TAG, "Setting up the remote fixture..."); Log.v(LOG_TAG, "Setting up the remote fixture...");
// Upload the files // Upload the file
mFullPath2FileToShare = mBaseFolderPath + FILE_TO_SHARE; mFullPath2FileToShare = mBaseFolderPath + FILE_TO_SHARE;
File textFile = getActivity().extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME); File textFile = getActivity().extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME);
@ -126,15 +131,39 @@ public class UpdatePublicShareTest extends RemoteTest {
"", "",
false, false,
"", "",
1); OCShare.READ_PERMISSION_FLAG);
if (result.isSuccess()){ if (result.isSuccess()){
mShare = (OCShare) result.getData().get(0); mShare = (OCShare) result.getData().get(0);
} else{ } else{
mShare = null; Utils.logAndThrow(LOG_TAG, result);
} }
Log.v(LOG_TAG, "Remote fixture created."); // Create the folder
mFullPath2FolderToShare = mBaseFolderPath + FOLDER_TO_SHARE;
result = getActivity().createFolder(
mFullPath2FolderToShare,
true);
if (!result.isSuccess()) {
Utils.logAndThrow(LOG_TAG, result);
}
// Share the folder publicly via link
result = getActivity().createShare(
mFullPath2FolderToShare,
ShareType.PUBLIC_LINK,
"",
false,
"",
OCShare.READ_PERMISSION_FLAG);
if (result.isSuccess()){
mFolderShare = (OCShare) result.getData().get(0);
} else{
Utils.logAndThrow(LOG_TAG, result);
}
Log.v(LOG_TAG, "Remote fixtures created.");
} }
@ -165,6 +194,12 @@ public class UpdatePublicShareTest extends RemoteTest {
result = updateShare.execute(mClient); result = updateShare.execute(mClient);
assertTrue(result.isSuccess()); assertTrue(result.isSuccess());
// Update the Folder Share with edit permission
updateShare = new UpdateRemoteShareOperation(mFolderShare.getRemoteId());
updateShare.setPublicUpload(true);
result = updateShare.execute(mClient);
assertTrue(result.isSuccess());
// unsuccessful test // unsuccessful test
// Update Share with expiration date in the past // Update Share with expiration date in the past
updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId()); updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
@ -174,6 +209,12 @@ public class UpdatePublicShareTest extends RemoteTest {
result = updateShare.execute(mClient); result = updateShare.execute(mClient);
assertFalse(result.isSuccess()); assertFalse(result.isSuccess());
// Try to update the file Share with edit permission
updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
updateShare.setPublicUpload(true);
result = updateShare.execute(mClient);
assertFalse(result.isSuccess());
// Unshare the file before the unsuccessful tests // Unshare the file before the unsuccessful tests
RemoveRemoteShareOperation unshare = new RemoveRemoteShareOperation((int) mShare.getRemoteId()); RemoveRemoteShareOperation unshare = new RemoveRemoteShareOperation((int) mShare.getRemoteId());
result = unshare.execute(mClient); result = unshare.execute(mClient);