From a4de616b7af47f8aad83254c77c45261f01de529 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 18 Feb 2014 16:41:28 -0500
Subject: [PATCH] make ApkProvider.Helper take Context rather than
 ContentResolver

This makes the code a bit neater, and passing the Context around is a
common pattern.

https://dev.guardianproject.info/issues/2926
refs #2926
---
 src/org/fdroid/fdroid/AppDetails.java       |  2 +-
 src/org/fdroid/fdroid/UpdateService.java    |  2 +-
 src/org/fdroid/fdroid/data/ApkProvider.java | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 330201416..bd4c17030 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -92,7 +92,7 @@ public class AppDetails extends ListActivity {
 
         public ApkListAdapter(Context context, App app) {
             super(context, 0);
-            List<Apk> apks = ApkProvider.Helper.findByApp(context.getContentResolver(), app.id);
+            List<Apk> apks = ApkProvider.Helper.findByApp(context, app.id);
             for (Apk apk : apks ) {
                 if (apk.compatible || pref_incompatibleVersions) {
                     add(apk);
diff --git a/src/org/fdroid/fdroid/UpdateService.java b/src/org/fdroid/fdroid/UpdateService.java
index 6f71da16b..7baf088ac 100644
--- a/src/org/fdroid/fdroid/UpdateService.java
+++ b/src/org/fdroid/fdroid/UpdateService.java
@@ -545,7 +545,7 @@ public class UpdateService extends IntentService implements ProgressListener {
             ApkProvider.DataColumns.VERSION,
             ApkProvider.DataColumns.VERSION_CODE
         };
-        return ApkProvider.Helper.knownApks(getContentResolver(), apks, fields);
+        return ApkProvider.Helper.knownApks(this, apks, fields);
     }
 
     private void updateOrInsertApps(List<App> appsToUpdate, int totalUpdateCount, int currentCount) {
diff --git a/src/org/fdroid/fdroid/data/ApkProvider.java b/src/org/fdroid/fdroid/data/ApkProvider.java
index 6c9afbdeb..e86deb5a1 100644
--- a/src/org/fdroid/fdroid/data/ApkProvider.java
+++ b/src/org/fdroid/fdroid/data/ApkProvider.java
@@ -111,12 +111,13 @@ public class ApkProvider extends FDroidProvider {
             resolver.delete(uri, null, null);
         }
 
-        public static List<Apk> findByApp(ContentResolver resolver, String appId) {
-            return findByApp(resolver, appId, ApkProvider.DataColumns.ALL);
+        public static List<Apk> findByApp(Context context, String appId) {
+            return findByApp(context, appId, ApkProvider.DataColumns.ALL);
         }
 
-        public static List<Apk> findByApp(ContentResolver resolver,
+        public static List<Apk> findByApp(Context context,
                                           String appId, String[] projection) {
+            ContentResolver resolver = context.getContentResolver();
             Uri uri = getAppUri(appId);
             String sort = ApkProvider.DataColumns.VERSION_CODE + " DESC";
             Cursor cursor = resolver.query(uri, projection, null, null, sort);
@@ -127,8 +128,9 @@ public class ApkProvider extends FDroidProvider {
          * Returns apks in the database, which have the same id and version as
          * one of the apks in the "apks" argument.
          */
-        public static List<Apk> knownApks(ContentResolver resolver,
+        public static List<Apk> knownApks(Context context,
                                              List<Apk> apks, String[] fields) {
+            ContentResolver resolver = context.getContentResolver();
             Uri uri = getContentUri(apks);
             Cursor cursor = resolver.query(uri, fields, null, null, null);
             return cursorToList(cursor);