Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't close db

Browse Source
This commit is contained in:
Martin Fietz 2015-12-28 23:33:14 +01:00
parent b115d4add4
commit a5b0cb2ad7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
View File

@ -10,7 +10,6 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -310,15 +309,11 @@ public class PodDBAdapter {
private PodDBAdapter() {} private PodDBAdapter() {}
public synchronized PodDBAdapter open() { public PodDBAdapter open() {
counter++;
if (db == null || !db.isOpen() || db.isReadOnly()) { if (db == null || !db.isOpen() || db.isReadOnly()) {
Log.v(TAG, "Opening DB"); Log.v(TAG, "Opening DB");
try { try {
db = dbHelper.getWritableDatabase(); db = dbHelper.getWritableDatabase();
if(Build.VERSION.SDK_INT >= 11) {
db.enableWriteAheadLogging();
}
} catch (SQLException ex) { } catch (SQLException ex) {
Log.e(TAG, Log.getStackTraceString(ex)); Log.e(TAG, Log.getStackTraceString(ex));
db = dbHelper.getReadableDatabase(); db = dbHelper.getReadableDatabase();
@ -327,13 +322,8 @@ public class PodDBAdapter {
return this; return this;
} }
public synchronized void close() { public void close() {
counter--; // do nothing
if(counter == 0) {
Log.v(TAG, "Closing DB");
db.close();
db = null;
}
} }
public static boolean deleteDatabase() { public static boolean deleteDatabase() {