TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 15:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix[api]: Automatically URL-encode all query params and values

Browse Source 
Not doing this coused issues on Android 6 with Modrinth facets
This commit is contained in:
BuildTools 2023-08-18 18:06:28 +03:00 committed by ArtDev
parent 4a4115aeb6
commit e0c64219bc
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ApiHandler.java
View File

@ -10,11 +10,14 @@ import net.kdt.pojavlaunch.Tools;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@SuppressWarnings("unused")
public class ApiHandler {
@ -110,8 +113,11 @@ public class ApiHandler {
private static String parseQueries(HashMap<String, Object> query) {
StringBuilder params = new StringBuilder("?");
for (String param : query.keySet()) {
Object value = query.get(param);
params.append(param).append("=").append(value).append("&");
String value = Objects.toString(query.get(param));
params.append(urlEncodeUTF8(param))
.append("=")
.append(urlEncodeUTF8(value))
.append("&");
}
return params.substring(0, params.length() - 1);
}
@ -147,4 +153,12 @@ public class ApiHandler {
public static <T> T postFullUrl(Map<String, String> headers, String url, HashMap<String, Object> query, T body, Class<T> tClass) {
return new Gson().fromJson(postRaw(headers, url + parseQueries(query), body.toString()), tClass);
}
private static String urlEncodeUTF8(String input) {
try {
return URLEncoder.encode(input, "UTF-8");
}catch (UnsupportedEncodingException e) {
throw new RuntimeException("UTF-8 is required");
}
}
}