Added restriction GMS5.view

Closes #1778

CHANGELOG.md

@@ -46,6 +46,7 @@ Version 2.99.x and version 3.x will be available with a [pro license](http://www
 **Next release**
 
 * Added restriction *registerListener* to the *Sensors* category, which will limit the rate of the gyroscope to 100 Hz to prevent eavesdropping ([issue](/../../issues/1878))
+* Added restriction [GMS5.view](https://developer.android.com/reference/com/google/android/gms/appindexing/AppIndexApi.html) ([issue](/../../issues/1778))
 * Updated Slovenian translation
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

res/values/functions.xml

@@ -165,8 +165,8 @@
     <string name="location_GMS_requestLocationUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/LocationClient.html#requestLocationUpdates(com.google.android.gms.location.LocationRequest,%20android.app.PendingIntent)">Google documentation</a>]]></string>
     <string name="location_GMS_requestActivityUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/training/location/activity-recognition.html">Google documentation</a>]]></string>
     <string name="location_GMS5_getLastLocation" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/FusedLocationProviderApi.html#getLastLocation(com.google.android.gms.common.api.GoogleApiClient)">Google documentation</a>]]></string>
-    <string name="location_GMS5_requestLocationUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/FusedLocationProviderApi.html#requestLocationUpdates(com.google.android.gms.common.api.GoogleApiClient, com.google.android.gms.location.LocationRequest,%20com.google.android.gms.location.LocationListener,%20android.os.Looper)">Google documentation</a>]]></string>
-    <string name="location_GMS5_requestActivityUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/ActivityRecognitionApi.html#requestActivityUpdates(com.google.android.gms.common.api.GoogleApiClient,%20long,%20android.app.PendingIntent)">Google documentation</a>]]></string>
+    <string name="location_GMS5_requestLocationUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/FusedLocationProviderApi.html#requestLocationUpdates(com.google.android.gms.common.api.GoogleApiClient,%20com.google.android.gms.location.LocationRequest,%20com.google.android.gms.location.LocationListener,%20android.os.Looper)">Google documentation</a>]]></string>
+    <string name="location_GMS5_requestActivityUpdates" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/location/ActivityRecognitionApi.html">Google documentation</a>]]></string>
     <string name="location_MapV1_enableMyLocation" translatable="false"><![CDATA[<a href="https://developers.google.com/maps/documentation/android/v1/reference/index">Google documentation</a>]]></string>
     <string name="location_MapV2_getMyLocation" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/maps/GoogleMap.html">Google documentation</a>]]></string>
     <string name="location_MapV2_getPosition" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/maps/model/Marker.html">Google documentation</a>]]></string>
@@ -396,5 +396,6 @@
     <string name="view_setUserAgentString" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/android/webkit/WebSettings.html#setUserAgentString(java.lang.String)">Google documentation</a>]]></string>
     <string name="view_android_intent_action_VIEW" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/android/content/Intent.html#ACTION_VIEW">Google documentation</a>]]></string>
     <string name="view_Srv_android_intent_action_VIEW" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/android/content/Intent.html#ACTION_VIEW">Google documentation</a>]]></string>
+    <string name="view_GMS5_view" translatable="false"><![CDATA[<a href="https://developer.android.com/reference/com/google/android/gms/appindexing/AppIndexApi.html">Google documentation</a>]]></string>
 
 </resources>

src/biz/bokhorst/xprivacy/Meta.java

@@ -473,6 +473,8 @@ public static List<Hook> get() {
 		mListHook.add(new Hook("view", Intent.ACTION_VIEW, "", 1, null, null).notAOSP(19).doNotify().whitelist(cTypeUrl));
 		mListHook.add(new Hook("view", "Srv_" + Intent.ACTION_VIEW, "", 19, "2.99", Intent.ACTION_VIEW).AOSP(19).doNotify().whitelist(cTypeUrl));
 
+		mListHook.add(new Hook("view", "GMS5.view", "", 1, null, null).unsafe());
+
 		// AccountManager
 		mListHook.add(new Hook(null, "removeOnAccountsUpdatedListener", "", 5, null, null));
 
@@ -505,6 +507,9 @@ public static List<Hook> get() {
 		mListHook.add(new Hook(null, "wakingUp", "", 16, null, null));
 		mListHook.add(new Hook(null, "shutdown", "", 15, null, null));
 
+		// AppIndexApi
+		mListHook.add(new Hook(null, "GMS5.viewEnd", "", 1, null, null));
+
 		// Application
 		mListHook.add(new Hook(null, "onCreate", "", 1, null, null));
 

src/biz/bokhorst/xprivacy/XActivityRecognitionApi.java

@@ -47,7 +47,7 @@ public static List<XHook> getInstances(Object instance) {
 	protected void before(XParam param) throws Throwable {
 		switch (mMethod) {
 		case removeActivityUpdates:
-			if (isRestricted(param, PrivacyManager.cLocation, "GMS.requestActivityUpdates"))
+			if (isRestricted(param, PrivacyManager.cLocation, "GMS5.requestActivityUpdates"))
 				param.setResult(null);
 			break;
 

src/biz/bokhorst/xprivacy/XAppIndexApi.java

@@ -0,0 +1,66 @@
+package biz.bokhorst.xprivacy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.os.Binder;
+import android.util.Log;
+
+public class XAppIndexApi extends XHook {
+	private Methods mMethod;
+	private String mClassName;
+
+	private XAppIndexApi(Methods method, String restrictionName, String className) {
+		super(restrictionName, method.name(), "GMS5." + method.name());
+		mMethod = method;
+		mClassName = className;
+	}
+
+	public String getClassName() {
+		return mClassName;
+	}
+
+	// @formatter:off
+
+	// abstract PendingResult<Status> view(GoogleApiClient apiClient, Activity activity, Intent viewIntent, String title, Uri webUrl, List<AppIndexApi.AppIndexingLink> outLinks)
+	// abstract PendingResult<Status> view(GoogleApiClient apiClient, Activity activity, Uri appIndexingUrl, String title, Uri webUrl, List<AppIndexApi.AppIndexingLink> outLinks)
+	// abstract PendingResult<Status> viewEnd(GoogleApiClient apiClient, Activity activity, Uri appIndexingUrl)
+	// abstract PendingResult<Status> viewEnd(GoogleApiClient apiClient, Activity activity, Intent viewIntent)
+	// https://developer.android.com/reference/com/google/android/gms/appindexing/AppIndexApi.html
+
+	// @formatter:on
+
+	private enum Methods {
+		view, viewEnd
+	};
+
+	public static List<XHook> getInstances(Object instance) {
+		String className = instance.getClass().getName();
+		Util.log(null, Log.WARN, "Hooking class=" + className + " uid=" + Binder.getCallingUid());
+
+		List<XHook> listHook = new ArrayList<XHook>();
+		listHook.add(new XAppIndexApi(Methods.viewEnd, null, className));
+		listHook.add(new XAppIndexApi(Methods.view, PrivacyManager.cView, className));
+		return listHook;
+	}
+
+	@Override
+	protected void before(XParam param) throws Throwable {
+		switch (mMethod) {
+		case viewEnd:
+			if (isRestricted(param, PrivacyManager.cView, "GMS5.view"))
+				param.setResult(null);
+			break;
+
+		case view:
+			if (isRestricted(param))
+				param.setResult(null);
+			break;
+		}
+	}
+
+	@Override
+	protected void after(XParam param) throws Throwable {
+		// Do nothing
+	}
+}

src/biz/bokhorst/xprivacy/XConnectionCallbacks.java

@@ -53,7 +53,8 @@ protected void before(XParam param) throws Throwable {
 			if (PrivacyManager.getTransient(fusedLocationApi.getClass().getName(), null) == null) {
 				PrivacyManager.setTransient(fusedLocationApi.getClass().getName(), Boolean.toString(true));
 
-				XPrivacy.hookAll(XFusedLocationApi.getInstances(fusedLocationApi), loader, getSecret());
+				if (fusedLocationApi != null)
+					XPrivacy.hookAll(XFusedLocationApi.getInstances(fusedLocationApi), loader, getSecret());
 			}
 
 			// ActivityRecognitionApi
@@ -62,7 +63,8 @@ protected void before(XParam param) throws Throwable {
 			if (PrivacyManager.getTransient(activityRecognitionApi.getClass().getName(), null) == null) {
 				PrivacyManager.setTransient(activityRecognitionApi.getClass().getName(), Boolean.toString(true));
 
-				XPrivacy.hookAll(XActivityRecognitionApi.getInstances(activityRecognitionApi), loader, getSecret());
+				if (activityRecognitionApi != null)
+					XPrivacy.hookAll(XActivityRecognitionApi.getInstances(activityRecognitionApi), loader, getSecret());
 			}
 
 			// AppIndexApi
@@ -71,7 +73,8 @@ protected void before(XParam param) throws Throwable {
 			if (PrivacyManager.getTransient(appIndexApi.getClass().getName(), null) == null) {
 				PrivacyManager.setTransient(appIndexApi.getClass().getName(), Boolean.toString(true));
 
-				// TODO: AppIndexApi
+				if (appIndexApi != null)
+					XPrivacy.hookAll(XAppIndexApi.getInstances(appIndexApi), loader, getSecret());
 			}
 
 			break;