diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiDeleteShareTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiDeleteShareTest.kt new file mode 100644 index 00000000..82852c48 --- /dev/null +++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiDeleteShareTest.kt @@ -0,0 +1,33 @@ +package org.moire.ultrasonic.api.subsonic + +import org.junit.Test + +/** + * Integration test for [SubsonicAPIDefinition.deleteShare] call. + */ +class SubsonicApiDeleteShareTest : SubsonicAPIClientTest() { + @Test + fun `Should handle error response`() { + checkErrorCallParsed(mockWebServerRule) { + client.api.deleteShare(123).execute() + } + } + + @Test + fun `Should handle ok response`() { + mockWebServerRule.enqueueResponse("ping_ok.json") + + val response = client.api.deleteShare(12).execute() + + assertResponseSuccessful(response) + } + + @Test + fun `Should pass id in request params`() { + val id = 224L + + mockWebServerRule.assertRequestParam(expectedParam = "id=$id") { + client.api.deleteShare(id).execute() + } + } +} diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt index a91a1a43..26bb0b7d 100644 --- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt +++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt @@ -204,6 +204,9 @@ interface SubsonicAPIDefinition { @Query("description") description: String? = null, @Query("expires") expires: Long? = null): Call + @GET("deleteShare.view") + fun deleteShare(@Query("id") id: Long): Call + @GET("getGenres.view") fun getGenres(): Call diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index 3faf06ed..2070d0cd 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java @@ -1343,31 +1343,20 @@ public class RESTMusicService implements MusicService return APIShareConverter.toDomainEntitiesList(response.body().getShares()); } - @Override - public void deleteShare(String id, Context context, ProgressListener progressListener) throws Exception - { - checkServerVersion(context, "1.6", "Shares not supported."); + @Override + public void deleteShare(String id, + Context context, + ProgressListener progressListener) throws Exception { + if (id == null) { + throw new IllegalArgumentException("Id is null!"); + } + Long shareId = Long.valueOf(id); - HttpParams params = new BasicHttpParams(); - HttpConnectionParams.setSoTimeout(params, SOCKET_READ_TIMEOUT_GET_RANDOM_SONGS); - - List parameterNames = new ArrayList(); - List parameterValues = new ArrayList(); - - parameterNames.add("id"); - parameterValues.add(id); - - Reader reader = getReader(context, progressListener, "deleteShare", params, parameterNames, parameterValues); - - try - { - new ErrorParser(context).parse(reader); - } - finally - { - Util.close(reader); - } - } + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .deleteShare(shareId).execute(); + checkResponseSuccessful(response); + } @Override public void updateShare(String id, String description, Long expires, Context context, ProgressListener progressListener) throws Exception