1 files changed, 27 insertions, 3 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 73037c4a..5852210e 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;
 
@@ -35,6 +36,7 @@ import github.daneren2005.dsub.util.Util;
 public class ServerInfo implements Serializable {
 	public static final int TYPE_SUBSONIC = 1;
 	public static final int TYPE_MADSONIC = 2;
+	public static final int TYPE_AMPACHE = 3;
 	private static final Map<Integer, ServerInfo> SERVERS = new ConcurrentHashMap<Integer, ServerInfo>();
 	
 	private boolean isLicenseValid;
@@ -189,13 +191,20 @@ public class ServerInfo implements Serializable {
 	public static boolean isMadsonic6(Context context, int instance) {
 		return getServerType(context, instance) == TYPE_MADSONIC && checkServerVersion(context, "2.0", instance);
 	}
+
+	public static boolean isAmpache(Context context) {
+		return isAmpache(context, Util.getActiveServer(context));
+	}
+	public static boolean isAmpache(Context context, int instance) {
+		return getServerType(context, instance) == TYPE_AMPACHE;
+	}
 	
 	private static String getCacheName(Context context, int instance) {
 		return "server-" + Util.getRestUrl(context, null, instance, false).hashCode() + ".ser";
 	}
 
 	public static boolean hasArtistInfo(Context context) {
-		if(isStockSubsonic(context) && ServerInfo.checkServerVersion(context, "1.11")) {
+		if(!isMadsonic(context) && ServerInfo.checkServerVersion(context, "1.11")) {
 			return true;
 		} else if(isMadsonic(context)) {
 			return checkServerVersion(context, "2.0");
@@ -207,6 +216,9 @@ public class ServerInfo implements Serializable {
 	public static boolean canBookmark(Context context) {
 		return checkServerVersion(context, "1.9");
 	}
+	public static boolean canInternetRadio(Context context) {
+		return checkServerVersion(context, "1.9");
+	}
 
 	public static boolean canSavePlayQueue(Context context) {
 		return ServerInfo.checkServerVersion(context, "1.12") && (!ServerInfo.isMadsonic(context) || checkServerVersion(context, "2.0"));
@@ -223,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");
@@ -232,4 +251,9 @@ public class ServerInfo implements Serializable {
 	public static boolean hasNewestPodcastEpisodes(Context context) {
 		return ServerInfo.checkServerVersion(context, "1.13");
 	}
+
+	public static boolean canRescanServer(Context context) {
+		return ServerInfo.isMadsonic(context) ||
+			(ServerInfo.isStockSubsonic(context) && ServerInfo.checkServerVersion(context, "1.15"));
+	}
 }