Skip to content

Commit e83c0fd

Browse files
committed
refactor retrofit module
1 parent 8bbdb40 commit e83c0fd

7 files changed

Lines changed: 21 additions & 40 deletions

File tree

0 Bytes
Binary file not shown.
1.02 KB
Binary file not shown.

app/app.iml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,31 @@
110110
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
111111
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
112112
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
113114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
114115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
116+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
115117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
116118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
117119
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
118120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
119121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
122+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
123+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
120125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
121126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
122127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
123128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
124129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
130+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
131+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
125132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
126133
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
134+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
135+
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
127136
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
137+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
128138
</content>
129139
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
130140
<orderEntry type="sourceFolder" forTests="false" />
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.vrgsoft.retrofit.common
22

3-
import okhttp3.Interceptor
4-
import okhttp3.Response
5-
6-
interface Auth {
7-
fun process(chain: Interceptor.Chain?): Response
3+
abstract class Auth {
4+
abstract fun createAuthHeaderString(): String
85
}

retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthCustomInterceptor.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

retrofit/src/main/java/com/vrgsoft/retrofit/common/AuthInterceptor.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ package com.vrgsoft.retrofit.common
33
import okhttp3.Interceptor
44
import okhttp3.Response
55

6-
class AuthInterceptor(
6+
internal class AuthInterceptor(
77
private val auth: Auth? = null
88
) : Interceptor {
99
override fun intercept(chain: Interceptor.Chain?): Response {
10-
return auth?.process(chain) ?: chain!!.request()!!.newBuilder()?.let {
10+
return chain?.request()?.newBuilder()?.let {
11+
it.addHeader(HEADER_AUTHORIZATION, auth?.createAuthHeaderString() ?: "")
1112
chain.proceed(it.build())
12-
}!!
13+
} ?: Response.Builder().build()
14+
}
15+
16+
companion object {
17+
private const val HEADER_AUTHORIZATION = "Authorization"
1318
}
1419
}

retrofit/src/main/java/com/vrgsoft/retrofit/common/HeaderInterceptor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.vrgsoft.retrofit.common
33
import okhttp3.Interceptor
44
import okhttp3.Response
55

6-
class HeaderInterceptor : Interceptor {
6+
internal class HeaderInterceptor : Interceptor {
77
override fun intercept(chain: Interceptor.Chain?): Response {
88
val builder = chain!!.request()!!.newBuilder()
99

0 commit comments

Comments
 (0)