Merge pull request #1213 from MariusVolkhart/frescoAuthenticator

[IMPROVEMENT] Remove the FrescoAuthInterceptor

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -14,9 +14,7 @@ import chat.rocket.android.app.RocketChatDatabase
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
-import chat.rocket.android.dagger.qualifier.ForFresco
 import chat.rocket.android.dagger.qualifier.ForMessages
-import chat.rocket.android.helper.FrescoAuthInterceptor
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.SharedPrefsLocalRepository
@@ -43,7 +41,6 @@ import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
-import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import ru.noties.markwon.SpannableConfiguration
@@ -119,24 +116,8 @@ class AppModule {
     }
 
     @Provides
-    @ForFresco
     @Singleton
-    fun provideFrescoAuthInterceptor(tokenRepository: TokenRepository, currentServerInteractor: GetCurrentServerInteractor): Interceptor {
-        return FrescoAuthInterceptor(tokenRepository, currentServerInteractor)
-    }
-
-    @Provides
-    @ForFresco
-    @Singleton
-    fun provideFrescoOkHttpClient(okHttpClient: OkHttpClient, @ForFresco authInterceptor: Interceptor): OkHttpClient {
-        return okHttpClient.newBuilder().apply {
-            //addInterceptor(authInterceptor)
-        }.build()
-    }
-
-    @Provides
-    @Singleton
-    fun provideImagePipelineConfig(context: Context, @ForFresco okHttpClient: OkHttpClient): ImagePipelineConfig {
+    fun provideImagePipelineConfig(context: Context, okHttpClient: OkHttpClient): ImagePipelineConfig {
         val listeners = setOf(RequestLoggingListener())
 
         return OkHttpImagePipelineConfigFactory.newBuilder(context, okHttpClient)

app/src/main/java/chat/rocket/android/dagger/qualifier/ForFresco.kt

-package chat.rocket.android.dagger.qualifier
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.RUNTIME)
-annotation class ForFresco
\ No newline at end of file

app/src/main/java/chat/rocket/android/helper/FrescoAuthInterceptor.kt

-package chat.rocket.android.helper
-
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.TokenRepository
-import okhttp3.Interceptor
-import okhttp3.Response
-
-class FrescoAuthInterceptor(
-        private val tokenRepository: TokenRepository,
-        private val currentServerInteractor: GetCurrentServerInteractor
-) : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        var request = chain.request()
-        currentServerInteractor.get()?.let { serverUrl ->
-            val token = tokenRepository.get(serverUrl)
-
-
-            return@let token?.let {
-                val url = request.url().newBuilder().apply {
-                    addQueryParameter("rc_uid", token.userId)
-                    addQueryParameter("rc_token", token.authToken)
-                }.build()
-                request = request.newBuilder().apply {
-                    url(url)
-                }.build()
-            }
-        }
-        return chain.proceed(request)
-    }
-}
\ No newline at end of file