Allow applications for ApplicationsProvider

Refs #686
M66B · Nov 15, 2013 · 29d5a9a · 29d5a9a
1 parent 6f6b88a
commit 29d5a9a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 27 deletions.
diff --git a/src/biz/bokhorst/xprivacy/XActivityThread.java b/src/biz/bokhorst/xprivacy/XActivityThread.java
@@ -10,7 +10,6 @@
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
-import android.net.Uri;
 import android.nfc.NfcAdapter;
 import android.os.Binder;
 import android.os.Build;

diff --git a/src/biz/bokhorst/xprivacy/XContentProvider.java b/src/biz/bokhorst/xprivacy/XContentProvider.java
@@ -194,38 +194,27 @@ else if (sUri.startsWith("content://com.android.contacts/raw_contacts"))
 
 							// Conditionally copy row
 							if (copy)
-								try {
-									Object[] columns = new Object[cursor.getColumnCount()];
-									for (int i = 0; i < cursor.getColumnCount(); i++)
-										switch (cursor.getType(i)) {
-										case Cursor.FIELD_TYPE_NULL:
-											columns[i] = null;
-											break;
-										case Cursor.FIELD_TYPE_INTEGER:
-											columns[i] = cursor.getInt(i);
-											break;
-										case Cursor.FIELD_TYPE_FLOAT:
-											columns[i] = cursor.getFloat(i);
-											break;
-										case Cursor.FIELD_TYPE_STRING:
-											columns[i] = cursor.getString(i);
-											break;
-										case Cursor.FIELD_TYPE_BLOB:
-											columns[i] = cursor.getBlob(i);
-											break;
-										default:
-											Util.log(this, Log.WARN, "Unknown cursor data type=" + cursor.getType(i));
-										}
-									result.addRow(columns);
-								} catch (Throwable ex) {
-									Util.bug(this, ex);
-								}
+								copyColumns(cursor, result);
 						}
 						result.respond(cursor.getExtras());
 						param.setResult(result);
 						cursor.close();
 					}
 
+				} else if (sUri.startsWith("content://applications")) {
+					// Applications provider: allow selected applications
+					if (isRestricted(param)) {
+						MatrixCursor result = new MatrixCursor(cursor.getColumnNames());
+						while (cursor.moveToNext()) {
+							int colPackage = cursor.getColumnIndex("package");
+							String packageName = (colPackage < 0 ? null : cursor.getString(colPackage));
+							if (packageName != null && XApplicationPackageManager.isPackageAllowed(packageName))
+								copyColumns(cursor, result);
+						}
+						result.respond(cursor.getExtras());
+						param.setResult(result);
+						cursor.close();
+					}
 				} else {
 					if (isRestricted(param)) {
 						// Return empty cursor
@@ -238,6 +227,35 @@ else if (sUri.startsWith("content://com.android.contacts/raw_contacts"))
 		}
 	}
 
+	private void copyColumns(Cursor cursor, MatrixCursor result) {
+		try {
+			Object[] columns = new Object[cursor.getColumnCount()];
+			for (int i = 0; i < cursor.getColumnCount(); i++)
+				switch (cursor.getType(i)) {
+				case Cursor.FIELD_TYPE_NULL:
+					columns[i] = null;
+					break;
+				case Cursor.FIELD_TYPE_INTEGER:
+					columns[i] = cursor.getInt(i);
+					break;
+				case Cursor.FIELD_TYPE_FLOAT:
+					columns[i] = cursor.getFloat(i);
+					break;
+				case Cursor.FIELD_TYPE_STRING:
+					columns[i] = cursor.getString(i);
+					break;
+				case Cursor.FIELD_TYPE_BLOB:
+					columns[i] = cursor.getBlob(i);
+					break;
+				default:
+					Util.log(this, Log.WARN, "Unknown cursor data type=" + cursor.getType(i));
+				}
+			result.addRow(columns);
+		} catch (Throwable ex) {
+			Util.bug(this, ex);
+		}
+	}
+
 	@Override
 	protected boolean isRestricted(MethodHookParam param) throws Throwable {
 		ContentProvider contentProvider = (ContentProvider) param.thisObject;