aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java8
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Util.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java b/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
index 97e58d48..97899529 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
@@ -560,7 +560,7 @@ public class RESTMusicService implements MusicService {
String method;
if(Util.isTagBrowsing(context, instance)) {
- if(ServerInfo.isMadsonic(context, instance) && ServerInfo.checkServerVersion(context, "2.0", instance)) {
+ if(ServerInfo.isMadsonic6(context, instance)) {
method = "getAlbumListID3";
} else {
method = "getAlbumList2";
@@ -626,7 +626,7 @@ public class RESTMusicService implements MusicService {
String method;
if(Util.isTagBrowsing(context, instance)) {
- if(ServerInfo.isMadsonic(context, instance) && ServerInfo.checkServerVersion(context, "2.0", instance)) {
+ if(ServerInfo.isMadsonic6(context, instance)) {
method = "getAlbumListID3";
} else {
method = "getAlbumList2";
@@ -693,7 +693,7 @@ public class RESTMusicService implements MusicService {
String method;
if(Util.isTagBrowsing(context, instance)) {
- if(ServerInfo.isMadsonic(context, instance) && ServerInfo.checkServerVersion(context, "2.0", instance)) {
+ if(ServerInfo.isMadsonic6(context, instance)) {
method = "getStarredID3";
} else {
method = "getStarred2";
@@ -1567,7 +1567,7 @@ public class RESTMusicService implements MusicService {
int instance = getInstance(context);
String method;
if(Util.isTagBrowsing(context, instance)) {
- if(ServerInfo.isMadsonic(context, instance) && ServerInfo.checkServerVersion(context, "2.0", instance)) {
+ if(ServerInfo.isMadsonic6(context, instance)) {
method = "getArtistInfoID3";
} else {
method = "getArtistInfo2";
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java
index e4e36b52..61510077 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -440,7 +440,7 @@ public final class Util {
builder.append("&p=").append(password);
}
- if(method != null && ServerInfo.isMadsonic(context, instance) && ServerInfo.checkServerVersion(context, "2.0", instance)) {
+ if(method != null && ServerInfo.isMadsonic6(context, instance)) {
builder.append("&v=").append(Constants.REST_PROTOCOL_VERSION_MADSONIC);
} else {
builder.append("&v=").append(Constants.REST_PROTOCOL_VERSION_SUBSONIC);