From ed9dcf473861eedba769d75ff4b1a50bce430b6a Mon Sep 17 00:00:00 2001
From: Ryan Welton <ryan.g.welton@gmail.com>
Date: Thu, 24 Jul 2014 19:49:20 -0400
Subject: [PATCH] Take a more simplistic approach

---
 .gitignore                                |  1 +
 app/src/main/java/just/trust/me/Main.java | 16 +++++-----------
 build/intermediates/dex-cache/cache.xml   | 11 -----------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 build/intermediates/dex-cache/cache.xml

diff --git a/.gitignore b/.gitignore
index dc3546b..f005bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.iml
 app/build/
+build/
 .idea/
 .gradle
 /local.properties
diff --git a/app/src/main/java/just/trust/me/Main.java b/app/src/main/java/just/trust/me/Main.java
index 92decb8..1040c23 100644
--- a/app/src/main/java/just/trust/me/Main.java
+++ b/app/src/main/java/just/trust/me/Main.java
@@ -2,8 +2,6 @@ package just.trust.me;
 
 import javax.net.ssl.SSLSocketFactory;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
 import java.net.Socket;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
@@ -18,16 +16,12 @@ import javax.net.ssl.X509TrustManager;
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.XC_MethodHook;
 import de.robv.android.xposed.XC_MethodReplacement;
-import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
 
-
 import static de.robv.android.xposed.XposedHelpers.findAndHookMethod;
 
-
 public class Main implements IXposedHookLoadPackage {
 
-
     public void handleLoadPackage(final LoadPackageParam lpparam) throws Throwable {
 
         findAndHookMethod("javax.net.ssl.TrustManagerFactory", lpparam.classLoader, "getTrustManagers", new XC_MethodReplacement() {
@@ -37,7 +31,7 @@ public class Main implements IXposedHookLoadPackage {
             }
         });
 
-        findAndHookMethod("javax.net.ssl.SSLContext", lpparam.classLoader, "init", new XC_MethodHook() {
+        findAndHookMethod("javax.net.ssl.SSLContext", lpparam.classLoader, "init", KeyManager[].class, TrustManager[].class, SecureRandom.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 param.args[0] = null;
@@ -47,7 +41,7 @@ public class Main implements IXposedHookLoadPackage {
         });
 
 
-        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setSSLSocketFactory", new XC_MethodHook() {
+        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setSSLSocketFactory", SSLSocketFactory.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 super.beforeHookedMethod(param);
@@ -58,21 +52,21 @@ public class Main implements IXposedHookLoadPackage {
         });
 
 
-        findAndHookMethod("org.apache.http.conn.ssl.SSLSocketFactory", lpparam.classLoader, "isSecure", new XC_MethodReplacement() {
+        findAndHookMethod("org.apache.http.conn.ssl.SSLSocketFactory", lpparam.classLoader, "isSecure", Socket.class, new XC_MethodReplacement() {
             @Override
             protected Object replaceHookedMethod(MethodHookParam param) throws Throwable {
                 return true;
             }
         });
 
-        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setHostnameVerifier", new XC_MethodHook() {
+        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setHostnameVerifier", HostnameVerifier.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 param.args[0] = org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
             }
         });
 
-        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setDefaultHostnameVerifier", new XC_MethodHook() {
+        findAndHookMethod("javax.net.ssl.HttpsURLConnection", lpparam.classLoader, "setDefaultHostnameVerifier", HostnameVerifier.class, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 param.args[0] = org.apache.http.conn.ssl.SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER;
diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
deleted file mode 100644
index 34045f5..0000000
--- a/build/intermediates/dex-cache/cache.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pre-dex-items>
-
-    <item
-        dex="/home/fuzion24/Development/personal/JustTrustMe-Android/app/build/intermediates/pre-dexed/debug/XposedBridgeApi-46d675254f226adfe98087b85f11bc2d41148d35.jar"
-        jar="/home/fuzion24/Development/personal/JustTrustMe-Android/app/libs/XposedBridgeApi.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="ddaab44bacde8aca4d3ce15224e0ee6a13aaa566"/>
-
-</pre-dex-items>