Add dbFactory

Author: amitshekhariitbhu

debug-db-base/build.gradle

@@ -39,7 +39,6 @@ android {
 
 dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
     implementation 'android.arch.persistence.room:runtime:1.1.1'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     testImplementation 'junit:junit:4.12'

debug-db-base/src/main/java/com/amitshekhar/DebugDB.java

@@ -25,6 +25,7 @@
 import android.util.Pair;
 
 import com.amitshekhar.server.ClientServer;
+import com.amitshekhar.sqlite.DBFactory;
 import com.amitshekhar.utils.NetworkUtils;
 
 import java.io.File;
@@ -45,7 +46,7 @@ private DebugDB() {
         // This class in not publicly instantiable
     }
 
-    public static void initialize(Context context) {
+    public static void initialize(Context context, DBFactory dbFactory) {
         int portNumber;
 
         try {
@@ -56,7 +57,7 @@ public static void initialize(Context context) {
             Log.i(TAG, "Using Default port : " + DEFAULT_PORT);
         }
 
-        clientServer = new ClientServer(context, portNumber);
+        clientServer = new ClientServer(context, portNumber, dbFactory);
         clientServer.start();
         addressLog = NetworkUtils.getAddressLog(context, portNumber);
         Log.d(TAG, addressLog);

debug-db-base/src/main/java/com/amitshekhar/server/ClientServer.java

@@ -23,12 +23,13 @@
  * Created by amitshekhar on 15/11/16.
  */
 
-
 import android.arch.persistence.db.SupportSQLiteDatabase;
 import android.content.Context;
 import android.util.Log;
 import android.util.Pair;
 
+import com.amitshekhar.sqlite.DBFactory;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -45,8 +46,8 @@ public class ClientServer implements Runnable {
     private boolean mIsRunning;
     private ServerSocket mServerSocket;
 
-    public ClientServer(Context context, int port) {
-        mRequestHandler = new RequestHandler(context);
+    public ClientServer(Context context, int port, DBFactory dbFactory) {
+        mRequestHandler = new RequestHandler(context, dbFactory);
         mPort = port;
     }
 

debug-db-base/src/main/java/com/amitshekhar/server/RequestHandler.java

@@ -30,7 +30,7 @@
 import com.amitshekhar.model.RowDataRequest;
 import com.amitshekhar.model.TableDataResponse;
 import com.amitshekhar.model.UpdateRowResponse;
-import com.amitshekhar.sqlite.DebugSQLiteDB;
+import com.amitshekhar.sqlite.DBFactory;
 import com.amitshekhar.sqlite.InMemoryDebugSQLiteDB;
 import com.amitshekhar.sqlite.SQLiteDB;
 import com.amitshekhar.utils.Constants;
@@ -42,8 +42,6 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
-import net.sqlcipher.database.SQLiteDatabase;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -63,17 +61,19 @@ public class RequestHandler {
     private final Context mContext;
     private final Gson mGson;
     private final AssetManager mAssets;
+    private final DBFactory mDbFactory;
     private boolean isDbOpened;
     private SQLiteDB sqLiteDB;
     private HashMap<String, Pair<File, String>> mDatabaseFiles;
     private HashMap<String, Pair<File, String>> mCustomDatabaseFiles;
     private String mSelectedDatabase = null;
     private HashMap<String, SupportSQLiteDatabase> mRoomInMemoryDatabases = new HashMap<>();
 
-    public RequestHandler(Context context) {
+    public RequestHandler(Context context, DBFactory dbFactory) {
         mContext = context;
         mAssets = context.getResources().getAssets();
         mGson = new GsonBuilder().serializeNulls().create();
+        mDbFactory = dbFactory;
     }
 
     public void handle(Socket socket) throws IOException {
@@ -184,8 +184,7 @@ private void openDatabase(String database) {
         } else {
             File databaseFile = mDatabaseFiles.get(database).first;
             String password = mDatabaseFiles.get(database).second;
-            SQLiteDatabase.loadLibs(mContext);
-            sqLiteDB = new DebugSQLiteDB(SQLiteDatabase.openOrCreateDatabase(databaseFile.getAbsolutePath(), password, null));
+            sqLiteDB = mDbFactory.create(mContext, databaseFile.getAbsolutePath(), password);
         }
         isDbOpened = true;
     }

debug-db-base/src/main/java/com/amitshekhar/sqlite/DBFactory.java

@@ -0,0 +1,9 @@
+package com.amitshekhar.sqlite;
+
+import android.content.Context;
+
+public interface DBFactory {
+
+    SQLiteDB create(Context context, String path, String password);
+
+}

debug-db-encrypt/build.gradle

@@ -19,6 +19,7 @@ android {
 
 dependencies {
     implementation project(':debug-db-base')
+    implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

debug-db-encrypt/src/main/java/com/amitshekhar/debug/encrypt/DebugDBEncryptInitProvider.java

@@ -8,6 +8,7 @@
 import android.net.Uri;
 
 import com.amitshekhar.DebugDB;
+import com.amitshekhar.debug.encrypt.sqlite.DebugDBEncryptFactory;
 
 public class DebugDBEncryptInitProvider extends ContentProvider {
 
@@ -17,7 +18,7 @@ public DebugDBEncryptInitProvider() {
 
     @Override
     public boolean onCreate() {
-        DebugDB.initialize(getContext());
+        DebugDB.initialize(getContext(), new DebugDBEncryptFactory());
         return true;
     }
 

debug-db-encrypt/src/main/java/com/amitshekhar/debug/encrypt/sqlite/DebugDBEncryptFactory.java

@@ -0,0 +1,18 @@
+package com.amitshekhar.debug.encrypt.sqlite;
+
+import android.content.Context;
+
+import com.amitshekhar.sqlite.DBFactory;
+import com.amitshekhar.sqlite.SQLiteDB;
+
+import net.sqlcipher.database.SQLiteDatabase;
+
+public class DebugDBEncryptFactory implements DBFactory {
+
+    @Override
+    public SQLiteDB create(Context context, String path, String password) {
+        SQLiteDatabase.loadLibs(context);
+        return new DebugEncryptSQLiteDB(SQLiteDatabase.openOrCreateDatabase(path, password, null));
+    }
+
+}

debug-db-encrypt/src/main/java/com/amitshekhar/debug/encrypt/sqlite/DebugEncryptSQLiteDB.java

@@ -0,0 +1,62 @@
+package com.amitshekhar.debug.encrypt.sqlite;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.SQLException;
+
+import com.amitshekhar.sqlite.SQLiteDB;
+
+import net.sqlcipher.database.SQLiteDatabase;
+
+/**
+ * Created by anandgaurav on 12/02/18.
+ */
+
+public class DebugEncryptSQLiteDB implements SQLiteDB {
+
+    private final SQLiteDatabase database;
+
+    public DebugEncryptSQLiteDB(SQLiteDatabase database) {
+        this.database = database;
+    }
+
+    @Override
+    public int delete(String table, String whereClause, String[] whereArgs) {
+        return database.delete(table, whereClause, whereArgs);
+    }
+
+    @Override
+    public boolean isOpen() {
+        return database.isOpen();
+    }
+
+    @Override
+    public void close() {
+        database.close();
+    }
+
+    @Override
+    public Cursor rawQuery(String sql, String[] selectionArgs) {
+        return database.rawQuery(sql, selectionArgs);
+    }
+
+    @Override
+    public void execSQL(String sql) throws SQLException {
+        database.execSQL(sql);
+    }
+
+    @Override
+    public long insert(String table, String nullColumnHack, ContentValues values) {
+        return database.insert(table, nullColumnHack, values);
+    }
+
+    @Override
+    public int update(String table, ContentValues values, String whereClause, String[] whereArgs) {
+        return database.update(table, values, whereClause, whereArgs);
+    }
+
+    @Override
+    public int getVersion() {
+        return database.getVersion();
+    }
+}

debug-db/src/main/java/com/amitshekhar/debug/DebugDBInitProvider.java

@@ -27,6 +27,7 @@
 import android.net.Uri;
 
 import com.amitshekhar.DebugDB;
+import com.amitshekhar.debug.sqlite.DebugDBFactory;
 
 /**
  * Created by amitshekhar on 16/11/16.
@@ -40,7 +41,7 @@ public DebugDBInitProvider() {
 
     @Override
     public boolean onCreate() {
-        DebugDB.initialize(getContext());
+        DebugDB.initialize(getContext(), new DebugDBFactory());
         return true;
     }