Fixed Gmail contact restricting

Closes #1336
M66B · Feb 13, 2014 · 2386fa8 · 2386fa8
1 parent 1ce265d
commit 2386fa8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Changelog
 **Next release**
 
 * Fixed cycling through restriction states, thanks @[jpeg729](https://github.com/jpeg729)
+* Fixed Gmail contact restricting ([issue](/../../issues/1336))
 * Added documentation for messages ([issue](/../../issues/838))
 * Make *Browser/Downloads* dangerous
 * Updated German translation

diff --git a/src/biz/bokhorst/xprivacy/XContentResolver.java b/src/biz/bokhorst/xprivacy/XContentResolver.java
@@ -235,7 +235,6 @@ else if (uri.startsWith("content://com.android.contacts/profile")) {
 					else if (uri.startsWith("content://com.android.contacts")) {
 						restrictionName = PrivacyManager.cContacts;
 						methodName = "ContactsProvider2"; // fall-back
-						Util.log(this, Log.WARN, "Contact fallback uri=" + uri);
 					}
 
 					else if (uri.startsWith("content://downloads")) {
@@ -313,6 +312,10 @@ public ContactID(String _name, boolean _raw) {
 	private ContactID getIdForUri(String uri) {
 		if (uri.startsWith("content://com.android.contacts/contacts"))
 			return new ContactID("name_raw_contact_id", true);
+		else if (uri.startsWith("content://com.android.contacts/data/emails"))
+			return new ContactID("contact_id", false);
+		else if (uri.startsWith("content://com.android.contacts/data/phones"))
+			return new ContactID("raw_contact_id", true);
 		else if (uri.startsWith("content://com.android.contacts/data"))
 			return new ContactID("raw_contact_id", true);
 		else if (uri.startsWith("content://com.android.contacts/phone_lookup"))