Merge branch 'fix_custom_preshipping' into 'master'

ensure the private api and the preshipped certificate will be used to setup...

Closes #9029

See merge request leap/bitmask_android!130

1 files changed, 26 insertions, 0 deletions

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 77189dff..8a526499 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
@@ -1,7 +1,11 @@
 package se.leap.bitmaskclient.base.utils;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 
 /**
@@ -18,4 +22,26 @@ public class InputStreamHelper {
         java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
         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;
+        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();
+        }
+        return json;
+    }
 }