From 7bc7fa9288f8b485f22e57ef14c4f250ae7b4056 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Jan 2019 22:13:40 +0100
Subject: [PATCH] rename LoggingQuery.query() to rawQuery() to make audits
 easier

rawQuery() is much more dangerous, so this method should have the
same name as the method it is actually calling.

https://f-droid.org/docs/Second_Audit_Report/#f47--fdroidclient-raw-sql-query-executions
---
 app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java      | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/AppProvider.java      | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java     | 2 +-
 app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
index d89eb0a68..00e6645fe 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
@@ -533,7 +533,7 @@ public class ApkProvider extends FDroidProvider {
         queryBuilder.addSelection(query);
         queryBuilder.addOrderBy(sortOrder);
 
-        Cursor cursor = LoggingQuery.query(db(), queryBuilder.toString(), queryBuilder.getArgs());
+        Cursor cursor = LoggingQuery.rawQuery(db(), queryBuilder.toString(), queryBuilder.getArgs());
         cursor.setNotificationUri(getContext().getContentResolver(), uri);
         return cursor;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java
index c4734d889..6e5c752f2 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppPrefsProvider.java
@@ -131,7 +131,7 @@ public class AppPrefsProvider extends FDroidProvider {
         query.addFields(projection);
         query.addOrderBy(sortOrder);
 
-        Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs());
+        Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
         cursor.setNotificationUri(getContext().getContentResolver(), uri);
         return cursor;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 6283ca3d2..d7188b48e 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -892,7 +892,7 @@ public class AppProvider extends FDroidProvider {
         query.addOrderBy(sortOrder);
         query.addLimit(limit);
 
-        Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs());
+        Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
         cursor.setNotificationUri(getContext().getContentResolver(), uri);
         return cursor;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java b/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java
index a78f53b1e..db45311e0 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/CategoryProvider.java
@@ -211,7 +211,7 @@ public class CategoryProvider extends FDroidProvider {
             query.setOnlyCategoriesWithApps();
         }
 
-        Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs());
+        Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
         cursor.setNotificationUri(getContext().getContentResolver(), uri);
         return cursor;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java b/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
index aaa1c06ab..881d1c707 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/LoggingQuery.java
@@ -161,7 +161,7 @@ final class LoggingQuery {
         return plan;
     }
 
-    public static Cursor query(SQLiteDatabase db, String query, String[] queryBuilderArgs) {
+    public static Cursor rawQuery(SQLiteDatabase db, String query, String[] queryBuilderArgs) {
         return new LoggingQuery(db, query, queryBuilderArgs).rawQuery();
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java b/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
index 3b4daee34..bd70850de 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/PackageProvider.java
@@ -138,7 +138,7 @@ public class PackageProvider extends FDroidProvider {
         query.addFields(projection);
         query.addOrderBy(sortOrder);
 
-        Cursor cursor = LoggingQuery.query(db(), query.toString(), query.getArgs());
+        Cursor cursor = LoggingQuery.rawQuery(db(), query.toString(), query.getArgs());
         cursor.setNotificationUri(getContext().getContentResolver(), uri);
         return cursor;
     }