diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt index f9d48d23..9e745be1 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/Extensions.kt @@ -17,8 +17,8 @@ fun Response.toStreamResponse(): StreamResponse { val contentType = responseBody?.contentType() if ( contentType != null && - contentType.type().equals("application", true) && - contentType.subtype().equals("json", true) + contentType.type.equals("application", true) && + contentType.subtype.equals("json", true) ) { val error = SubsonicAPIClient.jacksonMapper.readValue( responseBody.byteStream() @@ -40,7 +40,7 @@ fun Response.toStreamResponse(): StreamResponse { * It creates Exceptions from the results returned by the Subsonic API */ @Suppress("ThrowsCount") -fun Response.throwOnFailure(): Response { +fun Response.throwOnFailure(): Response { val response = this if (response.isSuccessful && response.body()!!.status === SubsonicResponse.Status.OK) { diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt index 324d672f..9a7ea98d 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClient.kt @@ -68,7 +68,7 @@ class SubsonicAPIClient( .addInterceptor { chain -> // Adds default request params val originalRequest = chain.request() - val newUrl = originalRequest.url().newBuilder() + val newUrl = originalRequest.url.newBuilder() .addQueryParameter("u", config.username) .addQueryParameter("c", config.clientID) .addQueryParameter("f", "json") diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt index c432bf35..92090436 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordHexInterceptor.kt @@ -18,7 +18,7 @@ class PasswordHexInterceptor(private val password: String) : Interceptor { override fun intercept(chain: Chain): Response { val originalRequest = chain.request() - val updatedUrl = originalRequest.url().newBuilder() + val updatedUrl = originalRequest.url.newBuilder() .addEncodedQueryParameter("p", passwordHex).build() return chain.proceed(originalRequest.newBuilder().url(updatedUrl).build()) } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt index 8a1c8388..d6baafef 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/PasswordMD5Interceptor.kt @@ -21,7 +21,7 @@ class PasswordMD5Interceptor(private val password: String) : Interceptor { override fun intercept(chain: Chain): Response { val originalRequest = chain.request() val salt = getSalt() - val updatedUrl = originalRequest.url().newBuilder() + val updatedUrl = originalRequest.url.newBuilder() .addQueryParameter("t", getPasswordMD5Hash(salt)) .addQueryParameter("s", salt) .build() diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt index 031d8c40..1bdb0153 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt @@ -19,7 +19,7 @@ internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02 internal class RangeHeaderInterceptor : Interceptor { override fun intercept(chain: Chain): Response { val originalRequest = chain.request() - val headers = originalRequest.headers() + val headers = originalRequest.headers return if (headers.names().contains("Range")) { val offsetValue = headers["Range"] ?: "0" val offset = "bytes=$offsetValue-" diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt index 8cffdda8..f75f81e8 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/VersionInterceptor.kt @@ -18,7 +18,7 @@ internal class VersionInterceptor( val newRequest = originalRequest.newBuilder() .url( originalRequest - .url() + .url .newBuilder() .addQueryParameter("v", protocolVersion.restApiVersion) .build() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c57409e2..064dd182 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,9 +22,9 @@ kotlin = "1.6.10" kotlinxCoroutines = "1.6.0-native-mt" viewModelKtx = "2.3.0" -retrofit = "2.6.4" -jackson = "2.9.5" -okhttp = "3.12.13" +retrofit = "2.9.0" +jackson = "2.10.1" +okhttp = "4.9.1" koin = "3.0.2" picasso = "2.71828"