Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into patch-further

This commit is contained in:
Nite 2021-05-07 09:14:27 +02:00 committed by GitHub
parent a6c914cf7f 44c4b2eaf3
commit afccbf3f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

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

1
README.md
View File

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

2
dependencies.gradle
View File

@ -24,7 +24,7 @@ ext.versions = [
kotlinxCoroutines : "1.3.9", kotlinxCoroutines : "1.3.9",
viewModelKtx : "2.2.0", viewModelKtx : "2.2.0",
retrofit : "2.4.0", retrofit : "2.6.4",
jackson : "2.9.5", jackson : "2.9.5",
okhttp : "3.12.13", okhttp : "3.12.13",
semver : "1.0.0", semver : "1.0.0",

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt
View File

@ -320,7 +320,7 @@ class EditServerFragment : Fragment(), OnBackPressedHandler {
// Execute a ping to retrieve the API version. // Execute a ping to retrieve the API version.
// This is accepted to fail if the authentication is incorrect yet. // This is accepted to fail if the authentication is incorrect yet.
var pingResponse = subsonicApiClient.api.ping().execute() var pingResponse = subsonicApiClient.api.ping().execute()
if (pingResponse?.body() != null) { if (pingResponse.body() != null) {
val restApiVersion = pingResponse.body()!!.version.restApiVersion val restApiVersion = pingResponse.body()!!.version.restApiVersion
currentServerSetting!!.minimumApiVersion = restApiVersion currentServerSetting!!.minimumApiVersion = restApiVersion
Timber.i("Server minimum API version set to %s", restApiVersion) Timber.i("Server minimum API version set to %s", restApiVersion)

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ApiCallResponseChecker.kt
View File

@ -26,7 +26,7 @@ class ApiCallResponseChecker(
if (activeServerProvider.getActiveServer().minimumApiVersion == null) { if (activeServerProvider.getActiveServer().minimumApiVersion == null) {
try { try {
val response = subsonicAPIClient.api.ping().execute() val response = subsonicAPIClient.api.ping().execute()
if (response?.body() != null) { if (response.body() != null) {
val restApiVersion = response.body()!!.version.restApiVersion val restApiVersion = response.body()!!.version.restApiVersion
Timber.i("Server minimum API version set to %s", restApiVersion) Timber.i("Server minimum API version set to %s", restApiVersion)
activeServerProvider.setMinimumApiVersion(restApiVersion) activeServerProvider.setMinimumApiVersion(restApiVersion)