From fe235e079187c8176366fb3e13dc9ae84ca216f7 Mon Sep 17 00:00:00 2001 From: Valere Date: Thu, 4 Jun 2020 09:40:04 +0200 Subject: [PATCH] ktlint --- .../internal/di/InterceptorQualifiers.kt | 23 ------------------- .../android/internal/di/MatrixComponent.kt | 1 + .../android/internal/di/NoOpTestModule.kt | 1 + .../android/internal/session/SessionModule.kt | 6 ++++- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/InterceptorQualifiers.kt diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/InterceptorQualifiers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/InterceptorQualifiers.kt deleted file mode 100644 index 3a1b7d569b..0000000000 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/InterceptorQualifiers.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.di - -import javax.inject.Qualifier - -@Qualifier -@Retention(AnnotationRetention.RUNTIME) -annotation class MockHttpInterceptor diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt index 26d1329fbc..af8a16b451 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt @@ -27,6 +27,7 @@ import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.internal.SessionManager import im.vector.matrix.android.internal.auth.AuthModule import im.vector.matrix.android.internal.auth.SessionParamsStore +import im.vector.matrix.android.internal.session.MockHttpInterceptor import im.vector.matrix.android.internal.session.TestInterceptor import im.vector.matrix.android.internal.task.TaskExecutor import im.vector.matrix.android.internal.util.BackgroundDetectionObserver diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt index e2e29b1fa5..3041070056 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/NoOpTestModule.kt @@ -18,6 +18,7 @@ package im.vector.matrix.android.internal.di import dagger.Module import dagger.Provides +import im.vector.matrix.android.internal.session.MockHttpInterceptor import im.vector.matrix.android.internal.session.TestInterceptor @Module 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 c54e6e06e7..2e9f6174f2 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 @@ -43,7 +43,6 @@ import im.vector.matrix.android.internal.crypto.verification.VerificationMessage import im.vector.matrix.android.internal.database.SessionRealmConfigurationFactory import im.vector.matrix.android.internal.di.Authenticated import im.vector.matrix.android.internal.di.DeviceId -import im.vector.matrix.android.internal.di.MockHttpInterceptor import im.vector.matrix.android.internal.di.SessionCacheDirectory import im.vector.matrix.android.internal.di.SessionDatabase import im.vector.matrix.android.internal.di.SessionFilesDirectory @@ -82,6 +81,11 @@ import org.greenrobot.eventbus.EventBus import retrofit2.Retrofit import java.io.File import javax.inject.Provider +import javax.inject.Qualifier + +@Qualifier +@Retention(AnnotationRetention.RUNTIME) +annotation class MockHttpInterceptor @Module internal abstract class SessionModule {