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

Use new api createShare call. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-11-11 20:23:46 +01:00
parent 1012e41620
commit c6c640f0cf
2 changed files with 12 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,6 @@ import org.moire.ultrasonic.service.parser.ErrorParser;
import org.moire.ultrasonic.service.parser.GenreParser;
import org.moire.ultrasonic.service.parser.MusicDirectoryParser;
import org.moire.ultrasonic.service.parser.RandomSongsParser;
import org.moire.ultrasonic.service.parser.ShareParser;
import org.moire.ultrasonic.service.parser.SubsonicRESTException;
import org.moire.ultrasonic.service.parser.UserInfoParser;
import org.moire.ultrasonic.service.ssl.SSLSocketFactory;
@ -137,7 +136,6 @@ import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicReference;
@ -1410,40 +1408,19 @@ public class RESTMusicService implements MusicService
}
}
@Override
public List<Share> createShare(List<String> ids, String description, Long expires, Context context, ProgressListener progressListener) throws Exception
{
List<String> parameterNames = new LinkedList<String>();
List<Object> parameterValues = new LinkedList<Object>();
@Override
public List<Share> createShare(List<String> ids,
String description,
Long expires,
Context context,
ProgressListener progressListener) throws Exception {
updateProgressListener(progressListener, R.string.parser_reading);
Response<SharesResponse> response = subsonicAPIClient.getApi()
.createShare(ids, description, expires).execute();
checkResponseSuccessful(response);
for (String id : ids)
{
parameterNames.add("id");
parameterValues.add(id);
}
if (description != null)
{
parameterNames.add("description");
parameterValues.add(description);
}
if (expires > 0)
{
parameterNames.add("expires");
parameterValues.add(expires);
}
Reader reader = getReader(context, progressListener, "createShare", null, parameterNames, parameterValues);
try
{
return new ShareParser(context).parse(reader, progressListener);
}
finally
{
Util.close(reader);
}
}
return APIShareConverter.toDomainEntitiesList(response.body().getShares());
}
@Override
public void deleteShare(String id, Context context, ProgressListener progressListener) throws Exception

76
ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/ShareParser.java
View File

@ -1,76 +0,0 @@
package org.moire.ultrasonic.service.parser;
import android.content.Context;
import org.moire.ultrasonic.R;
import org.moire.ultrasonic.domain.Share;
import org.moire.ultrasonic.util.ProgressListener;
import org.xmlpull.v1.XmlPullParser;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
/**
* @author Joshua Bahnsen
*/
public class ShareParser extends MusicDirectoryEntryParser
{
public ShareParser(Context context)
{
super(context);
}
public List<Share> parse(Reader reader, ProgressListener progressListener) throws Exception
{
updateProgress(progressListener, R.string.parser_reading);
init(reader);
List<Share> shares = new ArrayList<Share>();
Share share = null;
int eventType;
do
{
eventType = nextParseEvent();
if (eventType == XmlPullParser.START_TAG)
{
String name = getElementName();
if ("share".equals(name))
{
share = new Share();
share.setCreated(get("created"));
share.setDescription(get("description"));
share.setExpires(get("expires"));
share.setId(get("id"));
share.setLastVisited(get("lastVisited"));
share.setUrl(get("url"));
share.setUsername(get("username"));
share.setVisitCount(getLong("visitCount"));
shares.add(share);
}
else if ("entry".equals(name))
{
if (share != null)
{
share.addEntry(parseEntry(null, false, 0));
}
}
else if ("error".equals(name))
{
handleError();
}
}
} while (eventType != XmlPullParser.END_DOCUMENT);
validate();
updateProgress(progressListener, R.string.parser_reading_done);
return shares;
}
}