[[ Bug 22937 ]] Fix crash where FileProvider projection null

montegoulding · montegoulding · commit 031eccf8f364 · 2020-11-13T12:58:19.000+11:00
This patch resolves a crash where the `FileProvider` query projection array is
`null`. The documentation states:

&gt; The list of columns to put into the cursor. If null all columns are included.
diff --git a/engine/src/java/com/runrev/android/FileProvider.java b/engine/src/java/com/runrev/android/FileProvider.java
@@ -112,6 +112,11 @@ private boolean validField(String p_field)
 
 	private boolean validQuery(String[] projection)
 	{
+		if (projection == null)
+		{
+			return true;
+		}
+
 		boolean t_valid = true;
 		for (int i = 0; i < projection . length && t_valid; ++i)
 		{
@@ -173,14 +178,25 @@ public Cursor doQuery(Uri uri, String[] projection, String selection, String[] s
 		String t_uri_string = uri.toString();
 		HashMap<String, String> t_infos = m_infos.get(t_uri_string);
 
-		String t_values[] = new String[projection.length];
-		for (int i = 0; i < projection.length; ++i)
-			t_values[i] = t_infos.get(projection[i]);
+		String t_values[];
+		MatrixCursor t_cursor;
+		if (projection == null)
+		{
+			t_values = t_infos.values().toArray(new String[0]);
+			t_cursor = new MatrixCursor(t_infos.keySet().toArray(new String[0]));
+		}
+		else
+		{
+			t_values = new String[projection.length];
+			for (int i = 0; i < projection.length; ++i)
+				t_values[i] = t_infos.get(projection[i]);
+
+			t_cursor = new MatrixCursor(projection);
+		}
 		// Log.i("revandroid", "query for " + uri.toString());
 		// for (int i = 0; i < t_values . length; ++i)
 		// 	Log.i("revandroid", "\t" + t_values[i]);
 
-		MatrixCursor t_cursor = new MatrixCursor(projection);
 		t_cursor . addRow(t_values);
 
 		return t_cursor;
