Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0666f08e authored by David A. Velasco's avatar David A. Velasco
Browse files

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

parent 3f89bf20

src/com/owncloud/android/lib/common/OwnCloudBasicCredentials.java

+1 −1
Original line number Diff line number Diff line
@@ -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)

src/com/owncloud/android/lib/common/OwnCloudBearerCredentials.java

+1 −1
Original line number Diff line number Diff line
@@ -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)

src/com/owncloud/android/lib/common/OwnCloudCredentials.java

+0 −1
Original line number Diff line number Diff line
@@ -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);

src/com/owncloud/android/lib/common/OwnCloudCredentialsFactory.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {

src/com/owncloud/android/lib/common/OwnCloudSamlSsoCredentials.java

+1 −1
Original line number Diff line number Diff line
@@ -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);