From 6f2359a7d8a9a23c86f0011de47cfcb67df37229 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 21 Mar 2019 10:46:35 -0400 Subject: [PATCH] Revert "client: load jagex config and client over https" This reverts commit b288a4899d1f34f0521937b530ba60eeb86a2109. --- .../java/net/runelite/client/rs/ClientConfigLoader.java | 2 +- .../src/main/java/net/runelite/client/rs/ClientLoader.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java index be355cbd7e..9d3804ebab 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java @@ -38,7 +38,7 @@ import okhttp3.Response; @Singleton class ClientConfigLoader { - private static final String CONFIG_URL = "https://oldschool.runescape.com/jav_config.ws"; + private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws"; private final OkHttpClient httpClient; @Inject diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 3755be2398..9e81d59b00 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -37,6 +37,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.URL; import java.util.HashMap; import java.util.Map; import java.util.jar.JarEntry; @@ -47,7 +48,6 @@ import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import static net.runelite.client.rs.ClientUpdateCheckMode.*; import net.runelite.http.api.RuneLiteAPI; -import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; import org.apache.commons.compress.compressors.CompressorException; @@ -83,10 +83,7 @@ public class ClientLoader { String codebase = config.getCodeBase(); String initialJar = config.getInitialJar(); - HttpUrl url = HttpUrl.parse(codebase).newBuilder() - .scheme("https") - .addPathSegment(initialJar) - .build(); + URL url = new URL(codebase + initialJar); Request request = new Request.Builder() .url(url) .build();