fix #2467: recreate database if it cannot be opened

1 files changed, 14 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 4543451..11efbd2 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -296,11 +296,24 @@ public class DataStore {
             return;
         }
 
+        final DbHelper dbHelper = new DbHelper(new DBContext(CgeoApplication.getInstance()));
         try {
-            final DbHelper dbHelper = new DbHelper(new DBContext(CgeoApplication.getInstance()));
             database = dbHelper.getWritableDatabase();
         } catch (Exception e) {
             Log.e("DataStore.init: unable to open database for R/W", e);
+            // Attempt to recreate the database if opening has failed
+            final File path = databasePath();
+            final File corruptedPath = new File(path + ".corrupted");
+                if (path.renameTo(corruptedPath)) {
+                    Log.i("DataStore.init: renamed " + path + " into " + corruptedPath);
+                    try {
+                        database = dbHelper.getWritableDatabase();
+                    } catch (Exception f) {
+                        Log.e("DataStore.init: unable to recreate database and open it for R/W", f);
+                    }
+                } else {
+                    Log.e("DataStore.init: unable to rename corrupted database");
+                }
         }
     }