update usage doc and make BriteDatabase singleton

Author: lykmapipo

README.md

@@ -53,7 +53,6 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        database = SQLBriteOpenHelper.get(getApplicationContext(), "brite", 1);
         adapter = new BriteAdapter(getApplicationContext());
         listView = (ListView) findViewById(R.id.list);
         listView.setAdapter(adapter);
@@ -62,6 +61,9 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
+
+        database = SQLBriteOpenHelper.get(getApplicationContext(), "brite", 1);
+
         subscription = database.createQuery("brites", "SELECT * FROM brites")
                 .mapToList(Brite.MAPPER)
                 .subscribeOn(Schedulers.io())

app/src/main/java/com/github/lykmapipo/sqlbrite/migrations/sample/MainActivity.java

@@ -21,7 +21,6 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        database = SQLBriteOpenHelper.get(getApplicationContext(), "brite", 1);
         adapter = new BriteAdapter(getApplicationContext());
         listView = (ListView) findViewById(R.id.list);
         listView.setAdapter(adapter);
@@ -30,6 +29,9 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onResume() {
         super.onResume();
+
+        database = SQLBriteOpenHelper.get(getApplicationContext(), "brite", 1);
+
         subscription = database.createQuery("brites", "SELECT * FROM brites")
                 .mapToList(Brite.MAPPER)
                 .subscribeOn(Schedulers.io())

library/src/main/java/com/github/lykmapipo/sqlbrite/migrations/SQLBriteOpenHelper.java

@@ -31,10 +31,10 @@
  */
 public class SQLBriteOpenHelper extends SQLiteOpenHelper {
 
-    private static final String TAG = SQLBriteOpenHelper.class.getSimpleName();
     private String migrationDir = "migrations";
     private Context context;
     private boolean isOnTestMode = false;
+    private static BriteDatabase briteDatabase;
 
 
     /**
@@ -91,9 +91,11 @@ public SQLBriteOpenHelper(Context context, String name, int version, boolean tes
      * @see BriteDatabase
      */
     public synchronized static BriteDatabase get(Context context, String name, int version) {
-        SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, null, version);
-        SqlBrite sqlBrite = new SqlBrite.Builder().build();
-        BriteDatabase briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        if (briteDatabase == null) {
+            SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, null, version);
+            SqlBrite sqlBrite = new SqlBrite.Builder().build();
+            briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        }
         return briteDatabase;
     }
 
@@ -109,9 +111,11 @@ public synchronized static BriteDatabase get(Context context, String name, int v
      */
     public synchronized static BriteDatabase get(Context context, String name,
                                                  SQLiteDatabase.CursorFactory factory, int version) {
-        SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, factory, version);
-        SqlBrite sqlBrite = new SqlBrite.Builder().build();
-        BriteDatabase briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        if (briteDatabase == null) {
+            SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, factory, version);
+            SqlBrite sqlBrite = new SqlBrite.Builder().build();
+            briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        }
         return briteDatabase;
     }
 
@@ -127,9 +131,11 @@ public synchronized static BriteDatabase get(Context context, String name,
      */
     public synchronized static BriteDatabase get(Context context, String name,
                                                  SQLiteDatabase.CursorFactory factory, int version, DatabaseErrorHandler errorHandler) {
-        SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, factory, version, errorHandler);
-        SqlBrite sqlBrite = new SqlBrite.Builder().build();
-        BriteDatabase briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        if (briteDatabase == null) {
+            SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, factory, version, errorHandler);
+            SqlBrite sqlBrite = new SqlBrite.Builder().build();
+            briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.io());
+        }
         return briteDatabase;
     }
 
@@ -143,6 +149,7 @@ public synchronized static BriteDatabase get(Context context, String name,
      * @see BriteDatabase
      */
     public synchronized static BriteDatabase get(Context context, String name, int version, boolean testing) {
+        //always return new instance on test mode
         SQLBriteOpenHelper sqlBriteOpenHelper = new SQLBriteOpenHelper(context, name, version, testing);
         SqlBrite sqlBrite = new SqlBrite.Builder().build();
         BriteDatabase briteDatabase = sqlBrite.wrapDatabaseHelper(sqlBriteOpenHelper, Schedulers.immediate());