flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 10:27:45 +00:00
Code Issues Releases Wiki Activity

Moved credentials charset constant out of interface, so that it's correctly initialized

Browse Source
This commit is contained in:
David A. Velasco 2016-04-28 14:00:44 +02:00
parent 3f89bf20a4
commit 0666f08ea6
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java
View File

@ -47,7 +47,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs); client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
client.getParams().setAuthenticationPreemptive(true); client.getParams().setAuthenticationPreemptive(true);
client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
client.getState().setCredentials( client.getState().setCredentials(
AuthScope.ANY, AuthScope.ANY,
new UsernamePasswordCredentials(mUsername, mPassword) new UsernamePasswordCredentials(mUsername, mPassword)

2
src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java
View File

@ -49,7 +49,7 @@ public class OwnCloudBearerCredentials implements OwnCloudCredentials {
client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs); client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
client.getParams().setAuthenticationPreemptive(true); client.getParams().setAuthenticationPreemptive(true);
client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
client.getState().setCredentials( client.getState().setCredentials(
AuthScope.ANY, AuthScope.ANY,
new BearerCredentials(mAccessToken) new BearerCredentials(mAccessToken)

1
src/com/owncloud/android/lib/common/OwnCloudCredentials.java
View File

@ -25,7 +25,6 @@
package com.owncloud.android.lib.common; package com.owncloud.android.lib.common;
public interface OwnCloudCredentials { public interface OwnCloudCredentials {
public static final String CREDENTIAL_CHARSET = "UTF-8";
public void applyTo(OwnCloudClient ownCloudClient); public void applyTo(OwnCloudClient ownCloudClient);

2
src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java
View File

@ -26,6 +26,8 @@ package com.owncloud.android.lib.common;
public class OwnCloudCredentialsFactory { public class OwnCloudCredentialsFactory {
public static final String CREDENTIAL_CHARSET = "UTF-8";
private static OwnCloudAnonymousCredentials sAnonymousCredentials; private static OwnCloudAnonymousCredentials sAnonymousCredentials;
public static OwnCloudCredentials newBasicCredentials(String username, String password) { public static OwnCloudCredentials newBasicCredentials(String username, String password) {

2
src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java
View File

@ -41,7 +41,7 @@ public class OwnCloudSamlSsoCredentials implements OwnCloudCredentials {
@Override @Override
public void applyTo(OwnCloudClient client) { public void applyTo(OwnCloudClient client) {
client.getParams().setAuthenticationPreemptive(false); client.getParams().setAuthenticationPreemptive(false);
client.getParams().setCredentialCharset(CREDENTIAL_CHARSET); client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);
client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); client.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
client.setFollowRedirects(false); client.setFollowRedirects(false);