From 6c1b277cabc37724f1c0321d920566389256d0ac Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Thu, 11 Aug 2016 23:10:54 +1000 Subject: [PATCH] Close cursors which previously were left dangling. --- .../main/java/org/fdroid/fdroid/data/DBHelper.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 8310a9a66..b352fee55 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -786,13 +786,19 @@ class DBHelper extends SQLiteOpenHelper { } private static boolean columnExists(SQLiteDatabase db, String table, String column) { - return db.rawQuery("select * from " + table + " limit 0,1", null) - .getColumnIndex(column) != -1; + Cursor cursor = db.rawQuery("select * from " + table + " limit 0,1", null); + boolean exists = cursor.getColumnIndex(column) != -1; + cursor.close(); + return exists; } private static boolean tableExists(SQLiteDatabase db, String table) { - return db.rawQuery("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?", - new String[] {table}).getCount() > 0; + Cursor cursor = db.query("sqlite_master", new String[] {"name"}, + "type = 'table' AND name = ?", new String[] {table}, null, null, null); + + boolean exists = cursor.getCount() > 0; + cursor.close(); + return exists; } }