From 3b41287cf7c495ef2a3ecb60136879dcdc12ac0d Mon Sep 17 00:00:00 2001 From: Peter Serwylo <peter@serwylo.com> Date: Tue, 1 Aug 2017 13:02:35 +1000 Subject: [PATCH] Remove unused methods. There are two methods which allow callers to choose which fields to return. These were originally added for performance, so you only ask for what you need. However empirically the performance gain doesn't mean anything, because it is dwarfed by the query that was just executed. However, it does open the code up to bugs because we forget to ask for the right fields. So now it just returns all fields when querying for apks. --- .../java/org/fdroid/fdroid/data/ApkProvider.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 290e6674d..2b59e139d 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java @@ -114,14 +114,10 @@ public class ApkProvider extends FDroidProvider { } public static List<Apk> findByPackageName(Context context, String packageName) { - return findByPackageName(context, packageName, Cols.ALL); - } - - public static List<Apk> findByPackageName(Context context, String packageName, String[] projection) { ContentResolver resolver = context.getContentResolver(); final Uri uri = getAppUri(packageName); final String sort = "apk." + Cols.VERSION_CODE + " DESC"; - Cursor cursor = resolver.query(uri, projection, null, null, sort); + Cursor cursor = resolver.query(uri, Cols.ALL, null, null, sort); return cursorToList(cursor); } @@ -153,13 +149,8 @@ public class ApkProvider extends FDroidProvider { } public static Apk get(Context context, Uri uri) { - return get(context, uri, Cols.ALL); - } - - @Nullable - public static Apk get(Context context, Uri uri, String[] fields) { ContentResolver resolver = context.getContentResolver(); - Cursor cursor = resolver.query(uri, fields, null, null, null); + Cursor cursor = resolver.query(uri, Cols.ALL, null, null, null); return cursorToApk(cursor); }