From 035b8faf1433728c8499246b55d6560092fcee6b Mon Sep 17 00:00:00 2001 From: Jeffrey Han Date: Mon, 12 Feb 2018 00:52:59 -0800 Subject: [PATCH] Switch to a common "User-Agent" string. Fixes Mnetwork, again. Signed-off-by: Jeffrey Han --- src/itdelatrisu/opsu/Utils.java | 2 +- src/itdelatrisu/opsu/downloads/Download.java | 3 ++- src/itdelatrisu/opsu/options/Options.java | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java index ac8271e8..ca308fc2 100644 --- a/src/itdelatrisu/opsu/Utils.java +++ b/src/itdelatrisu/opsu/Utils.java @@ -534,7 +534,7 @@ public static String readDataFromUrl(URL url) throws IOException { conn.setConnectTimeout(Download.CONNECTION_TIMEOUT); conn.setReadTimeout(Download.READ_TIMEOUT); conn.setUseCaches(false); - conn.setRequestProperty("User-Agent", "Mozilla/5.0..."); + conn.setRequestProperty("User-Agent", Options.USER_AGENT); try { conn.connect(); } catch (SocketTimeoutException e) { diff --git a/src/itdelatrisu/opsu/downloads/Download.java b/src/itdelatrisu/opsu/downloads/Download.java index 005296fe..0d1beeb8 100644 --- a/src/itdelatrisu/opsu/downloads/Download.java +++ b/src/itdelatrisu/opsu/downloads/Download.java @@ -20,6 +20,7 @@ import itdelatrisu.opsu.ErrorHandler; import itdelatrisu.opsu.Utils; +import itdelatrisu.opsu.options.Options; import java.io.File; import java.io.FileOutputStream; @@ -221,7 +222,7 @@ public void run() { // allow HTTP <--> HTTPS redirects // http://download.java.net/jdk7u2/docs/technotes/guides/deployment/deployment-guide/upgrade-guide/article-17.html conn.setInstanceFollowRedirects(false); - conn.setRequestProperty("User-Agent", "Mozilla/5.0..."); + conn.setRequestProperty("User-Agent", Options.USER_AGENT); if (requestHeaders != null) { for (Map.Entry entry : requestHeaders.entrySet()) conn.setRequestProperty(entry.getKey(), entry.getValue()); diff --git a/src/itdelatrisu/opsu/options/Options.java b/src/itdelatrisu/opsu/options/Options.java index 3656a204..885b9e0a 100644 --- a/src/itdelatrisu/opsu/options/Options.java +++ b/src/itdelatrisu/opsu/options/Options.java @@ -120,6 +120,10 @@ public class Options { /** Version file name. */ public static final String VERSION_FILE = "version"; + /** The user agent to use in HTTP requests. */ + public static final String USER_AGENT = + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"; + /** The beatmap directory. */ private static File beatmapDir;