Reverting local HTTP gateway back from HTTPS to HTTP; there was a change regarding...

[iot2.git] / benchmarks / other / PhoneInterface / Irrigation / app / src / main / java / com / example / xubin / irrigation / Helper.java

diff --git a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/Helper.java b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/Helper.java
index 2ff9b49ab315c1091703df784e8c6b2475d3a83e..77f4ccf7a981370b1ec36ccdb961918af256a7e1 100644 (file)
--- a/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/Helper.java
+++ b/benchmarks/other/PhoneInterface/Irrigation/app/src/main/java/com/example/xubin/irrigation/Helper.java
@@ -10,7 +10,6 @@ import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -26,12 +25,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.BufferedInputStream;
 import java.util.List;
-import java.security.cert.CertificateFactory;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.security.KeyStore;
 
 /**
  * Created by xubin on 4/26/16.
@@ -39,16 +33,13 @@ import java.security.KeyStore;
 public class Helper {
     private static final int Driver_port = 8000;
     private static final String Tag = "http";
-    private static final String KEYEXT = ".pem";
 
     HttpClient httpclient;
     //Set up
-    void setConnection(String destIP) {
-
-        httpclient = createClient(destIP);
+    void setConnection() {
+        httpclient = createClient();
     }
-
-    HttpClient createClient(String destIP) {
+    HttpClient createClient() {
         HttpParams params = new BasicHttpParams();
         params.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
         params.setParameter(CoreProtocolPNames.HTTP_CONTENT_CHARSET, HTTP.DEFAULT_CONTENT_CHARSET);
@@ -58,22 +49,21 @@ public class Helper {
 
         SchemeRegistry schReg = new SchemeRegistry();
         schReg.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), Driver_port));
-        schReg.register(new Scheme("https", newSslSocketFactory(destIP), 443));
+        //schReg.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443));
         ClientConnectionManager conMgr = new ThreadSafeClientConnManager(params, schReg);
 
         return new DefaultHttpClient(conMgr, params);
     }
-
     //Make http request
     public void  makeRequest(String destIP, List<Object> paramObjects, String methodName) {
-        String url = "https://"+ destIP + ":"+Driver_port+ "/"+methodName;
-        System.out.println("URL: " + url);
+        String url = "http://"+ destIP + ":"+Driver_port+ "/"+methodName;
         InputStream inputStream = null;
         String result = "";
         try {
             HttpPost httpPost = new HttpPost(url);
             JSONArray params = new JSONArray();
 
+
             JSONObject parent = new JSONObject();
             for (int i = 0; i < paramObjects.size(); i++) {
                 JSONObject content = new JSONObject();
@@ -103,31 +93,6 @@ public class Helper {
             ex.printStackTrace();
         }
     }
-
-    private SSLSocketFactory newSslSocketFactory(String destIP) {
-        try {
-            // Load CAs from an InputStream
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            InputStream caInput = new
-                    BufferedInputStream(MainActivity.context.getAssets().open(destIP + KEYEXT));
-            Certificate ca;
-            try {
-                ca = cf.generateCertificate(caInput);
-                System.out.println("ca=" + ((X509Certificate) ca).getSubjectDN());
-            } finally {
-                caInput.close();
-            }
-            String keyStoreType = KeyStore.getDefaultType();
-            KeyStore keyStore = KeyStore.getInstance(keyStoreType);
-            keyStore.load(null, null);
-            keyStore.setCertificateEntry("ca", ca);
-            SSLSocketFactory socketFactory = new SSLSocketFactory(keyStore);
-            return socketFactory;
-        } catch (Exception e) {
-            throw new AssertionError(e);
-        }
-    }
-
     private static String convertInputStreamToString(InputStream inputStream) throws IOException {
         BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(inputStream));
         String line = "";