From 256c607da856780dc1e56bde00f6e1e7cd10f79a Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 15 Mar 2016 21:47:41 +0100 Subject: [PATCH 1/4] allow special chars in password --- .../owncloud/android/lib/common/OwnCloudBasicCredentials.java | 1 + .../owncloud/android/lib/common/OwnCloudBearerCredentials.java | 1 + .../owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java index 02b515d8..4122d9be 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java @@ -47,6 +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.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 c3461e02..f5bebcef 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java @@ -49,6 +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.getState().setCredentials( AuthScope.ANY, new BearerCredentials(mAccessToken) diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java index e2d67ee8..44ccbb09 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java @@ -41,6 +41,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials { @Override public void applyTo(OwnCloudClient client) { client.getParams().setAuthenticationPreemptive(false); + client.getParams().setCredentialCharset("UTF-8"); client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); client.setFollowRedirects(false); From f69814f574d72dd4c95f69155c95587a941286ca Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 15 Mar 2016 21:53:56 +0100 Subject: [PATCH 2/4] allows special chars in password --- .../owncloud/android/lib/common/OwnCloudBasicCredentials.java | 2 +- .../owncloud/android/lib/common/OwnCloudBearerCredentials.java | 2 +- .../owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java index 4122d9be..3857f207 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("UTF-8"); 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 f5bebcef..d0226077 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("UTF-8"); client.getState().setCredentials( AuthScope.ANY, new BearerCredentials(mAccessToken) diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java index 44ccbb09..99783889 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("UTF-8"); client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); client.setFollowRedirects(false); From 3f89bf20a4d04ed5e4e2e6a5942dc5f887c3f9c1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 26 Apr 2016 19:44:32 +0200 Subject: [PATCH 3/4] 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); From 0666f08ea6fe528b610bcf611a176105e68f4a2b Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Thu, 28 Apr 2016 14:00:44 +0200 Subject: [PATCH 4/4] Moved credentials charset constant out of interface, so that it's correctly initialized --- .../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/OwnCloudCredentialsFactory.java | 2 ++ .../owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java index 35ef6c4b..ac22441b 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(CREDENTIAL_CHARSET); + client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.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 912aa0b9..36a81d1d 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(CREDENTIAL_CHARSET); + client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.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 61492937..96a727e6 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudCredentials.java +++ b/src/com/owncloud/android/lib/common/OwnCloudCredentials.java @@ -25,7 +25,6 @@ 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/OwnCloudCredentialsFactory.java b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java index e854fd67..ead7cc8f 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java +++ b/src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java @@ -26,6 +26,8 @@ package com.owncloud.android.lib.common; public class OwnCloudCredentialsFactory { + public static final String CREDENTIAL_CHARSET = "UTF-8"; + private static OwnCloudAnonymousCredentials sAnonymousCredentials; public static OwnCloudCredentials newBasicCredentials(String username, String password) { diff --git a/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java b/src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java index 25fa3fbd..f84b78a4 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(CREDENTIAL_CHARSET); + client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET); client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); client.setFollowRedirects(false);