From cc612f8712e8a17187800a806367b14a92092894 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 4 Sep 2018 17:24:05 +0200
Subject: [PATCH] Use header constants instead of plain text

---
 .../owncloud/android/lib/common/OwnCloudClientFactory.java | 1 -
 .../owncloud/android/lib/common/http/HttpConstants.java    | 2 ++
 .../lib/resources/files/DownloadRemoteFileOperation.java   | 2 +-
 .../lib/resources/shares/CreateRemoteShareOperation.java   | 2 +-
 .../lib/resources/shares/UpdateRemoteShareOperation.java   | 4 ++--
 .../lib/resources/users/GetRemoteUserAvatarOperation.java  | 7 ++-----
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
index 0cbb56bb..933703e6 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
@@ -52,7 +52,6 @@ public class OwnCloudClientFactory {
     /** Default timeout for establishing a connection */
     public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
 
-
     /**
      * Creates a OwnCloudClient setup for an ownCloud account
      *
diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/src/com/owncloud/android/lib/common/http/HttpConstants.java
index 3f3cbc3f..b7e07dce 100644
--- a/src/com/owncloud/android/lib/common/http/HttpConstants.java
+++ b/src/com/owncloud/android/lib/common/http/HttpConstants.java
@@ -40,12 +40,14 @@ public class HttpConstants {
     public static final String IF_MATCH_HEADER = "If-Match";
     public static final String IF_NONE_MATCH_HEADER = "If-None-Match";
     public static final String CONTENT_TYPE_HEADER = "Content-Type";
+    public static final String CONTENT_LENGTH_HEADER = "Content-Length";
     public static final String OC_TOTAL_LENGTH_HEADER = "OC-Total-Length";
     public static final String OC_X_OC_MTIME_HEADER = "X-OC-Mtime";
     public static final String PARAM_SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
     public static final String OC_X_REQUEST_ID = "X-Request-ID";
     public static final String LOCATION_HEADER = "Location";
     public static final String LOCATION_HEADER_LOWER = "location";
+    public static final String CONTENT_TYPE_URLENCODED_UTF8 = "application/x-www-form-urlencoded; charset=utf-8";
 
     /***********************************************************************************************************
      ************************************************ STATUS CODES *********************************************
diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
index 585c444d..54e637cd 100644
--- a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
+++ b/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java
@@ -114,7 +114,7 @@ public class DownloadRemoteFileOperation extends RemoteOperation {
                 fos = new FileOutputStream(targetFile);
                 long transferred = 0;
 
-                String contentLength = mGet.getResponseHeader("Content-Length");
+                String contentLength = mGet.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
                 long totalToTransfer =
                         (contentLength != null
                                 && contentLength.length() > 0)
diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
index e6d2dbad..feb3992e 100644
--- a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
@@ -230,7 +230,7 @@ public class CreateRemoteShareOperation extends RemoteOperation {
 
             postMethod.setRequestBody(formBodyBuilder.build());
 
-            postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            postMethod.setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8);
             postMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(postMethod);
diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
index 6f93259b..2ec8c3ed 100644
--- a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+++ b/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
@@ -200,14 +200,14 @@ public class UpdateRemoteShareOperation extends RemoteOperation<ShareParserResul
 
             Uri requestUri = client.getBaseUri();
             Uri.Builder uriBuilder = requestUri.buildUpon();
-            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH.substring(1));
+            uriBuilder.appendEncodedPath(ShareUtils.SHARING_API_PATH);
             uriBuilder.appendEncodedPath(Long.toString(mRemoteId));
 
             PutMethod putMethod = new PutMethod(new URL(uriBuilder.build().toString()));
 
             putMethod.setRequestBody(formBodyBuilder.build());
 
-            putMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
+            putMethod.setRequestHeader(HttpConstants.CONTENT_TYPE_HEADER, HttpConstants.CONTENT_TYPE_URLENCODED_UTF8);
             putMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE);
 
             int status = client.executeHttpMethod(putMethod);
diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
index 9cefac22..eb88d11f 100644
--- a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
+++ b/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java
@@ -46,13 +46,11 @@ import static com.owncloud.android.lib.common.operations.RemoteOperationResult.R
  * @author David A. Velasco
  * @author David González Verdugo
  */
-
 public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserAvatarOperation.ResultData> {
 
     private static final String TAG = GetRemoteUserAvatarOperation.class.getSimpleName();
 
     private static final String NON_OFFICIAL_AVATAR_PATH = "/index.php/avatar/";
-    private static final String IF_NONE_MATCH_HEADER = "If-None-Match";
 
     /** Desired size in pixels of the squared image */
     private int mDimension;
@@ -63,7 +61,6 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
      */
     private String mCurrentEtag;
 
-
     public GetRemoteUserAvatarOperation(int dimension, String currentEtag) {
         mDimension = dimension;
         mCurrentEtag = currentEtag;
@@ -90,7 +87,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
             if (isSuccess(status)) {
                 // find out size of file to read
                 int totalToTransfer = 0;
-                String contentLength = getMethod.getResponseHeader("Content-Length");
+                String contentLength = getMethod.getResponseHeader(HttpConstants.CONTENT_LENGTH_HEADER);
 
                 if (contentLength != null && contentLength.length() > 0) {
                     totalToTransfer = Integer.parseInt(contentLength);
@@ -98,7 +95,7 @@ public class GetRemoteUserAvatarOperation extends RemoteOperation<GetRemoteUserA
 
                 // find out MIME-type!
                 String mimeType;
-                String contentType = getMethod.getResponseHeader("Content-Type");
+                String contentType = getMethod.getResponseHeader(HttpConstants.CONTENT_TYPE_HEADER);
 
                 if (contentType == null || !contentType.startsWith("image")) {
                     Log_OC.e(