Remove unneeded Code such as code relative to share functionnalities (0408af3f) · Commits · e / os / nextcloud-android-lib

src/com/owncloud/android/lib/resources/comments/CommentFileRemoteOperation.java

deleted100644 → 0

+0 −117

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		*
		* @author Tobias Kaminsky
		* Copyright (C) 2018 Tobias Kaminsky
		* Copyright (C) 2018 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.resources.comments;

		import android.util.Log;

		import com.google.gson.GsonBuilder;
		import com.owncloud.android.lib.common.OwnCloudClient;
		import com.owncloud.android.lib.common.operations.RemoteOperation;
		import com.owncloud.android.lib.common.operations.RemoteOperationResult;

		import org.apache.commons.httpclient.HttpStatus;
		import org.apache.commons.httpclient.methods.PostMethod;
		import org.apache.commons.httpclient.methods.StringRequestEntity;

		import java.io.IOException;
		import java.util.HashMap;
		import java.util.Map;

		/**
		* Comment file
		*/
		public class CommentFileRemoteOperation extends RemoteOperation {

		private static final String TAG = CommentFileRemoteOperation.class.getSimpleName();
		private static final int POST_READ_TIMEOUT = 30000;
		private static final int POST_CONNECTION_TIMEOUT = 5000;

		private static final String ACTOR_ID = "actorId";
		private static final String ACTOR_TYPE = "actorType";
		private static final String ACTOR_TYPE_VALUE = "users";
		private static final String VERB = "verb";
		private static final String VERB_VALUE = "comment";
		private static final String MESSAGE = "message";

		private String message;
		private String fileId;
		private String userId;

		/**
		* Constructor
		*
		* @param message Comment to store
		* @param userId userId to access correct dav endpoint
		*/
		public CommentFileRemoteOperation(String message, String fileId, String userId) {
		this.message = message;
		this.fileId = fileId;
		this.userId = userId;
		}

		/**
		* Performs the operation.
		*
		* @param client Client object to communicate with the remote ownCloud server.
		*/
		@Override
		protected RemoteOperationResult run(OwnCloudClient client) {

		RemoteOperationResult result;
		try {
		String url = client.getNewWebdavUri() + "/comments/files/" + fileId;
		PostMethod postMethod = new PostMethod(url);
		postMethod.addRequestHeader("Content-type", "application/json");

		Map<String, String> values = new HashMap<>();
		values.put(ACTOR_ID, userId);
		values.put(ACTOR_TYPE, ACTOR_TYPE_VALUE);
		values.put(VERB, VERB_VALUE);
		values.put(MESSAGE, message);

		String json = new GsonBuilder().create().toJson(values, Map.class);

		postMethod.setRequestEntity(new StringRequestEntity(json));

		int status = client.executeMethod(postMethod, POST_READ_TIMEOUT, POST_CONNECTION_TIMEOUT);

		result = new RemoteOperationResult(isSuccess(status), postMethod);

		client.exhaustResponse(postMethod.getResponseBodyAsStream());
		} catch (IOException e) {
		result = new RemoteOperationResult(e);
		Log.e(TAG, "Post comment to file with id " + fileId + " failed: " + result.getLogMessage(), e);
		}

		return result;
		}

		private boolean isSuccess(int status) {
		return status == HttpStatus.SC_CREATED;
		}
		}

src/com/owncloud/android/lib/resources/comments/MarkCommentsAsReadRemoteOperation.java

deleted100644 → 0

+0 −93

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		*
		* @author Tobias Kaminsky
		* Copyright (C) 2018 Tobias Kaminsky
		* Copyright (C) 2018 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.resources.comments;

		import com.owncloud.android.lib.common.OwnCloudClient;
		import com.owncloud.android.lib.common.network.WebdavEntry;
		import com.owncloud.android.lib.common.operations.RemoteOperation;
		import com.owncloud.android.lib.common.operations.RemoteOperationResult;

		import org.apache.commons.httpclient.HttpStatus;
		import org.apache.jackrabbit.webdav.client.methods.PropPatchMethod;
		import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
		import org.apache.jackrabbit.webdav.property.DavPropertySet;
		import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
		import org.apache.jackrabbit.webdav.xml.Namespace;

		import java.io.IOException;

		/**
		* Mark all comments for a file as read
		*/
		public class MarkCommentsAsReadRemoteOperation extends RemoteOperation {
		private static final String COMMENTS_URL = "/comments/files/";

		private String fileId;

		public MarkCommentsAsReadRemoteOperation(String fileId) {
		this.fileId = fileId;
		}

		@Override
		protected RemoteOperationResult run(OwnCloudClient client) {
		RemoteOperationResult result;
		PropPatchMethod propPatchMethod = null;

		DavPropertySet newProps = new DavPropertySet();
		DavPropertyNameSet removeProperties = new DavPropertyNameSet();

		DefaultDavProperty<String> readMarkerProperty = new DefaultDavProperty<>("oc:readMarker", "",
		Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
		newProps.add(readMarkerProperty);

		String commentsPath = client.getNewWebdavUri() + COMMENTS_URL + fileId;

		try {
		propPatchMethod = new PropPatchMethod(commentsPath, newProps, removeProperties);
		int status = client.executeMethod(propPatchMethod);

		boolean isSuccess = status == HttpStatus.SC_NO_CONTENT \|\| status == HttpStatus.SC_OK \|\|
		status == HttpStatus.SC_MULTI_STATUS;

		if (isSuccess) {
		result = new RemoteOperationResult(true, status, propPatchMethod.getResponseHeaders());
		} else {
		client.exhaustResponse(propPatchMethod.getResponseBodyAsStream());
		result = new RemoteOperationResult(false, status, propPatchMethod.getResponseHeaders());
		}
		} catch (IOException e) {
		result = new RemoteOperationResult(e);
		} finally {
		if (propPatchMethod != null) {
		propPatchMethod.releaseConnection();
		}
		}

		return result;
		}
		}

src/com/owncloud/android/lib/resources/files/ToggleFavoriteRemoteOperation.java

deleted100644 → 0

+0 −102

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		*
		* @author Mario Danic
		* Copyright (C) 2017 Mario Danic
		* Copyright (C) 2017 Nextcloud GmbH
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.resources.files;

		import android.net.Uri;

		import com.owncloud.android.lib.common.OwnCloudClient;
		import com.owncloud.android.lib.common.network.WebdavEntry;
		import com.owncloud.android.lib.common.operations.RemoteOperation;
		import com.owncloud.android.lib.common.operations.RemoteOperationResult;

		import org.apache.commons.httpclient.HttpStatus;
		import org.apache.jackrabbit.webdav.client.methods.PropPatchMethod;
		import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
		import org.apache.jackrabbit.webdav.property.DavPropertySet;
		import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
		import org.apache.jackrabbit.webdav.xml.Namespace;

		import java.io.IOException;

		/**
		* Favorite or unfavorite a file.
		*/
		public class ToggleFavoriteRemoteOperation extends RemoteOperation {
		private boolean makeItFavorited;
		private String filePath;
		private String userID;

		public ToggleFavoriteRemoteOperation(boolean makeItFavorited, String filePath, String userID) {
		this.makeItFavorited = makeItFavorited;
		this.filePath = filePath;
		this.userID = userID;
		}

		@Override
		protected RemoteOperationResult run(OwnCloudClient client) {
		RemoteOperationResult result = null;
		PropPatchMethod propPatchMethod = null;

		DavPropertySet newProps = new DavPropertySet();
		DavPropertyNameSet removeProperties = new DavPropertyNameSet();

		if (makeItFavorited) {
		DefaultDavProperty<String> favoriteProperty = new DefaultDavProperty<>("oc:favorite", "1",
		Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
		newProps.add(favoriteProperty);
		} else {
		removeProperties.add("oc:favorite", Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
		}

		String webDavUrl = client.getNewWebdavUri().toString();
		String encodedPath = Uri.encode(userID + filePath).replace("%2F", "/");
		String fullFilePath = webDavUrl + "/files/" + encodedPath;

		try {
		propPatchMethod = new PropPatchMethod(fullFilePath, newProps, removeProperties);
		int status = client.executeMethod(propPatchMethod);

		boolean isSuccess = (status == HttpStatus.SC_MULTI_STATUS \|\| status == HttpStatus.SC_OK);

		if (isSuccess) {
		result = new RemoteOperationResult(true, status, propPatchMethod.getResponseHeaders());
		} else {
		client.exhaustResponse(propPatchMethod.getResponseBodyAsStream());
		result = new RemoteOperationResult(false, status, propPatchMethod.getResponseHeaders());
		}
		} catch (IOException e) {
		result = new RemoteOperationResult(e);
		} finally {
		if (propPatchMethod != null) {
		propPatchMethod.releaseConnection(); // let the connection available for other methods
		}
		}

		return result;
		}
		}

src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java

deleted100644 → 0

+0 −175

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* @author masensio
		* @author David A. Velasco
		* Copyright (C) 2015 ownCloud Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.resources.shares;

		import com.owncloud.android.lib.common.OwnCloudClient;
		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 org.apache.commons.httpclient.HttpStatus;
		import org.apache.commons.httpclient.methods.PostMethod;

		/**
		* Creates a new share. This allows sharing with a user or group or as a link.
		*/
		public class CreateRemoteShareOperation extends RemoteOperation {

		private static final String TAG = CreateRemoteShareOperation.class.getSimpleName();

		private static final String PARAM_PATH = "path";
		private static final String PARAM_SHARE_TYPE = "shareType";
		private static final String PARAM_SHARE_WITH = "shareWith";
		private static final String PARAM_PUBLIC_UPLOAD = "publicUpload";
		private static final String PARAM_PASSWORD = "password";
		private static final String PARAM_PERMISSIONS = "permissions";

		private String mRemoteFilePath;
		private ShareType mShareType;
		private String mShareWith;
		private boolean mPublicUpload;
		private String mPassword;
		private int mPermissions;
		private boolean mGetShareDetails;

		/**
		* Constructor
		*
		* @param remoteFilePath Full path of the file/folder being shared. 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 password Password to protect a public link share. Only available for public link 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
		* 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.
		*/
		public CreateRemoteShareOperation(
		String remoteFilePath,
		ShareType shareType,
		String shareWith,
		boolean publicUpload,
		String password,
		int permissions
		) {

		mRemoteFilePath = remoteFilePath;
		mShareType = shareType;
		mShareWith = shareWith;
		mPublicUpload = publicUpload;
		mPassword = password;
		mPermissions = permissions;
		mGetShareDetails = false; // defaults to false for backwards compatibility
		}

		public boolean isGettingShareDetails() {
		return mGetShareDetails;
		}

		public void setGetShareDetails(boolean set) {
		mGetShareDetails = set;
		}

		@Override
		protected RemoteOperationResult run(OwnCloudClient client) {
		RemoteOperationResult result = null;
		int status = -1;

		PostMethod post = null;

		try {
		// Post Method
		post = new PostMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH);

		post.setRequestHeader(CONTENT_TYPE, FORM_URLENCODED + "; charset=utf-8"); // necessary for special characters

		post.addParameter(PARAM_PATH, mRemoteFilePath);
		post.addParameter(PARAM_SHARE_TYPE, Integer.toString(mShareType.getValue()));
		post.addParameter(PARAM_SHARE_WITH, mShareWith);
		if (mPublicUpload) {
		post.addParameter(PARAM_PUBLIC_UPLOAD, Boolean.toString(true));
		}
		if (mPassword != null && mPassword.length() > 0) {
		post.addParameter(PARAM_PASSWORD, mPassword);
		}
		if (OCShare.DEFAULT_PERMISSION != mPermissions) {
		post.addParameter(PARAM_PERMISSIONS, Integer.toString(mPermissions));
		}

		post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

		status = client.executeMethod(post);

		if (isSuccess(status)) {
		String response = post.getResponseBodyAsString();

		ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
		new ShareXMLParser()
		);
		parser.setOneOrMoreSharesRequired(true);
		parser.setOwnCloudVersion(client.getOwnCloudVersion());
		parser.setServerBaseUri(client.getBaseUri());
		result = parser.parse(response);

		if (result.isSuccess() && mGetShareDetails) {
		// retrieve more info - POST only returns the index of the new share
		OCShare emptyShare = (OCShare) result.getData().get(0);
		GetRemoteShareOperation getInfo = new GetRemoteShareOperation(
		emptyShare.getRemoteId()
		);
		result = getInfo.execute(client);
		}

		} else {
		result = new RemoteOperationResult(false, post);
		}

		} catch (Exception e) {
		result = new RemoteOperationResult(e);
		Log_OC.e(TAG, "Exception while Creating New Share", e);

		} finally {
		if (post != null) {
		post.releaseConnection();
		}
		}
		return result;
		}

		private boolean isSuccess(int status) {
		return status == HttpStatus.SC_OK \|\| status == HttpStatus.SC_FORBIDDEN;
		}

		}

src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java

deleted100644 → 0

+0 −100

Original line number	Diff line number	Diff line
		/* ownCloud Android Library is available under MIT license
		* @author David A. Velasco
		* Copyright (C) 2015 ownCloud Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
		* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
		* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
		* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
		* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
		* THE SOFTWARE.
		*
		*/

		package com.owncloud.android.lib.resources.shares;

		import com.owncloud.android.lib.common.OwnCloudClient;
		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 org.apache.commons.httpclient.HttpStatus;
		import org.apache.commons.httpclient.methods.GetMethod;

		/**
		* Get the data about a Share resource, known its remote ID.
		*/

		public class GetRemoteShareOperation extends RemoteOperation {

		private static final String TAG = GetRemoteShareOperation.class.getSimpleName();

		private long mRemoteId;


		public GetRemoteShareOperation(long remoteId) {
		mRemoteId = remoteId;
		}


		@Override
		protected RemoteOperationResult run(OwnCloudClient client) {
		RemoteOperationResult result = null;
		int status = -1;

		// Get Method
		GetMethod get = null;

		// Get the response
		try {
		get = new GetMethod(client.getBaseUri() + ShareUtils.SHARING_API_PATH + "/" + Long.toString(mRemoteId));
		get.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

		status = client.executeMethod(get);

		if (isSuccess(status)) {
		String response = get.getResponseBodyAsString();

		// Parse xml response and obtain the list of shares
		ShareToRemoteOperationResultParser parser = new ShareToRemoteOperationResultParser(
		new ShareXMLParser()
		);
		parser.setOneOrMoreSharesRequired(true);
		parser.setOwnCloudVersion(client.getOwnCloudVersion());
		parser.setServerBaseUri(client.getBaseUri());
		result = parser.parse(response);

		} else {
		result = new RemoteOperationResult(false, get);
		}

		} catch (Exception e) {
		result = new RemoteOperationResult(e);
		Log_OC.e(TAG, "Exception while getting remote shares ", e);

		} finally {
		if (get != null) {
		get.releaseConnection();
		}
		}
		return result;
		}

		private boolean isSuccess(int status) {
		return (status == HttpStatus.SC_OK);
		}


		}