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

Merge pull request #69 from ultrasonic/add-chat-message 

Add chat message
This commit is contained in:
Yahor Berdnikau 2017-11-16 22:25:26 +01:00 committed by GitHub
parent 87a28990d7 4d2d7b9318
commit b4e18f9bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiAddChatMessageTest.kt Normal file
View File

@ -0,0 +1,33 @@
package org.moire.ultrasonic.api.subsonic
import org.junit.Test
/**
* Integration test for [SubsonicAPIDefinition.addChatMessage] call.
*/
class SubsonicApiAddChatMessageTest : SubsonicAPIClientTest() {
@Test
fun `Should handle error response`() {
checkErrorCallParsed(mockWebServerRule) {
client.api.addChatMessage("some").execute()
}
}
@Test
fun `Should handle ok response`() {
mockWebServerRule.enqueueResponse("ping_ok.json")
val response = client.api.addChatMessage("some").execute()
assertResponseSuccessful(response)
}
@Test
fun `Should pass message in request param`() {
val message = "Youuhuuu"
mockWebServerRule.assertRequestParam(expectedParam = "message=$message") {
client.api.addChatMessage(message = message).execute()
}
}
}

3
subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt
View File

@ -217,4 +217,7 @@ interface SubsonicAPIDefinition {
@GET("getChatMessages.view")
fun getChatMessages(@Query("since") since: Long? = null): Call<ChatMessagesResponse>
@GET("addChatMessage.view")
fun addChatMessage(@Query("message") message: String): Call<SubsonicResponse>
}

36
ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
View File

@ -1258,31 +1258,19 @@ public class RESTMusicService implements MusicService
return APIChatMessageConverter.toDomainEntitiesList(response.body().getChatMessages());
}
@Override
public void addChatMessage(String message, Context context, ProgressListener progressListener) throws Exception
{
checkServerVersion(context, "1.2", "Chat not supported.");
@Override
public void addChatMessage(String message,
Context context,
ProgressListener progressListener) throws Exception {
if (message == null) {
throw new IllegalArgumentException("Message is null");
}
HttpParams params = new BasicHttpParams();
HttpConnectionParams.setSoTimeout(params, SOCKET_READ_TIMEOUT_GET_RANDOM_SONGS);
List<String> parameterNames = new ArrayList<String>();
List<Object> parameterValues = new ArrayList<Object>();
parameterNames.add("message");
parameterValues.add(message);
Reader reader = getReader(context, progressListener, "addChatMessage", params, parameterNames, parameterValues);
try
{
new ErrorParser(context).parse(reader);
}
finally
{
Util.close(reader);
}
}
updateProgressListener(progressListener, R.string.parser_reading);
Response<SubsonicResponse> response = subsonicAPIClient.getApi()
.addChatMessage(message).execute();
checkResponseSuccessful(response);
}
@Override
public List<Bookmark> getBookmarks(Context context, ProgressListener progressListener) throws Exception