refactor retrofit module

VRGsoftUA · Oct 19, 2019 · e83c0fd · e83c0fd
1 parent 8bbdb40
commit e83c0fd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 40 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/app/app.iml b/app/app.iml
@@ -110,21 +110,31 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
       <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/Auth.kt
@@ -1,8 +1,5 @@
 package com.vrgsoft.retrofit.common
 
-import okhttp3.Interceptor
-import okhttp3.Response
-
-interface Auth {
-    fun process(chain: Interceptor.Chain?): Response
+abstract class Auth {
+    abstract fun createAuthHeaderString(): String
 }
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt
@@ -3,12 +3,17 @@ package com.vrgsoft.retrofit.common
 import okhttp3.Interceptor
 import okhttp3.Response
 
-class AuthInterceptor(
+internal class AuthInterceptor(
     private val auth: Auth? = null
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain?): Response {
-        return auth?.process(chain) ?: chain!!.request()!!.newBuilder()?.let {
+        return chain?.request()?.newBuilder()?.let {
+            it.addHeader(HEADER_AUTHORIZATION, auth?.createAuthHeaderString() ?: "")
             chain.proceed(it.build())
-        }!!
+        } ?: Response.Builder().build()
+    }
+
+    companion object {
+        private const val HEADER_AUTHORIZATION = "Authorization"
     }
 }
diff --git a/retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt b/retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt
@@ -3,7 +3,7 @@ package com.vrgsoft.retrofit.common
 import okhttp3.Interceptor
 import okhttp3.Response
 
-class HeaderInterceptor : Interceptor {
+internal class HeaderInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain?): Response {
         val builder = chain!!.request()!!.newBuilder()