Set user agent before loadUrl

Refs #825
M66B · Dec 4, 2013 · ae56a24 · ae56a24
1 parent 04050d8
commit ae56a24
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/biz/bokhorst/xprivacy/XWebView.java b/src/biz/bokhorst/xprivacy/XWebView.java
@@ -52,7 +52,16 @@ public static List<XHook> getInstances() {
 
 	@Override
 	protected void before(MethodHookParam param) throws Throwable {
-		// Do nothing
+		if (mMethod == Methods.WebView || mMethod == Methods.getSettings) {
+			// Do nothing
+		} else if (mMethod == Methods.loadUrl) {
+			if (isRestricted(param)) {
+				String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
+				WebView webView = (WebView) param.thisObject;
+				webView.getSettings().setUserAgentString(ua);
+			}
+		} else
+			Util.log(this, Log.WARN, "Unknown method=" + param.method.getName());
 	}
 
 	@Override
@@ -68,11 +77,7 @@ protected void after(MethodHookParam param) throws Throwable {
 				}
 			}
 		} else if (mMethod == Methods.loadUrl) {
-			if (isRestricted(param)) {
-				String ua = (String) PrivacyManager.getDefacedProp(Binder.getCallingUid(), "UA");
-				WebView webView = (WebView) param.thisObject;
-				webView.getSettings().setUserAgentString(ua);
-			}
+			// Do nothing
 		} else if (mMethod == Methods.getSettings) {
 			if (param.getResult() != null) {
 				Class<?> clazz = param.getResult().getClass();