From 6432859732d1b2103d68b02e7ff559857454c393 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 11 May 2020 18:22:38 +0200
Subject: [PATCH] Avoid code duplication
---
.../network/httpclient/OkHttpClientUtil.kt | 39 +++++++++++++++++++
.../android/internal/session/SessionModule.kt | 18 +--------
.../session/identity/IdentityModule.kt | 19 +--------
3 files changed, 43 insertions(+), 33 deletions(-)
create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt
new file mode 100644
index 0000000000..8ffa0553e9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/httpclient/OkHttpClientUtil.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.network.httpclient
+
+import im.vector.matrix.android.internal.network.AccessTokenInterceptor
+import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
+import im.vector.matrix.android.internal.network.token.AccessTokenProvider
+import okhttp3.OkHttpClient
+
+internal fun OkHttpClient.addAccessTokenInterceptor(accessTokenProvider: AccessTokenProvider): OkHttpClient {
+ return newBuilder()
+ .apply {
+ // Remove the previous CurlLoggingInterceptor, to add it after the accessTokenInterceptor
+ val existingCurlInterceptors = interceptors().filterIsInstance<CurlLoggingInterceptor>()
+ interceptors().removeAll(existingCurlInterceptors)
+
+ addInterceptor(AccessTokenInterceptor(accessTokenProvider))
+
+ // Re add eventually the curl logging interceptors
+ existingCurlInterceptors.forEach {
+ addInterceptor(it)
+ }
+ }
+ .build()
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
index a19cf5decb..9d5772b82a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
@@ -50,14 +50,13 @@ import im.vector.matrix.android.internal.di.Unauthenticated
import im.vector.matrix.android.internal.di.UserId
import im.vector.matrix.android.internal.di.UserMd5
import im.vector.matrix.android.internal.eventbus.EventBusTimberLogger
-import im.vector.matrix.android.internal.network.AccessTokenInterceptor
import im.vector.matrix.android.internal.network.DefaultNetworkConnectivityChecker
import im.vector.matrix.android.internal.network.FallbackNetworkCallbackStrategy
import im.vector.matrix.android.internal.network.NetworkCallbackStrategy
import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
import im.vector.matrix.android.internal.network.PreferredNetworkCallbackStrategy
import im.vector.matrix.android.internal.network.RetrofitFactory
-import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
+import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
import im.vector.matrix.android.internal.network.token.AccessTokenProvider
import im.vector.matrix.android.internal.network.token.HomeserverAccessTokenProvider
import im.vector.matrix.android.internal.session.group.GroupSummaryUpdater
@@ -178,20 +177,7 @@ internal abstract class SessionModule {
@Authenticated
fun providesOkHttpClient(@Unauthenticated okHttpClient: OkHttpClient,
@Authenticated accessTokenProvider: AccessTokenProvider): OkHttpClient {
- return okHttpClient.newBuilder()
- .apply {
- // Remove the previous CurlLoggingInterceptor, to add it after the accessTokenInterceptor
- val existingCurlInterceptors = interceptors().filterIsInstance<CurlLoggingInterceptor>()
- interceptors().removeAll(existingCurlInterceptors)
-
- addInterceptor(AccessTokenInterceptor(accessTokenProvider))
-
- // Re add eventually the curl logging interceptors
- existingCurlInterceptors.forEach {
- addInterceptor(it)
- }
- }
- .build()
+ return okHttpClient.addAccessTokenInterceptor(accessTokenProvider)
}
@JvmStatic
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt
index 7654fa87cc..e077e385e5 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/identity/IdentityModule.kt
@@ -25,8 +25,7 @@ import im.vector.matrix.android.internal.di.IdentityDatabase
import im.vector.matrix.android.internal.di.SessionFilesDirectory
import im.vector.matrix.android.internal.di.Unauthenticated
import im.vector.matrix.android.internal.di.UserMd5
-import im.vector.matrix.android.internal.network.AccessTokenInterceptor
-import im.vector.matrix.android.internal.network.interceptors.CurlLoggingInterceptor
+import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
import im.vector.matrix.android.internal.network.token.AccessTokenProvider
import im.vector.matrix.android.internal.session.SessionModule
import im.vector.matrix.android.internal.session.SessionScope
@@ -48,21 +47,7 @@ internal abstract class IdentityModule {
@AuthenticatedIdentity
fun providesOkHttpClient(@Unauthenticated okHttpClient: OkHttpClient,
@AuthenticatedIdentity accessTokenProvider: AccessTokenProvider): OkHttpClient {
- // TODO Create an helper because there is code duplication
- return okHttpClient.newBuilder()
- .apply {
- // Remove the previous CurlLoggingInterceptor, to add it after the accessTokenInterceptor
- val existingCurlInterceptors = interceptors().filterIsInstance<CurlLoggingInterceptor>()
- interceptors().removeAll(existingCurlInterceptors)
-
- addInterceptor(AccessTokenInterceptor(accessTokenProvider))
-
- // Re add eventually the curl logging interceptors
- existingCurlInterceptors.forEach {
- addInterceptor(it)
- }
- }
- .build()
+ return okHttpClient.addAccessTokenInterceptor(accessTokenProvider)
}
@JvmStatic