From 2659634bdaa8085fdaca8969afa0f4ce7d84230b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 08:26:13 +0000 Subject: [PATCH 1/2] Bump versions.retrofit from 2.4.0 to 2.6.4 --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index c930cb77..872e11db 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -24,7 +24,7 @@ ext.versions = [ kotlinxCoroutines : "1.3.9", viewModelKtx : "2.2.0", - retrofit : "2.4.0", + retrofit : "2.6.4", jackson : "2.9.5", okhttp : "3.12.13", semver : "1.0.0", From 8ebd53a8eb53768707d378ea062b1cdb516bcba1 Mon Sep 17 00:00:00 2001 From: tzugen Date: Thu, 6 May 2021 12:40:49 +0200 Subject: [PATCH 2/2] Remove no longer needed safe call. --- .../kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt | 2 +- .../org/moire/ultrasonic/service/ApiCallResponseChecker.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt index 9b6c031e..12519813 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt @@ -320,7 +320,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler { // Execute a ping to retrieve the API version. // This is accepted to fail if the authentication is incorrect yet. var pingResponse = subsonicApiClient.api.ping().execute() - if (pingResponse?.body() != null) { + if (pingResponse.body() != null) { val restApiVersion = pingResponse.body()!!.version.restApiVersion currentServerSetting!!.minimumApiVersion = restApiVersion Timber.i("Server minimum API version set to %s", restApiVersion) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ApiCallResponseChecker.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ApiCallResponseChecker.kt index 74baeec5..51bd4b0a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ApiCallResponseChecker.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ApiCallResponseChecker.kt @@ -26,7 +26,7 @@ class ApiCallResponseChecker( if (activeServerProvider.getActiveServer().minimumApiVersion == null) { try { val response = subsonicAPIClient.api.ping().execute() - if (response?.body() != null) { + if (response.body() != null) { val restApiVersion = response.body()!!.version.restApiVersion Timber.i("Server minimum API version set to %s", restApiVersion) activeServerProvider.setMinimumApiVersion(restApiVersion)