summaryrefslogtreecommitdiff
path: root/src/se/leap/leapclient/ProviderAPI.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-02-04 18:44:38 +0100
committerParménides GV <parmegv@sdf.org>2013-02-04 18:44:38 +0100
commit8ab36864e2a393df077073f8618a4fc55c307522 (patch)
tree10c071d54d8b97f929194a8429d413a9e962c5ea /src/se/leap/leapclient/ProviderAPI.java
parentd2bd18ef560d95974117604af899b3a9fcc16dab (diff)
Secure HTTP working with certificates downloaded from api.bitmask.net
and bitmask.net. Both prefs are downloaded and parsed to SharedPreferences.
Diffstat (limited to 'src/se/leap/leapclient/ProviderAPI.java')
-rw-r--r--src/se/leap/leapclient/ProviderAPI.java35
1 files changed, 13 insertions, 22 deletions
diff --git a/src/se/leap/leapclient/ProviderAPI.java b/src/se/leap/leapclient/ProviderAPI.java
index 40638180..d487ebe3 100644
--- a/src/se/leap/leapclient/ProviderAPI.java
+++ b/src/se/leap/leapclient/ProviderAPI.java
@@ -1,15 +1,12 @@
package se.leap.leapclient;
-import java.io.BufferedInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
import java.util.Scanner;
-import javax.net.ssl.HttpsURLConnection;
-
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
import org.json.JSONException;
import org.json.JSONObject;
@@ -48,23 +45,17 @@ public class ProviderAPI extends IntentService {
}
private JSONObject getFromProvider(String json_url) throws IOException, JSONException {
- URL url = new URL(json_url);
+
String json_file_content = "";
- URLConnection urlConnection = null;
- if (url.getProtocol().equalsIgnoreCase("https")) {
- urlConnection = (HttpsURLConnection) url.openConnection();
- } else if (url.getProtocol().equalsIgnoreCase("http")) {
- urlConnection = (HttpURLConnection) url.openConnection();
- }
-
- try {
- InputStream in = new BufferedInputStream(
- urlConnection.getInputStream());
- json_file_content = new Scanner(in).useDelimiter("\\A").next();
- } finally {
- ((HttpURLConnection) urlConnection).disconnect();
- }
+ DefaultHttpClient client = new LeapHttpClient(getApplicationContext());
+ HttpGet get = new HttpGet(json_url);
+ // Execute the GET call and obtain the response
+ HttpResponse getResponse = client.execute(get);
+ HttpEntity responseEntity = getResponse.getEntity();
+
+ json_file_content = new Scanner(responseEntity.getContent()).useDelimiter("\\A").next();
+
return new JSONObject(json_file_content);
}