Merge branch 'master' into externalLinks (41a44e80) · Commits · e / os / Nextcloud Android Library

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundExce
		import com.owncloud.android.lib.common.network.CertificateCombinedException;
		import com.owncloud.android.lib.common.utils.Log_OC;
		import com.owncloud.android.lib.resources.notifications.models.Notification;
		import com.owncloud.android.lib.resources.notifications.models.PushResponse;

		import org.apache.commons.httpclient.ConnectTimeoutException;
		import org.apache.commons.httpclient.Header;
		@@ -130,6 +131,7 @@ public class RemoteOperationResult implements Serializable {

		private ArrayList<Object> mData;
		private List<Notification> mNotificationData;
		private PushResponse mPushResponse;

		public RemoteOperationResult(ResultCode code) {
		mCode = code;
		@@ -289,6 +291,13 @@ public class RemoteOperationResult implements Serializable {
		mNotificationData = notifications;
		}

		public PushResponse getPushResponseData() {
		return mPushResponse;
		}
		public void setPushResponseData(PushResponse pushResponseData) {
		mPushResponse = pushResponseData;
		}

		public List<Notification> getNotificationData() {
		return mNotificationData;
		}

src/com/owncloud/android/lib/common/utils/HttpDeleteWithBody.java

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		* Copyright (C) 2017 Mario Danic
		*
		* @author Mario Danic
		*
		*
		* 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.common.utils;

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


		public class HttpDeleteWithBody extends PostMethod {

		public HttpDeleteWithBody(String url){
		super(url);
		}

		@Override
		public String getName() {
		return "DELETE";
		}

		}

src/com/owncloud/android/lib/resources/notifications/GetRemoteNotificationsOperation.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -132,9 +132,8 @@ public class GetRemoteNotificationsOperation extends RemoteOperation {

		Gson gson = new Gson();
		Type listType = new TypeToken<List<Notification>>(){}.getType();
		List<Notification> notifications = gson.fromJson(jsonDataArray, listType);

		return notifications;
		return gson.fromJson(jsonDataArray, listType);
		}

		private boolean isSuccess(int status) {

src/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForNotificationsOperation.java

0 → 100644

+159 −0

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		* Copyright (C) 2017 Mario Danic
		*
		* @author Mario Danic
		*
		*
		* 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.notifications;


		import com.google.gson.Gson;
		import com.google.gson.JsonObject;
		import com.google.gson.JsonParser;
		import com.google.gson.reflect.TypeToken;
		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 com.owncloud.android.lib.resources.notifications.models.PushResponse;

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

		import java.lang.reflect.Type;

		public class RegisterAccountDeviceForNotificationsOperation extends RemoteOperation {
		// OCS Route
		private static final String OCS_ROUTE =
		"/ocs/v2.php/apps/notifications/api/v2/push?format=json";

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

		// JSON Node names
		private static final String NODE_OCS = "ocs";
		private static final String NODE_DATA = "data";

		private static final String PUSH_TOKEN_HASH = "pushTokenHash";
		private static final String DEVICE_PUBLIC_KEY = "devicePublicKey";
		private static final String PROXY_SERVER = "proxyServer";

		private String pushTokenHash;
		private String devicePublicKey;
		private String proxyServer;

		public RegisterAccountDeviceForNotificationsOperation(String pushTokenHash, String devicePublicKey,
		String proxyServer) {
		this.pushTokenHash = pushTokenHash;
		this.devicePublicKey = devicePublicKey;
		this.proxyServer = proxyServer;
		}

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

		try {
		// Post Method
		post = new PostMethod(client.getBaseUri() + OCS_ROUTE);
		post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

		StringRequestEntity requestEntity = new StringRequestEntity(
		assembleJson(),
		"application/json",
		"UTF-8");

		post.setRequestEntity(requestEntity);

		status = client.executeMethod(post);
		String response = post.getResponseBodyAsString();

		if(isSuccess(status)) {
		result = new RemoteOperationResult(true, status, post.getResponseHeaders());
		Log_OC.d(TAG, "Successful response: " + response);

		// Parse the response
		pushResponse = parseResult(response);
		result.setPushResponseData(pushResponse);
		} else {
		result = new RemoteOperationResult(false, status, post.getResponseHeaders());
		}

		} catch (Exception e) {
		result = new RemoteOperationResult(e);
		Log_OC.e(TAG, "Exception while registering device for notifications", e);

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

		private PushResponse parseResult(String response) throws JSONException {
		JsonParser jsonParser = new JsonParser();
		JsonObject jo = (JsonObject)jsonParser.parse(response);
		JsonObject jsonDataObject = jo.getAsJsonObject(NODE_OCS).getAsJsonObject(NODE_DATA);

		Gson gson = new Gson();
		Type pushResponseType = new TypeToken<PushResponse>(){}.getType();

		return gson.fromJson(jsonDataObject, pushResponseType);
		}

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

		private String assembleJson() {
		StringBuilder stringBuilder = new StringBuilder();
		stringBuilder.append("{");
		stringBuilder.append("\"");
		stringBuilder.append(PUSH_TOKEN_HASH);
		stringBuilder.append("\"");
		stringBuilder.append(":\"");
		stringBuilder.append(pushTokenHash.trim());
		stringBuilder.append("\",");
		stringBuilder.append("\"");
		stringBuilder.append(DEVICE_PUBLIC_KEY);
		stringBuilder.append("\"");
		stringBuilder.append(":\"");
		stringBuilder.append(devicePublicKey.trim());
		stringBuilder.append("\",");
		stringBuilder.append("\"");
		stringBuilder.append(PROXY_SERVER);
		stringBuilder.append("\"");
		stringBuilder.append(":\"");
		stringBuilder.append(proxyServer.trim());
		stringBuilder.append("\"");
		stringBuilder.append("}");

		return stringBuilder.toString();
		}

		}

src/com/owncloud/android/lib/resources/notifications/RegisterAccountDeviceForProxyOperation.java

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/* Nextcloud Android Library is available under MIT license
		* Copyright (C) 2017 Mario Danic
		*
		* @author Mario Danic
		*
		*
		* 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.notifications;

		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;

		import java.net.URLEncoder;

		public class RegisterAccountDeviceForProxyOperation extends RemoteOperation {
		private static final String PROXY_ROUTE = "/devices";

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

		private String proxyUrl;
		private String pushToken;
		private String deviceIdentifier;
		private String deviceIdentifierSignature;
		private String userPublicKey;

		private static final String PUSH_TOKEN = "pushToken";
		private static final String DEVICE_IDENTIFIER = "deviceIdentifier";
		private static final String DEVICE_IDENTIFIER_SIGNATURE = "deviceIdentifierSignature";
		private static final String USER_PUBLIC_KEY = "userPublicKey";

		public RegisterAccountDeviceForProxyOperation(String proxyUrl, String pushToken,
		String deviceIdentifier, String deviceIdentifierSignature,
		String userPublicKey) {
		this.proxyUrl = proxyUrl;
		this.pushToken = pushToken;
		this.deviceIdentifier = deviceIdentifier;
		this.deviceIdentifierSignature = deviceIdentifierSignature;
		this.userPublicKey = userPublicKey;
		}

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

		try {
		// Post Method
		String uriToPost = proxyUrl + PROXY_ROUTE;
		uriToPost += "?" + PUSH_TOKEN + "=" + URLEncoder.encode(pushToken) + "&";
		uriToPost += DEVICE_IDENTIFIER + "=" + URLEncoder.encode(deviceIdentifier) + "&";
		uriToPost += DEVICE_IDENTIFIER_SIGNATURE + "=" + URLEncoder.encode(deviceIdentifierSignature) + "&";
		uriToPost += USER_PUBLIC_KEY + "=" + URLEncoder.encode(userPublicKey);

		post = new PostMethod(uriToPost);
		post.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);

		post.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");

		status = client.executeMethod(post);
		String response = post.getResponseBodyAsString();

		if(isSuccess(status)) {
		result = new RemoteOperationResult(true, status, post.getResponseHeaders());
		Log_OC.d(TAG, "Successful response: " + response);
		} else {
		result = new RemoteOperationResult(false, status, post.getResponseHeaders());
		}

		} catch (Exception e) {
		result = new RemoteOperationResult(e);
		Log_OC.e(TAG, "Exception while registering device for notifications", e);

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

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