ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "client: load jagex config and client over https"

Browse Source 
This reverts commit b288a4899d.
This commit is contained in:
Adam
2019-03-21 10:46:35 -04:00
parent db426954ae
commit 6f2359a7d8
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
View File

@@ -38,7 +38,7 @@ import okhttp3.Response;
@Singleton @Singleton
class ClientConfigLoader 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; private final OkHttpClient httpClient;
@Inject @Inject

7
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
View File

@@ -37,6 +37,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
@@ -47,7 +48,6 @@ import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static net.runelite.client.rs.ClientUpdateCheckMode.*; import static net.runelite.client.rs.ClientUpdateCheckMode.*;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.HttpUrl;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.apache.commons.compress.compressors.CompressorException; import org.apache.commons.compress.compressors.CompressorException;
@@ -83,10 +83,7 @@ public class ClientLoader
{ {
String codebase = config.getCodeBase(); String codebase = config.getCodeBase();
String initialJar = config.getInitialJar(); String initialJar = config.getInitialJar();
HttpUrl url = HttpUrl.parse(codebase).newBuilder() URL url = new URL(codebase + initialJar);
.scheme("https")
.addPathSegment(initialJar)
.build();
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.build(); .build();