Simplify setCustomDatabaseFiles

Author: amitshekhariitbhu

app/src/main/java/com/sample/ExternalDatabaseFileProvider.java

@@ -95,6 +95,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 extTestDBHelper.insertTest(value);
             }
         }
+
+        Utils.setCustomDatabaseFiles(getApplicationContext());
     }
 
     public void showDebugDbAddress(View view) {

app/src/main/java/com/sample/MainActivity.java

@@ -23,8 +23,11 @@
 import android.widget.Toast;
 
 import com.sample.BuildConfig;
+import com.sample.database.ExtTestDBHelper;
 
+import java.io.File;
 import java.lang.reflect.Method;
+import java.util.HashMap;
 
 /**
  * Created by amitshekhar on 07/02/17.
@@ -48,4 +51,23 @@ public static void showDebugDBAddressLogToast(Context context) {
             }
         }
     }
+
+    public static void setCustomDatabaseFiles(Context context) {
+        if (BuildConfig.DEBUG) {
+            try {
+                Class<?> debugDB = Class.forName("com.amitshekhar.DebugDB");
+                Class[] argTypes = new Class[]{HashMap.class};
+                Method setCustomDatabaseFiles = debugDB.getMethod("setCustomDatabaseFiles", argTypes);
+                HashMap<String, File> customDatabaseFiles = new HashMap<>();
+                // set custom database files
+                customDatabaseFiles.put(ExtTestDBHelper.DATABASE_NAME,
+                        new File(context.getFilesDir() + "/" + ExtTestDBHelper.DIR_NAME +
+                                "/" + ExtTestDBHelper.DATABASE_NAME));
+                setCustomDatabaseFiles.invoke(null, customDatabaseFiles);
+            } catch (Exception ignore) {
+
+            }
+        }
+    }
+
 }

app/src/main/java/com/sample/utils/Utils.java

@@ -25,6 +25,10 @@
 import com.amitshekhar.server.ClientServer;
 import com.amitshekhar.utils.NetworkUtils;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Created by amitshekhar on 15/11/16.
  */
@@ -68,6 +72,12 @@ public static void shutDown() {
             clientServer = null;
         }
     }
+
+    public static void setCustomDatabaseFiles(HashMap<String, File> customDatabaseFiles){
+        if(clientServer!=null){
+            clientServer.setCustomDatabaseFiles(customDatabaseFiles);
+        }
+    }
 
     public static boolean isServerRunning() {
         return clientServer != null && clientServer.isRunning();

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

@@ -27,10 +27,13 @@
 import android.content.Context;
 import android.util.Log;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ClientServer implements Runnable {
 
@@ -84,6 +87,10 @@ public void run() {
         }
     }
 
+    public void setCustomDatabaseFiles(HashMap<String, File> customDatabaseFiles){
+            mRequestHandler.setCustomDatabaseFiles(customDatabaseFiles);
+    }
+
     public boolean isRunning() {
         return mIsRunning;
     }

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

@@ -30,7 +30,7 @@
 import com.amitshekhar.model.TableDataResponse;
 import com.amitshekhar.model.UpdateRowResponse;
 import com.amitshekhar.utils.Constants;
-import com.amitshekhar.utils.InternalDatabaseFileProvider;
+import com.amitshekhar.utils.DatabaseFileProvider;
 import com.amitshekhar.utils.DatabaseHelper;
 import com.amitshekhar.utils.PrefHelper;
 import com.amitshekhar.utils.Utils;
@@ -59,7 +59,8 @@ public class RequestHandler {
     private final AssetManager mAssets;
     private boolean isDbOpened;
     private SQLiteDatabase mDatabase;
-    private HashMap<String, File> databaseFiles;
+    private HashMap<String, File> mDatabaseFiles;
+    private HashMap<String, File> mCustomDatabaseFiles;
     private String mSelectedDatabase = null;
 
     public RequestHandler(Context context) {
@@ -117,7 +118,7 @@ public void handle(Socket socket) throws IOException {
                 final String response = executeQueryAndGetResponse(route);
                 bytes = response.getBytes();
             } else if (route.startsWith("downloadDb")) {
-                bytes = Utils.getDatabase(mSelectedDatabase, databaseFiles);
+                bytes = Utils.getDatabase(mSelectedDatabase, mDatabaseFiles);
             } else {
                 bytes = Utils.loadContent(route, mAssets);
             }
@@ -153,14 +154,18 @@ public void handle(Socket socket) throws IOException {
         }
     }
 
+    public void setCustomDatabaseFiles(HashMap<String, File> customDatabaseFiles){
+        mCustomDatabaseFiles = customDatabaseFiles;
+    }
+
     private void writeServerError(PrintStream output) {
         output.println("HTTP/1.0 500 Internal Server Error");
         output.flush();
     }
 
     private void openDatabase(String database) {
         closeDatabase();
-        File databaseFile = databaseFiles.get(database);
+        File databaseFile = mDatabaseFiles.get(database);
         mDatabase = SQLiteDatabase.openOrCreateDatabase(databaseFile.getAbsolutePath(), null);
         isDbOpened = true;
     }
@@ -174,10 +179,13 @@ private void closeDatabase() {
     }
 
     private String getDBListResponse() {
-        databaseFiles = InternalDatabaseFileProvider.getDatabaseFiles(mContext);
+        mDatabaseFiles = DatabaseFileProvider.getDatabaseFiles(mContext);
+        if(mCustomDatabaseFiles!=null){
+            mDatabaseFiles.putAll(mCustomDatabaseFiles);
+        }
         Response response = new Response();
-        if (databaseFiles != null) {
-            for (HashMap.Entry<String, File> entry : databaseFiles.entrySet()) {
+        if (mDatabaseFiles != null) {
+            for (HashMap.Entry<String, File> entry : mDatabaseFiles.entrySet()) {
                 response.rows.add(entry.getKey());
             }
         }

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

@@ -1,37 +1,50 @@
+/*
+ *
+ *  *    Copyright (C) 2016 Amit Shekhar
+ *  *    Copyright (C) 2011 Android Open Source Project
+ *  *
+ *  *    Licensed under the Apache License, Version 2.0 (the "License");
+ *  *    you may not use this file except in compliance with the License.
+ *  *    You may obtain a copy of the License at
+ *  *
+ *  *        http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *    Unless required by applicable law or agreed to in writing, software
+ *  *    distributed under the License is distributed on an "AS IS" BASIS,
+ *  *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *    See the License for the specific language governing permissions and
+ *  *    limitations under the License.
+ *
+ */
+
 package com.amitshekhar.utils;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 
 import java.io.File;
-import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
 
-public abstract class DatabaseFileProvider {
+/**
+ * Created by amitshekhar on 06/02/17.
+ */
 
-    public static final String METADATA_TAG = "DatabaseFileProvider";
-    protected final Context context;
+public class DatabaseFileProvider {
 
-    public DatabaseFileProvider(Context context) {
-        this.context = context;
+    private DatabaseFileProvider() {
+        // This class in not publicly instantiable
     }
 
-    public static DatabaseFileProvider fromMetadata(Context context) {
-        DatabaseFileProvider databaseFileProvider = null;
+    public static HashMap<String, File> getDatabaseFiles(Context context) {
+        HashMap<String, File> databaseFiles = new HashMap<>();
         try {
-            ApplicationInfo appInfo = context.getPackageManager()
-                    .getApplicationInfo(context.getPackageName(),
-                            PackageManager.GET_META_DATA);
-            String className = appInfo.metaData.getString(METADATA_TAG);
-            if (className != null) {
-                Class<DatabaseFileProvider> databaseFileProviderClass = (Class<DatabaseFileProvider>) Class.forName(className);
-                databaseFileProvider = databaseFileProviderClass.getConstructor(Context.class).newInstance(context);
+            for (String databaseName : context.databaseList()) {
+                databaseFiles.put(databaseName, context.getDatabasePath(databaseName));
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return databaseFileProvider;
+        return databaseFiles;
     }
 
-    protected abstract Map<String, File> getDatabaseFiles();
 }