From 5807c3e825ee3fd5e159b80a9ac94bda949b5d25 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 10 Mar 2020 10:42:51 +0100 Subject: [PATCH] Use UTF8 PostMethod everywhere Signed-off-by: tobiasKaminsky --- .../android/files/CreateFileFromTemplateOperation.java | 6 +++--- .../owncloud/android/files/StreamMediaFileOperation.java | 8 ++++---- .../java/com/owncloud/android/jobs/NotificationJob.java | 4 ++-- .../operations/RichDocumentsCreateAssetOperation.java | 6 +++--- .../android/operations/RichDocumentsUrlOperation.java | 6 +++--- .../ui/asynctasks/NotificationExecuteActionTask.java | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java b/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java index 6ddb070d96a5..e24436dc92fa 100644 --- a/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java +++ b/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java @@ -26,7 +26,7 @@ import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import org.json.JSONObject; import java.util.ArrayList; @@ -52,11 +52,11 @@ public CreateFileFromTemplateOperation(String path, int templateId) { protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result; - PostMethod postMethod = null; + Utf8PostMethod postMethod = null; try { - postMethod = new PostMethod(client.getBaseUri() + NEW_FROM_TEMPLATE_URL + JSON_FORMAT); + postMethod = new Utf8PostMethod(client.getBaseUri() + NEW_FROM_TEMPLATE_URL + JSON_FORMAT); postMethod.setParameter("path", path); postMethod.setParameter("template", String.valueOf(templateId)); diff --git a/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java b/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java index f46d5f5e86a1..39e32b400c69 100644 --- a/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java +++ b/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java @@ -26,7 +26,7 @@ import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import org.json.JSONObject; import java.util.ArrayList; @@ -36,7 +36,7 @@ public class StreamMediaFileOperation extends RemoteOperation { private static final int SYNC_READ_TIMEOUT = 40000; private static final int SYNC_CONNECTION_TIMEOUT = 5000; private static final String STREAM_MEDIA_URL = "/ocs/v2.php/apps/dav/api/v1/direct"; - + private String fileID; // JSON node names @@ -51,10 +51,10 @@ public StreamMediaFileOperation(String fileID) { protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result; - PostMethod postMethod = null; + Utf8PostMethod postMethod = null; try { - postMethod = new PostMethod(client.getBaseUri() + STREAM_MEDIA_URL + JSON_FORMAT); + postMethod = new Utf8PostMethod(client.getBaseUri() + STREAM_MEDIA_URL + JSON_FORMAT); postMethod.setParameter("fileId", fileID); // remote request diff --git a/src/main/java/com/owncloud/android/jobs/NotificationJob.java b/src/main/java/com/owncloud/android/jobs/NotificationJob.java index 332e9477f314..5cdc20a250a9 100644 --- a/src/main/java/com/owncloud/android/jobs/NotificationJob.java +++ b/src/main/java/com/owncloud/android/jobs/NotificationJob.java @@ -67,8 +67,8 @@ import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.DeleteMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import java.io.IOException; import java.security.InvalidKeyException; @@ -343,7 +343,7 @@ private int executeAction(String actionType, String actionLink, OwnCloudClient c break; case "POST": - method = new PostMethod(actionLink); + method = new Utf8PostMethod(actionLink); break; case "DELETE": diff --git a/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java b/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java index aeed694d5a0e..8b69d03399ae 100644 --- a/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java +++ b/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java @@ -26,7 +26,7 @@ import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import org.json.JSONObject; /** @@ -52,10 +52,10 @@ public RichDocumentsCreateAssetOperation(String path) { protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result; - PostMethod postMethod = null; + Utf8PostMethod postMethod = null; try { - postMethod = new PostMethod(client.getBaseUri() + ASSET_URL); + postMethod = new Utf8PostMethod(client.getBaseUri() + ASSET_URL); postMethod.setParameter(PARAMETER_PATH, path); postMethod.setParameter(PARAMETER_FORMAT, PARAMETER_FORMAT_VALUE); diff --git a/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java b/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java index 9e6967f34f53..227043538832 100644 --- a/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java +++ b/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java @@ -27,7 +27,7 @@ import com.owncloud.android.utils.NextcloudServer; import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import org.json.JSONObject; /** @@ -60,10 +60,10 @@ public RichDocumentsUrlOperation(String fileID) { @NextcloudServer(max = 18) protected RemoteOperationResult run(OwnCloudClient client) { RemoteOperationResult result; - PostMethod postMethod = null; + Utf8PostMethod postMethod = null; try { - postMethod = new PostMethod(client.getBaseUri() + DOCUMENT_URL + JSON_FORMAT); + postMethod = new Utf8PostMethod(client.getBaseUri() + DOCUMENT_URL + JSON_FORMAT); postMethod.setParameter(FILE_ID, fileID); // remote request diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java b/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java index 58d6b920ce76..8081e29152c5 100644 --- a/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java +++ b/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java @@ -14,8 +14,8 @@ import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.methods.DeleteMethod; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.Utf8PostMethod; import java.io.IOException; @@ -47,7 +47,7 @@ protected Boolean doInBackground(Action... actions) { break; case "POST": - method = new PostMethod(action.link); + method = new Utf8PostMethod(action.link); break; case "DELETE":