From 3f89bf20a4d04ed5e4e2e6a5942dc5f887c3f9c1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 26 Apr 2016 19:44:32 +0200 Subject: [PATCH] make "UTF-8" String a constant --- .../owncloud/android/lib/common/OwnCloudBasicCredentials.java | 2 +- .../owncloud/android/lib/common/OwnCloudBearerCredentials.java | 2 +- src/com/owncloud/android/lib/common/OwnCloudCredentials.java | 1 + .../owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java index 3857f207..35ef6c4b 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java @@ -47,7 +47,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials { client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs); client.getParams().setAuthenticationPreemptive(true); - client.getParams().setCredentialCharset("UTF-8"); + client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getState().setCredentials( AuthScope.ANY, new UsernamePasswordCredentials(mUsername, mPassword) diff --git a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java index d0226077..912aa0b9 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java @@ -49,7 +49,7 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials { client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs); client.getParams().setAuthenticationPreemptive(true); - client.getParams().setCredentialCharset("UTF-8"); + client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getState().setCredentials( AuthScope.ANY, new BearerCredentials(mAccessToken) diff --git a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java index 96a727e6..61492937 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java @@ -25,6 +25,7 @@ package com.owncloud.android.lib.common; public interface OwnCloudCredentials { + public static final String CREDENTIAL_CHARSET = "UTF-8"; public void applyTo(OwnCloudClient ownCloudClient); diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java index 99783889..25fa3fbd 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java @@ -41,7 +41,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials { @Override public void applyTo(OwnCloudClient client) { client.getParams().setAuthenticationPreemptive(false); - client.getParams().setCredentialCharset("UTF-8"); + client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); client.setFollowRedirects(false);