From 05aa6a39fa1b53842c8c70229e28f4521e6d73aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Apr 2015 17:04:51 +0200
Subject: [PATCH] Small cursor null, count and close()

---
 F-Droid/src/org/fdroid/fdroid/UpdateService.java |  7 +++++--
 .../src/org/fdroid/fdroid/data/AppProvider.java  |  8 +++++---
 .../fdroid/fdroid/data/InstalledAppProvider.java | 16 +++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index b0d52123d..107818270 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -493,8 +493,11 @@ public class UpdateService extends IntentService implements ProgressListener {
                 AppProvider.getCanUpdateUri(),
                 AppProvider.DataColumns.ALL,
                 null, null, null);
-        if (cursor.getCount() > 0) {
-            showAppUpdatesNotification(cursor);
+        if (cursor != null) {
+            if (cursor.getCount() > 0) {
+                showAppUpdatesNotification(cursor);
+            }
+            cursor.close();
         }
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index 83756784a..e55336f4e 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -24,9 +24,11 @@ public class AppProvider extends FDroidProvider {
             final String[] projection = { AppProvider.DataColumns._COUNT };
             Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null);
             int count = 0;
-            if (cursor != null && cursor.getCount() == 1) {
-                cursor.moveToFirst();
-                count = cursor.getInt(0);
+            if (cursor != null) {
+                if (cursor.getCount() == 1) {
+                    cursor.moveToFirst();
+                    count = cursor.getInt(0);
+                }
                 cursor.close();
             }
             return count;
diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
index 17f55cbfc..4f14c5972 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
@@ -34,13 +34,15 @@ public class InstalledAppProvider extends FDroidProvider {
             final String[] projection = InstalledAppProvider.DataColumns.ALL;
             Cursor cursor = context.getContentResolver().query(uri, projection, null, null, null);
             if (cursor != null) {
-                cursor.moveToFirst();
-                while (!cursor.isAfterLast()) {
-                    cachedInfo.put(
-                        cursor.getString(cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)),
-                        cursor.getInt(cursor.getColumnIndex(InstalledAppProvider.DataColumns.VERSION_CODE))
-                    );
-                    cursor.moveToNext();
+                if (cursor.getCount() > 0) {
+                    cursor.moveToFirst();
+                    while (!cursor.isAfterLast()) {
+                        cachedInfo.put(
+                            cursor.getString(cursor.getColumnIndex(InstalledAppProvider.DataColumns.APP_ID)),
+                            cursor.getInt(cursor.getColumnIndex(InstalledAppProvider.DataColumns.VERSION_CODE))
+                        );
+                        cursor.moveToNext();
+                    }
                 }
                 cursor.close();
             }