base updater classes
This commit is contained in:
+10
-5
@@ -29,8 +29,6 @@ import ru.shadowsparky.http.domain.HttpException
|
||||
import ru.shadowsparky.http.domain.UserAgentProvider
|
||||
import ru.shadowsparky.koin
|
||||
|
||||
const val USE_HTTP_CUSTOM_CERTS = "use_http_custom_certs"
|
||||
|
||||
private const val MESSAGE_LONG = "message"
|
||||
private const val MESSAGE = "msg"
|
||||
|
||||
@@ -40,7 +38,8 @@ class HttpClientSettings(
|
||||
private val userAgentProvider: UserAgentProvider?,
|
||||
private val bearerAuthProvider: BearerAuthProvider,
|
||||
private val appenderList: List<ClientKtorExtension>,
|
||||
private val log: Log
|
||||
private val log: Log,
|
||||
private val appConfig: AppConfig?
|
||||
) {
|
||||
|
||||
fun setup(
|
||||
@@ -71,7 +70,7 @@ class HttpClientSettings(
|
||||
}
|
||||
|
||||
install(Logging) {
|
||||
val isDebug = koin.getOrNull<AppConfig>()?.isDebug() ?: true
|
||||
val isDebug = koin.getOrNull<AppConfig>()?.debug ?: true
|
||||
if (isDebug) {
|
||||
this.level = LogLevel.ALL
|
||||
this.logger = object : Logger {
|
||||
@@ -94,7 +93,7 @@ class HttpClientSettings(
|
||||
defaultRequest {
|
||||
header(HttpHeaders.Accept, ContentType.Application.Json)
|
||||
header(HttpHeaders.ContentType, ContentType.Application.Json)
|
||||
userAgentProvider?.provide()?.let {
|
||||
userAgentProvider?.provide() ?: appConfig?.userAgent?.let {
|
||||
header(HttpHeaders.UserAgent, it)
|
||||
}
|
||||
}
|
||||
@@ -108,4 +107,10 @@ class HttpClientSettings(
|
||||
|
||||
appenderList.forEach { it.append(this) }
|
||||
}
|
||||
|
||||
private val AppConfig.userAgent: String get() = buildString {
|
||||
append(appId)
|
||||
if (versionName != null) append(" $versionName")
|
||||
if (versionCode != null) append("/$versionCode")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user