diff options
author | Scott Jackson <daneren2005@gmail.com> | 2016-09-14 12:38:25 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2016-09-14 12:38:25 -0700 |
commit | 09c787dfd2e406920b7d4daf75b7759d2c3b7c43 (patch) | |
tree | daf02ccd077fdf220f0bcc34260bd7220d6e9455 /app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java | |
parent | 9e3cef176e0431d97e13425fd503258807630425 (diff) | |
parent | 5f0853a56d5214ab1c9d4238c500c8433d64e28e (diff) | |
download | dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.tar.gz dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.tar.bz2 dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.zip |
Merge branch 'edge' into internet-radio
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java')
-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 d85db045..e41a9503 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; @@ -234,8 +235,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"); |