aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/util/Util.java
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-09-16 18:35:36 -0700
committerScott Jackson <daneren2005@gmail.com>2015-09-16 18:35:36 -0700
commita31942d823da4ff91b69baa68095a90ed78a0d02 (patch)
tree641f0622899fd70ae620c2383ce05f8fd60a584e /app/src/main/java/github/daneren2005/dsub/util/Util.java
parent209781e63386332bb1c7f1ed84c6ea2be3879542 (diff)
downloaddsub-a31942d823da4ff91b69baa68095a90ed78a0d02.tar.gz
dsub-a31942d823da4ff91b69baa68095a90ed78a0d02.tar.bz2
dsub-a31942d823da4ff91b69baa68095a90ed78a0d02.zip
Madsonic 6 now uses rest2/ instead of rest/
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util/Util.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Util.java7
1 files changed, 6 insertions, 1 deletions
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 c2ecdcee..e4e36b52 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java
@@ -414,7 +414,12 @@ public final class Util {
if (builder.charAt(builder.length() - 1) != '/') {
builder.append("/");
}
- builder.append("rest/").append(method).append(".view");
+ if(method != null && ServerInfo.isMadsonic6(context, instance)) {
+ builder.append("rest2/");
+ } else {
+ builder.append("rest/");
+ }
+ builder.append(method).append(".view");
builder.append("?u=").append(username);
if(method != null && ServerInfo.canUseToken(context, instance)) {
int hash = (username + password).hashCode();