flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-30 18:07:38 +00:00
Code Issues Releases Wiki Activity

Clear basic credentials before applying new ones

Browse Source
This commit is contained in:
davigonz 2018-06-05 10:40:23 +02:00
parent 81aa417cbf
commit 4f0cd82a7d
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ package com.owncloud.android.lib.common.authentication;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor; import com.owncloud.android.lib.common.interceptors.BasicAuthInterceptor;
import com.owncloud.android.lib.common.interceptors.HttpInterceptor; import com.owncloud.android.lib.common.interceptors.HttpInterceptor.RequestInterceptor;
import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthPolicy; import org.apache.commons.httpclient.auth.AuthPolicy;
@ -65,10 +65,12 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
List<String> authPrefs = new ArrayList<>(1); List<String> authPrefs = new ArrayList<>(1);
authPrefs.add(AuthPolicy.BASIC); authPrefs.add(AuthPolicy.BASIC);
for (HttpInterceptor.RequestInterceptor requestInterceptor : ArrayList<RequestInterceptor> requestInterceptors = client.getBaseOkHttpInterceptor().getRequestInterceptors();
client.getBaseOkHttpInterceptor().getRequestInterceptors()) {
// Clear previous basic credentials
for (RequestInterceptor requestInterceptor : requestInterceptors) {
if (requestInterceptor instanceof BasicAuthInterceptor) { if (requestInterceptor instanceof BasicAuthInterceptor) {
return; requestInterceptors.remove(requestInterceptor);
} }
} }
@ -77,7 +79,7 @@ public class OwnCloudBasicCredentials implements OwnCloudCredentials {
new BasicAuthInterceptor(Credentials.basic(mUsername, mPassword)) new BasicAuthInterceptor(Credentials.basic(mUsername, mPassword))
); );
//TODO //TODO Update from here down
client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs); client.getParams().setParameter(AuthPolicy.AUTH_SCHEME_PRIORITY, authPrefs);
client.getParams().setAuthenticationPreemptive(mAuthenticationPreemptive); client.getParams().setAuthenticationPreemptive(mAuthenticationPreemptive);
client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET); client.getParams().setCredentialCharset(OwnCloudCredentialsFactory.CREDENTIAL_CHARSET);

9
src/com/owncloud/android/lib/common/interceptors/HttpInterceptor.java
View File

@ -82,13 +82,4 @@ public class HttpInterceptor implements Interceptor {
public ArrayList<ResponseInterceptor> getResponseInterceptors() { public ArrayList<ResponseInterceptor> getResponseInterceptors() {
return mResponseInterceptors; return mResponseInterceptors;
} }
public boolean requestWithCredentials () {
for (RequestInterceptor requestInterceptor : mRequestInterceptors) {
if (requestInterceptor instanceof BasicAuthInterceptor) {
return true;
}
}
return false;
}
} }