Dynamically hook clipboard manager

Refs #857
M66B · Dec 2, 2013 · ae43d15 · ae43d15
1 parent 770af59
commit ae43d15
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/biz/bokhorst/xprivacy/XClipboardManager.java b/src/biz/bokhorst/xprivacy/XClipboardManager.java
@@ -14,14 +14,16 @@
 
 public class XClipboardManager extends XHook {
 	private Methods mMethod;
+	private String mClassName;
 
-	private XClipboardManager(Methods method, String restrictionName) {
+	private XClipboardManager(Methods method, String restrictionName, String className) {
 		super(restrictionName, method.name(), null);
 		mMethod = method;
+		mClassName = className;
 	}
 
 	public String getClassName() {
-		return "android.content.ClipboardManager";
+		return mClassName;
 	}
 
 	// @formatter:off
@@ -42,10 +44,11 @@ private enum Methods {
 		addPrimaryClipChangedListener, getPrimaryClip, getPrimaryClipDescription, getText, hasPrimaryClip, hasText, removePrimaryClipChangedListener
 	};
 
-	public static List<XHook> getInstances() {
+	public static List<XHook> getInstances(Object instance) {
+		String className = instance.getClass().getName();
 		List<XHook> listHook = new ArrayList<XHook>();
 		for (Methods clip : Methods.values())
-			listHook.add(new XClipboardManager(clip, PrivacyManager.cClipboard));
+			listHook.add(new XClipboardManager(clip, PrivacyManager.cClipboard, className));
 		return listHook;
 	}
 

diff --git a/src/biz/bokhorst/xprivacy/XContextWrapper.java b/src/biz/bokhorst/xprivacy/XContextWrapper.java
@@ -11,6 +11,7 @@
 
 public class XContextWrapper extends XHook {
 	private Methods mMethod;
+	private static boolean mClipboardManagerHooked = false;
 	private static boolean mWindowManagerHooked = false;
 
 	private XContextWrapper(Methods method, String restrictionName) {
@@ -57,7 +58,13 @@ protected void after(MethodHookParam param) throws Throwable {
 			Object result = param.getResultOrThrowable();
 			if (name != null && result != null) {
 				Util.log(this, Log.INFO, "getSystemService " + name + "=" + result.getClass().getName());
-				if (name.equals(Context.WINDOW_SERVICE)) {
+				if (name.equals(Context.CLIPBOARD_SERVICE)) {
+					// Clipboard service
+					if (!mClipboardManagerHooked) {
+						XPrivacy.hookAll(XClipboardManager.getInstances(result));
+						mClipboardManagerHooked = true;
+					}
+				} else if (name.equals(Context.WINDOW_SERVICE)) {
 					// Windows service
 					if (!mWindowManagerHooked) {
 						XPrivacy.hookAll(XWindowManager.getInstances(result));

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -61,9 +61,6 @@ public void initZygote(StartupParam startupParam) throws Throwable {
 		// Camera
 		hookAll(XCamera.getInstances());
 
-		// Clipboard manager
-		hookAll(XClipboardManager.getInstances());
-
 		// Connectivity manager
 		hookAll(XConnectivityManager.getInstances());