1
0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00

Merge branch 'share_link__new_share' into share_link__unshare_link

This commit is contained in:
masensio 2014-02-05 11:01:42 +01:00
commit 1654feb2cc
2 changed files with 6 additions and 8 deletions

View File

@ -113,7 +113,9 @@ public class CreateShareRemoteOperation extends RemoteOperation {
post.addParameter(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue())); post.addParameter(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue()));
post.addParameter(PARAM_SHARE_WITH, mShareWith); post.addParameter(PARAM_SHARE_WITH, mShareWith);
post.addParameter(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload)); post.addParameter(PARAM_PUBLIC_UPLOAD, Boolean.toString(mPublicUpload));
post.addParameter(PARAM_PASSWORD, mPassword); if (mPassword != null && mPassword.length() > 0) {
post.addParameter(PARAM_PASSWORD, mPassword);
}
post.addParameter(PARAM_PERMISSIONS, Integer.toString(mPermissions)); post.addParameter(PARAM_PERMISSIONS, Integer.toString(mPermissions));
status = client.executeMethod(post); status = client.executeMethod(post);

View File

@ -94,12 +94,8 @@ public class GetSharesForFileRemoteOperation extends RemoteOperation {
// Add Parameters to Get Method // Add Parameters to Get Method
get.setQueryString(new NameValuePair[] { get.setQueryString(new NameValuePair[] {
new NameValuePair(PARAM_PATH, mPath) new NameValuePair(PARAM_PATH, mPath),
}); new NameValuePair(PARAM_RESHARES, String.valueOf(mReshares)),
get.setQueryString(new NameValuePair[] {
new NameValuePair(PARAM_RESHARES, String.valueOf(mReshares))
});
get.setQueryString(new NameValuePair[] {
new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles)) new NameValuePair(PARAM_SUBFILES, String.valueOf(mSubfiles))
}); });