diff options
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java | 14 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java index 5ff3f70df..e82252310 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java @@ -308,7 +308,6 @@ public class PodDBAdapter { KEY_CONTENT_ENCODED, KEY_FEED}; private static Context context; - private static PodDBHelper dbHelper; private static volatile SQLiteDatabase db; private static int counter = 0; @@ -317,13 +316,14 @@ public class PodDBAdapter { PodDBAdapter.context = context.getApplicationContext(); } - private static class PodDBHelperholder { - public static final PodDBHelper dbHelper = new PodDBHelper(PodDBAdapter.context, DATABASE_NAME, null); + // Bill Pugh Singleton Implementation + private static class SingletonHolder { + private static final PodDBHelper dbHelper = new PodDBHelper(PodDBAdapter.context, DATABASE_NAME, null); + private static final PodDBAdapter dbAdapter = new PodDBAdapter(); } public static PodDBAdapter getInstance() { - dbHelper = PodDBHelperholder.dbHelper; - return new PodDBAdapter(); + return SingletonHolder.dbAdapter; } private PodDBAdapter() { @@ -342,11 +342,11 @@ public class PodDBAdapter { private SQLiteDatabase openDb() { SQLiteDatabase newDb; try { - newDb = dbHelper.getWritableDatabase(); + newDb = SingletonHolder.dbHelper.getWritableDatabase(); newDb.enableWriteAheadLogging(); } catch (SQLException ex) { Log.e(TAG, Log.getStackTraceString(ex)); - newDb = dbHelper.getReadableDatabase(); + newDb = SingletonHolder.dbHelper.getReadableDatabase(); } return newDb; } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index f0eed3e38..aa36eab33 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -182,6 +182,8 @@ <string name="download_failed">failed</string> <string name="download_pending">Download pending</string> <string name="download_running">Download running</string> + <string name="download_error_details">Details</string> + <string name="download_error_details_message">%1$s \n\nFile URL:\n%2$s</string> <string name="download_error_device_not_found">Storage Device not found</string> <string name="download_error_insufficient_space">Insufficient Space</string> <string name="download_error_file_error">File Error</string> @@ -475,8 +477,8 @@ <string name="html_export_label">HTML export</string> <string name="exporting_label">Exporting…</string> <string name="export_error_label">Export error</string> - <string name="opml_export_success_title">OPML Export successful.</string> - <string name="opml_export_success_sum">The .opml file was written to:\u0020</string> + <string name="export_success_title">Export successful</string> + <string name="export_success_sum">The exported file was written to:\n\n%1$s</string> <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string> <!-- Sleep timer --> |