Jelajahi Sumber

ra image 去掉无法通过审核的代码

Ray Zhang 7 tahun lalu
induk
melakukan
89fbb498a6

+ 48 - 42
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/Network.java

@@ -30,20 +30,11 @@ import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
 public class Network {
 
     public static final int	REQUEST_TIMEOUT					= 15 * 1000;			// request
@@ -73,39 +64,54 @@ public class Network {
     public static int			RESULT_AUTH_EXPIRED				= 99;
 
 
-    public static void handleSSLHandshake() {
-        try {
-            TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
-                public X509Certificate[] getAcceptedIssuers() {
-                    return new X509Certificate[0];
-                }
-
-                @Override
-                public void checkClientTrusted(X509Certificate[] certs, String authType) {
-                }
-
-                @Override
-                public void checkServerTrusted(X509Certificate[] certs, String authType) {
-                }
-            }};
-
-            SSLContext sc = SSLContext.getInstance("TLS");
-            // trustAllCerts信任所有的证书
-            sc.init(null, trustAllCerts, new SecureRandom());
-            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-            HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
-                @Override
-                public boolean verify(String hostname, SSLSession session) {
-                    if(hostname.equals("96.75.188.41"))
-                        return true;
-                    else
-                        return false;
-                }
-            });
-        } catch (Exception ignored) {
-        }
-
-    }
+//    public static void handleSSLHandshake() {
+//        try {
+//            TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+//                public X509Certificate[] getAcceptedIssuers() {
+//                    return new X509Certificate[0];
+//                }
+//
+//                @Override
+//                public void checkClientTrusted(X509Certificate[] certs, String authType) {
+//                }
+//
+//                @Override
+//                public void checkServerTrusted(X509Certificate[] certs, String authType) {
+//                }
+//            }};
+//
+//            SSLContext sc = SSLContext.getInstance("TLS");
+//            // trustAllCerts信任所有的证书
+//            sc.init(null, trustAllCerts, new SecureRandom());
+//            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+//            HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+//                @Override
+//                public boolean verify(String hostname, SSLSession session) {
+//
+//
+////                    X509Certificate cert = null;
+////
+////                    try {
+////
+////                        cert = (X509Certificate) session.getPeerCertificates()[0];
+////
+////                    } catch (SSLPeerUnverifiedException e) {
+////
+////                    }
+//
+//
+//                    if(hostname.equals("96.75.188.41"))
+//                        return true;
+//                    else
+//                        return false;
+//
+//
+//                }
+//            });
+//        } catch (Exception ignored) {
+//        }
+//
+//    }
 
 
     public static String getJson(String url, Bundle parms,int timeout)

+ 1 - 1
ApexDrivers/raimage/build.gradle

@@ -15,7 +15,7 @@ android {
         applicationId "com.usai.redant.raimage"
         minSdkVersion 23
         targetSdkVersion 26
-        versionCode 4
+        versionCode 5
         versionName "1.09.39517"
     }
     buildTypes {

+ 1 - 2
ApexDrivers/raimage/src/main/java/com/usai/redant/raimage/RedAntApplication.java

@@ -15,7 +15,6 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.usai.redant.rautils.utils.Network;
 import com.usai.service.RAImageBackgroundService;
 
 import org.json.JSONObject;
@@ -91,7 +90,7 @@ public class RedAntApplication extends Application
 		super.onCreate();
         instance = this;
 
-        Network.handleSSLHandshake();
+//        Network.handleSSLHandshake();
 
 		device_id=Settings.Secure.getString(getContentResolver(),Settings.Secure.ANDROID_ID);