From 601a77ad059b3da754c3baaf10b01dbc19b927be Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 15 Apr 2023 13:06:53 +0200 Subject: fix missing domain name of manually added providers in provider selection --- .../java/se/leap/bitmaskclient/base/models/Provider.java | 7 +++++-- .../se/leap/bitmaskclient/base/utils/InputStreamHelper.java | 12 +----------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/base') diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java index 57653263..08e13cf6 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java @@ -126,8 +126,10 @@ public final class Provider implements Parcelable { setGeoipUrl(geoipUrl); } - public Provider(String mainUrl, String providerIp, String providerApiIp) { - this(mainUrl, null, null, providerIp, providerApiIp); + public static Provider createCustomProvider(String mainUrl, String domain) { + Provider p = new Provider(mainUrl); + p.domain = domain; + return p; } public Provider(String mainUrl, String geoipUrl, String motdUrl, String providerIp, String providerApiIp) { @@ -520,6 +522,7 @@ public final class Provider implements Parcelable { JSONObject json = new JSONObject(); try { json.put(Provider.MAIN_URL, mainUrl); + json.put(Provider.DOMAIN, domain); } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/InputStreamHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/InputStreamHelper.java index 8a526499..8e6273a7 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/utils/InputStreamHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/InputStreamHelper.java @@ -23,22 +23,12 @@ public class InputStreamHelper { return s.hasNext() ? s.next() : ""; } - public static String extractKeyFromInputStream(InputStream inputStream, String key) { - String value = ""; - - JSONObject fileContents = inputStreamToJson(inputStream); - if (fileContents != null) - value = fileContents.optString(key); - return value; - } - public static JSONObject inputStreamToJson(InputStream inputStream) { - JSONObject json = null; + JSONObject json = new JSONObject(); try { byte[] bytes = new byte[inputStream.available()]; if (inputStream.read(bytes) > 0) json = new JSONObject(new String(bytes)); - inputStream.reset(); } catch (IOException | JSONException e) { e.printStackTrace(); } -- cgit v1.2.3