Database

src/ch/spherIC/recurvebowsight/RBSMainActivity.java

@@ -56,9 +56,7 @@ public class RBSMainActivity extends Activity {
         setContentView(R.layout.rbs_main);
 
         RBSDatabaseHelper.setContext(this);
-
-        RBSDatabaseHelper helper = RBSDatabaseHelper.getInstance();
-        helper.getWritableDatabase();
+        RBSDatabaseHelper.getInstance().initializeDB();
 
         this.viewFlipper = (ViewFlipper) findViewById(R.id.viewFlipper);
         this.paramsScrollView = (ScrollView) findViewById(R.id.paramsScrollView);

src/ch/spherIC/recurvebowsight/database/RBSDatabaseHelper.java

@@ -37,6 +37,8 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
     private static RBSDatabaseHelper instance;
     private static Context context;
     private static String actualDBName = DB_NAME;
+    private SQLiteDatabase database;
+    private boolean databaseCreated = false;
 
 
     /**
@@ -65,12 +67,21 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
     }
 
     /**
-     * @param  context  the context to set
+     * @param  dbName  the database name to set
      */
     public static void setDB(final String dbName) {
         RBSDatabaseHelper.actualDBName = dbName;
     }
 
+
+    public void initializeDB() {
+        this.database = getWritableDatabase();
+
+        if (this.databaseCreated) {
+            insertMasterData();
+        }
+    }
+
     @Override
     public void onCreate(final SQLiteDatabase db) {
 
@@ -78,8 +89,7 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL(TblRBSRiser.getCreateStatement());
         db.execSQL(TblRBSSight.getCreateStatement());
         db.execSQL(TblRBSArcherySetup.getCreateStatement());
-
-        insertMasterData();
+        this.databaseCreated = true;
     }
 
     /**