diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-09-09 16:36:10 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-09-09 16:36:10 -0700 |
commit | 328d80f0dfd9c6057e65b948b9bd9d52968cc4a8 (patch) | |
tree | e2eedd601b3146e6e995fc8f21c162cf954cd320 /app/src/main/java/github/daneren2005/dsub/domain | |
parent | 2a3f49f2b61042cd57dbcc6d0acd7f8754fe534b (diff) | |
download | dsub-328d80f0dfd9c6057e65b948b9bd9d52968cc4a8.tar.gz dsub-328d80f0dfd9c6057e65b948b9bd9d52968cc4a8.tar.bz2 dsub-328d80f0dfd9c6057e65b948b9bd9d52968cc4a8.zip |
Reintroduce tokens for Subsonic 6+ with a check for error code 41
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/domain')
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java b/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java index 7f538484..dd41bcac 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java @@ -24,6 +24,7 @@ import java.io.Serializable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import github.daneren2005.dsub.util.Constants; import github.daneren2005.dsub.util.FileUtil; import github.daneren2005.dsub.util.Util; @@ -231,8 +232,15 @@ public class ServerInfo implements Serializable { return canUseToken(context, Util.getActiveServer(context)); } public static boolean canUseToken(Context context, int instance) { - return false; /*isStockSubsonic(context, instance) && checkServerVersion(context, "1.13", instance) || - isMadsonic(context, instance) && checkServerVersion(context, "2.0", instance);*/ + if(isStockSubsonic(context, instance) && checkServerVersion(context, "1.14", instance)) { + if(Util.getBlockTokenUse(context, instance)) { + return false; + } else { + return true; + } + } else { + return false; + } } public static boolean hasSimilarArtists(Context context) { return !ServerInfo.isMadsonic(context) || ServerInfo.checkServerVersion(context, "2.0"); |