Explicitly check throwm exception type

Refs #1398

src/biz/bokhorst/xprivacy/XIoBridge.java

@@ -1,7 +1,6 @@
 package biz.bokhorst.xprivacy;
 
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.ArrayList;
@@ -69,15 +68,15 @@ public static List<XHook> getInstances() {
 	@SuppressLint("SdCardPath")
 	protected void before(XParam param) throws Throwable {
 		if (mMethod == Methods.connect) {
-			if (param.args.length > 2 && param.args[1] instanceof InetAddress) {
+			if (param.args.length > 2 && param.args[1] instanceof InetAddress && param.doesThrow(SocketException.class)) {
 				InetAddress address = (InetAddress) param.args[1];
 				int port = (Integer) param.args[2];
 				if (isRestrictedExtra(param, address.toString() + ":" + port))
-					param.setThrowable(new IOException("XPrivacy"));
+					param.setThrowable(new SocketException("XPrivacy"));
 			}
 
 		} else if (mMethod == Methods.open) {
-			if (param.args.length > 0 && param.args[0] != null) {
+			if (param.args.length > 0 && param.args[0] != null && param.doesThrow(FileNotFoundException.class)) {
 				String fileName = (String) param.args[0];
 				if (mFileName == null) {
 					String externalStorage = System.getenv("EXTERNAL_STORAGE");
@@ -119,7 +118,7 @@ protected void before(XParam param) throws Throwable {
 			}
 
 		} else if (mMethod == Methods.socket) {
-			if (isRestricted(param))
+			if (isRestricted(param) && param.doesThrow(SocketException.class))
 				param.setThrowable(new SocketException("XPrivacy"));
 
 		} else

src/biz/bokhorst/xprivacy/XParam.java

@@ -1,6 +1,7 @@
 package biz.bokhorst.xprivacy;
 
 import java.lang.reflect.Member;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +30,12 @@ public static XParam fromXposed(MethodHookParam param) {
 		return xparam;
 	}
 
+	public boolean doesReturn(Class<?> result) {
+		if (this.method instanceof Method)
+			return (((Method) this.method).getReturnType().equals(result));
+		return false;
+	}
+
 	public void setResult(Object result) {
 		mResult = result;
 		mHasResult = true;
@@ -42,6 +49,14 @@ public Object getResult() {
 		return mResult;
 	}
 
+	public boolean doesThrow(Class<?> ex) {
+		if (this.method instanceof Method)
+			for (Class<?> t : ((Method) this.method).getExceptionTypes())
+				if (t.equals(ex))
+					return true;
+		return false;
+	}
+
 	public void setThrowable(Throwable ex) {
 		mThrowable = ex;
 		mHasThrowable = true;