Fix dangling read-only db connections

1 files changed, 18 insertions, 9 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java b/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java
index 859c32dd..f6a1714c 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java
@@ -177,9 +177,12 @@ public class SongDBHandler extends SQLiteOpenHelper {
 			dates[0] = cursor.getLong(0);
 			dates[1] = cursor.getLong(1);
 			return dates;
-		} catch(Exception e) {}
-
-		return null;
+		} catch(Exception e) {
+			return null;
+		}
+		finally {
+			db.close();
+		}
 	}
 
 	public synchronized Pair<Integer, String> getOnlineSongId(MusicDirectory.Entry entry) {
@@ -218,9 +221,12 @@ public class SongDBHandler extends SQLiteOpenHelper {
 		try {
 			cursor.moveToFirst();
 			return new Pair(cursor.getInt(0), cursor.getString(1));
-		} catch(Exception e) {}
-
-		return null;
+		} catch(Exception e) {
+			return null;
+		}
+		finally {
+			db.close();
+		}
 	}
 	public synchronized Pair<Integer, String> getIdFromPath(int serverKey, String path) {
 		SQLiteDatabase db = this.getReadableDatabase();
@@ -231,9 +237,12 @@ public class SongDBHandler extends SQLiteOpenHelper {
 		try {
 			cursor.moveToFirst();
 			return new Pair(cursor.getInt(0), cursor.getString(1));
-		} catch(Exception e) {}
-
-		return null;
+		} catch(Exception e) {
+			return null;
+		}
+		finally {
+			db.close();
+		}
 	}
 
 	public static SongDBHandler getHandler(Context context) {