1 files changed, 31 insertions, 31 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 5852210e..5ac4635b 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java
@@ -24,7 +24,6 @@ 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;
 
@@ -37,7 +36,7 @@ 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 static final Map<Integer, ServerInfo> SERVERS = new ConcurrentHashMap<>();
 	
 	private boolean isLicenseValid;
 	private Version restVersion;
@@ -70,12 +69,12 @@ public class ServerInfo implements Serializable {
 		this.type = type;
 	}
 	
-	public boolean isStockSubsonic() {
-		return type == TYPE_SUBSONIC;
-	}
-	public boolean isMadsonic() {
-		return type == TYPE_MADSONIC;
-	}
+//	public boolean isStockSubsonic() {
+//		return type == TYPE_SUBSONIC;
+//	}
+//	public boolean isMadsonic() {
+//		return type == TYPE_MADSONIC;
+//	}
 	
 	@Override
 	public boolean equals(Object o) {
@@ -97,10 +96,11 @@ public class ServerInfo implements Serializable {
 		}
 	}
 
-	// Stub to make sure this is never used, too easy to screw up
-	private void saveServerInfo(Context context) {
+//	// Stub to make sure this is never used, too easy to screw up
+//	private void saveServerInfo(Context context) {
+//
+//	}
 
-	}
 	public void saveServerInfo(Context context, int instance) {
 		ServerInfo current = SERVERS.get(instance);
 		if(!this.equals(current)) {
@@ -109,9 +109,10 @@ public class ServerInfo implements Serializable {
 		}
 	}
 	
-	public static ServerInfo getServerInfo(Context context) {
-		return getServerInfo(context, Util.getActiveServer(context));
-	}
+//	public static ServerInfo getServerInfo(Context context) {
+//		return getServerInfo(context, Util.getActiveServer(context));
+//	}
+
 	public static ServerInfo getServerInfo(Context context, int instance) {
 		ServerInfo current = SERVERS.get(instance);
 		if(current != null) {
@@ -156,9 +157,10 @@ public class ServerInfo implements Serializable {
 		return version.compareTo(required) >= 0;
 	}
 
-	public static int getServerType(Context context) {
-		return getServerType(context, Util.getActiveServer(context));
-	}
+//	public static int getServerType(Context context) {
+//		return getServerType(context, Util.getActiveServer(context));
+//	}
+
 	public static int getServerType(Context context, int instance) {
 		if(Util.isOffline(context)) {
 			return 0;
@@ -192,12 +194,13 @@ public class ServerInfo implements Serializable {
 		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;
-	}
+//	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";
@@ -231,16 +234,13 @@ public class ServerInfo implements Serializable {
 		return ServerInfo.isMadsonic(context) || ServerInfo.checkServerVersion(context, "1.13");
 	}
 
-	public static boolean canUseToken(Context context) {
-		return canUseToken(context, Util.getActiveServer(context));
-	}
+//	public static boolean canUseToken(Context context) {
+//		return canUseToken(context, Util.getActiveServer(context));
+//	}
+
 	public static boolean canUseToken(Context context, int instance) {
 		if(isStockSubsonic(context, instance) && checkServerVersion(context, "1.14", instance)) {
-			if(Util.getBlockTokenUse(context, instance)) {
-				return false;
-			} else {
-				return true;
-			}
+			return !Util.getBlockTokenUse(context, instance);
 		} else {
 			return false;
 		}