Merge branch 'develop' into patch-further

.circleci/config.yml

@@ -27,7 +27,6 @@ jobs:
           command: |
             ./gradlew ciTest testDebugUnitTest
             ./gradlew jacocoFullReport
-            bash <(curl -s https://codecov.io/bash)
       - run:
           name: lint
           command: ./gradlew :ultrasonic:lintRelease

README.md

@@ -42,6 +42,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 - [Subsonic](http://www.subsonic.org/pages/index.jsp)
 - [Airsonic](https://github.com/airsonic/airsonic)
 - [Supysonic](https://github.com/spl0k/supysonic)
+- [Ampache](https://ampache.org/)
 
 Other *Subsonic API* implementations should work as well as long as they follow API
 [documentation](http://www.subsonic.org/pages/api.jsp).

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",

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)

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)