diff --git a/forge-core/src/main/java/forge/util/BuildInfo.java b/forge-core/src/main/java/forge/util/BuildInfo.java index 391bdd2d776..5393a62cdd9 100644 --- a/forge-core/src/main/java/forge/util/BuildInfo.java +++ b/forge-core/src/main/java/forge/util/BuildInfo.java @@ -45,4 +45,8 @@ public class BuildInfo { return StringUtils.containsIgnoreCase(forgeVersion, "git") || StringUtils.containsIgnoreCase(forgeVersion, "snapshot"); } + + public static String getUserAgent() { + return "Forge/" + getVersionString(); + } } diff --git a/forge-gui-desktop/src/main/java/forge/util/SwingImageFetcher.java b/forge-gui-desktop/src/main/java/forge/util/SwingImageFetcher.java index c41295e2f9e..3299f887b9c 100644 --- a/forge-gui-desktop/src/main/java/forge/util/SwingImageFetcher.java +++ b/forge-gui-desktop/src/main/java/forge/util/SwingImageFetcher.java @@ -74,7 +74,7 @@ public class SwingImageFetcher extends ImageFetcher { HttpURLConnection conn = (HttpURLConnection) url.openConnection(); //connection.setConnectTimeout(1000 * 5); //wait 5 seconds the most //connection.setReadTimeout(1000 * 5); - conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); + conn.setRequestProperty("User-Agent", BuildInfo.getUserAgent()); if(conn.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) imageurl = TextUtil.fastReplace(imageurl, ".full.jpg", ".fullborder.jpg"); conn.disconnect(); diff --git a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java index 6cfbebe47f6..b67cb1d1806 100644 --- a/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java +++ b/forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java @@ -37,7 +37,7 @@ public class LibGDXImageFetcher extends ImageFetcher { URL url = new URL(urlToDownload); System.out.println("Attempting to fetch: " + url); java.net.URLConnection c = url.openConnection(); - c.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); + c.setRequestProperty("User-Agent", BuildInfo.getUserAgent()); InputStream is = c.getInputStream(); // First, save to a temporary file so that nothing tries to read @@ -64,7 +64,7 @@ public class LibGDXImageFetcher extends ImageFetcher { HttpURLConnection conn = (HttpURLConnection) url.openConnection(); //connection.setConnectTimeout(1000 * 5); //wait 5 seconds the most //connection.setReadTimeout(1000 * 5); - conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); + conn.setRequestProperty("User-Agent", BuildInfo.getUserAgent()); if(conn.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) imageurl = TextUtil.fastReplace(imageurl, ".full.jpg", ".fullborder.jpg"); conn.disconnect(); diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java index 81f2ea12e89..78e4a34e2ea 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadZipService.java @@ -5,6 +5,7 @@ import com.google.common.io.Files; import forge.gui.FThreads; import forge.gui.GuiBase; import forge.gui.interfaces.IProgressBar; +import forge.util.BuildInfo; import forge.util.FileUtil; import java.io.*; @@ -89,7 +90,7 @@ public class GuiDownloadZipService extends GuiDownloadService { if (url.getPath().endsWith(".php")) { //ensure file can be downloaded if returned from PHP script - conn.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); + conn.setRequestProperty("User-Agent", BuildInfo.getUserAgent()); } conn.connect();