reenable ssl cert check if checbox unchecked

mc51 · Dec 2, 2020 · bbd76c7 · bbd76c7
1 parent 7fd9007
commit bbd76c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "com.data_dive.com.clipster"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 2
-        versionName "0.2.0"
+        versionCode 3
+        versionName "0.2.1"
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/data_dive/com/clipster/NetClient.java b/app/src/main/java/com/data_dive/com/clipster/NetClient.java
@@ -31,7 +31,6 @@
 
 public class NetClient {
 
-    private static NetClient instance;
     private static Context mContext;
 
     private static final int TIMEOUT_CONN = 5000;
@@ -51,6 +50,8 @@ protected NetClient(Context context) {
         Log.d(logtag, "Default constructor, SERVER: " + SERVER_URI);
         if(credentials.ignore_cert) {
             disableSSLCertChecks();
+        } else {
+            enableSSLCertChecks();
         }
         mContext = context;
     }
@@ -61,6 +62,8 @@ protected NetClient(Context context, Credentials creds) {
         SERVER_URI = credentials.server;
         if(credentials.ignore_cert) {
             disableSSLCertChecks();
+        } else {
+            enableSSLCertChecks();
         }
         mContext = context;
     }
@@ -143,6 +146,20 @@ public boolean verify(String arg0, SSLSession arg1) {
         }
     }
 
+    public static void enableSSLCertChecks() {
+        // Reenable SSL Certification Checks
+        Log.d(logtag, "Enabling SSL Cert Checks");
+        // Install the all-trusting trust manager
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, null, null);
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+            HttpsURLConnection.setDefaultHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier());
+        } catch (GeneralSecurityException e) {
+            Log.e(logtag, "Error enabling SSL Cert: " + e.toString());
+        }
+    }
+
     // Send request to API on server
     public static class ClientRequest extends AsyncTask<String, Void, ArrayList> {