flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Fix null error in http interceptors

Browse Source
This commit is contained in:
davigonz 2019-10-11 14:02:24 +02:00
parent c05a11a7b4
commit c50e199b76
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java
View File

@ -156,10 +156,13 @@ public class HttpClient {
* @param headerValue * @param headerValue
*/ */
public static void addHeaderForAllRequests(String headerName, String headerValue) { public static void addHeaderForAllRequests(String headerName, String headerValue) {
getOkHttpInterceptor() HttpInterceptor httpInterceptor = getOkHttpInterceptor();
.addRequestInterceptor(
new RequestHeaderInterceptor(headerName, headerValue) if(getOkHttpInterceptor() != null) {
); httpInterceptor.addRequestInterceptor(
new RequestHeaderInterceptor(headerName, headerValue)
);
}
} }
public static void deleteHeaderForAllRequests(String headerName) { public static void deleteHeaderForAllRequests(String headerName) {

16
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java
View File

@ -46,14 +46,20 @@ public class HttpInterceptor implements Interceptor {
public Response intercept(Chain chain) throws IOException { public Response intercept(Chain chain) throws IOException {
Request request = chain.request(); Request request = chain.request();
for (RequestInterceptor interceptor : mRequestInterceptors) { ListIterator<RequestInterceptor> requestInterceptorIterator = mRequestInterceptors.listIterator();
request = interceptor.intercept(request);
while (requestInterceptorIterator.hasNext()) {
RequestInterceptor currentRequestInterceptor = requestInterceptorIterator.next();
request = currentRequestInterceptor.intercept(request);
} }
Response response = chain.proceed(request); Response response = chain.proceed(request);
for (ResponseInterceptor interceptor : mResponseInterceptors) { ListIterator<ResponseInterceptor> responseInterceptorIterator = mResponseInterceptors.listIterator();
response = interceptor.intercept(response);
while (responseInterceptorIterator.hasNext()) {
ResponseInterceptor currentResponseInterceptor = responseInterceptorIterator.next();
response = currentResponseInterceptor.intercept(response);
} }
return response; return response;
@ -107,4 +113,4 @@ public class HttpInterceptor implements Interceptor {
public interface ResponseInterceptor { public interface ResponseInterceptor {
Response intercept(Response response) throws IOException; Response intercept(Response response) throws IOException;
} }
} }