From b400df3ac3b01d7ee5b2fd1bcf6ac6f3cea71c41 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 29 May 2019 14:50:30 +0200 Subject: [PATCH] remove unused 'projection' argument from ApkProvider.findApkFromAnyRepo() One small victory in the ever lasting battle against creeping complexity! --- .../org/fdroid/fdroid/data/ApkProvider.java | 9 ++------- .../org/fdroid/fdroid/data/ApkProviderTest.java | 17 ----------------- 2 files changed, 2 insertions(+), 24 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 00e6645fe..8d128568a 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java @@ -93,18 +93,13 @@ public class ApkProvider extends FDroidProvider { } public static Apk findApkFromAnyRepo(Context context, String packageName, int versionCode) { - return findApkFromAnyRepo(context, packageName, versionCode, null, Cols.ALL); + return findApkFromAnyRepo(context, packageName, versionCode, null); } public static Apk findApkFromAnyRepo(Context context, String packageName, int versionCode, String signature) { - return findApkFromAnyRepo(context, packageName, versionCode, signature, Cols.ALL); - } - - public static Apk findApkFromAnyRepo(Context context, String packageName, int versionCode, - @Nullable String signature, String[] projection) { final Uri uri = getApkFromAnyRepoUri(packageName, versionCode, signature); - return findByUri(context, uri, projection); + return findByUri(context, uri, Cols.ALL); } public static Apk findByUri(Context context, Uri uri, String[] projection) { diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java index e063e409b..7a62f82d1 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -392,23 +392,6 @@ public class ApkProviderTest extends FDroidProviderTest { assertEquals("xxxxyyyy", apk.hash); assertEquals("a hash type", apk.hashType); - String[] projection = { - Cols.Package.PACKAGE_NAME, - Cols.HASH, - }; - - Apk apkLessFields = ApkProvider.Helper.findApkFromAnyRepo(context, "com.example", 11, null, projection); - - assertNotNull(apkLessFields); - - assertEquals("com.example", apkLessFields.packageName); - assertEquals("xxxxyyyy", apkLessFields.hash); - - // Didn't ask for these fields, so should be their default values... - assertNull(apkLessFields.hashType); - assertNull(apkLessFields.versionName); - assertEquals(0, apkLessFields.versionCode); - Apk notFound = ApkProvider.Helper.findApkFromAnyRepo(context, "com.doesnt.exist", 1000); assertNull(notFound); }