From 478c79dfb4856953b886c73b3fb5a4531b0c90c7 Mon Sep 17 00:00:00 2001
From: M66B <marcel@bokhorst.biz>
Date: Sat, 22 Feb 2014 22:26:06 +0100
Subject: [PATCH] Removed internet/socket

---
 CHANGELOG.md                             | 1 +
 res/values/functions.xml                 | 1 -
 src/biz/bokhorst/xprivacy/Meta.java      | 1 -
 src/biz/bokhorst/xprivacy/XIoBridge.java | 7 +------
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 558f820e9..89c8b130e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Changelog
 * Restrict all *view* actions, show parameters and whitelisting ([issue](/../../issues/1419))
 	* You might see a few more messages *Restricted by XPrivacy* because of this
 * Improved usage data layout, option to copy parameters ([issue](/../../issues/1424))
+* Removed *internet/socket*, since it passes *internet/connect* anyway
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
diff --git a/res/values/functions.xml b/res/values/functions.xml
index 16e25545f..0d2d38ad7 100644
--- a/res/values/functions.xml
+++ b/res/values/functions.xml
@@ -80,7 +80,6 @@
     <string name="internet_isConnectedOrConnecting" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/net/NetworkInfo.html#isConnectedOrConnecting()">Google documentation</a>]]></string>
     <string name="internet_getConnectionInfo" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/android/net/wifi/WifiManager.html#getConnectionInfo()">Google documentation</a>]]></string>
     <string name="internet_connect" translatable="false"><![CDATA[Will restrict access to the internet]]></string>
-    <string name="internet_socket" translatable="false"><![CDATA[<a href="http://developer.android.com/reference/java/net/Socket.html">Google documentation</a>]]></string>
     <!-- ipc -->
     <string name="ipc_android_accounts_IAccountManager" translatable="false"><![CDATA[Will restrict direct inter-process calls to the <a href="http://developer.android.com/reference/android/accounts/AccountManager.html">account manager</a>]]></string>
     <string name="ipc_android_app_IActivityManager" translatable="false"><![CDATA[Will restrict direct inter-process calls to the <a href="http://developer.android.com/reference/android/app/ActivityManager.html">activity manager</a>]]></string>
diff --git a/src/biz/bokhorst/xprivacy/Meta.java b/src/biz/bokhorst/xprivacy/Meta.java
index 5184fcbdb..25db654ff 100644
--- a/src/biz/bokhorst/xprivacy/Meta.java
+++ b/src/biz/bokhorst/xprivacy/Meta.java
@@ -110,7 +110,6 @@ public static List<Hook> get() {
 		mListHook.add(new Hook("internet", "getConnectionInfo", null, 10, null, null));
 
 		mListHook.add(new Hook("internet", "connect", null, 1, "1.99.45", null).dangerous().whitelist(cWhitelistIPAddress));
-		mListHook.add(new Hook("internet", "socket", null, 1, "1.99.46", null).dangerous());
 
 		mListHook.add(new Hook("ipc", "android.accounts.IAccountManager", "", 1, "1.99.1", null));
 		mListHook.add(new Hook("ipc", "android.app.IActivityManager", "", 1, "1.99.1", null));
diff --git a/src/biz/bokhorst/xprivacy/XIoBridge.java b/src/biz/bokhorst/xprivacy/XIoBridge.java
index 254f60da3..7955cc505 100644
--- a/src/biz/bokhorst/xprivacy/XIoBridge.java
+++ b/src/biz/bokhorst/xprivacy/XIoBridge.java
@@ -47,7 +47,7 @@ public String getClassName() {
 	// @formatter:on
 
 	private enum Methods {
-		open, connect, socket
+		open, connect
 	};
 
 	public static List<XHook> getInstances() {
@@ -58,7 +58,6 @@ public static List<XHook> getInstances() {
 		listHook.add(new XIoBridge(Methods.open, PrivacyManager.cIdentification, "/system/build.prop"));
 		listHook.add(new XIoBridge(Methods.open, PrivacyManager.cIdentification, "/sys/block/.../cid"));
 		listHook.add(new XIoBridge(Methods.open, PrivacyManager.cIdentification, "/sys/class/.../cid"));
-		listHook.add(new XIoBridge(Methods.socket, PrivacyManager.cInternet));
 		return listHook;
 	}
 
@@ -123,10 +122,6 @@ protected void before(XParam param) throws Throwable {
 				}
 			}
 
-		} else if (mMethod == Methods.socket) {
-			if (isRestricted(param))
-				param.setThrowable(new SocketException("XPrivacy"));
-
 		} else
 			Util.log(this, Log.WARN, "Unknown method=" + param.method.getName());
 	}