From e78b96348b4f32bc1d0d77a978741592e363de2b Mon Sep 17 00:00:00 2001 From: theScrabi Date: Fri, 15 Jun 2018 09:43:16 +0200 Subject: [PATCH] fix crash when calling getOkHttpInterceptor --- .../android/lib/common/http/HttpClient.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java index cfe9ba82..3bb47d1d 100644 --- a/src/com/owncloud/android/lib/common/http/HttpClient.java +++ b/src/com/owncloud/android/lib/common/http/HttpClient.java @@ -44,14 +44,7 @@ public class HttpClient { public static OkHttpClient getOkHttpClient() { if (mOkHttpClient == null) { - - mOkHttpInterceptor = new HttpInterceptor() - .addRequestInterceptor(new UserAgentInterceptor( - // TODO Try to get rid of this dependency - OwnCloudClientManagerFactory.getUserAgent() - ) - ); - + mOkHttpClient = new OkHttpClient.Builder() .addInterceptor(mOkHttpInterceptor) .protocols(Arrays.asList(Protocol.HTTP_1_1)) @@ -63,6 +56,14 @@ public class HttpClient { } public static HttpInterceptor getOkHttpInterceptor() { + if(mOkHttpInterceptor == null) { + mOkHttpInterceptor = new HttpInterceptor() + .addRequestInterceptor(new UserAgentInterceptor( + // TODO Try to get rid of this dependency + OwnCloudClientManagerFactory.getUserAgent() + ) + ); + } return mOkHttpInterceptor; } } \ No newline at end of file