return to original resValues

debug-db-base/build.gradle

@@ -27,6 +27,8 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        resValue("string", "PORT_NUMBER", "8080")
+        resValue("string", "BASIC_AUTH_ADMIN_PW", "")
     }
     buildTypes {
         release {

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

@@ -39,6 +39,7 @@
 public class DebugDB {
 
     private static final String TAG = DebugDB.class.getSimpleName();
+    private static final int DEFAULT_PORT = 8080;
     private static ClientServer clientServer;
     private static String addressLog = "not available";
 
@@ -47,8 +48,15 @@ private DebugDB() {
     }
 
     public static void initialize(Context context, DBFactory dbFactory) {
-        int portNumber = Settings.PORT;
-
+        int portNumber;
+
+        try {
+            portNumber = Integer.valueOf(context.getString(R.string.PORT_NUMBER));
+        } catch (NumberFormatException ex) {
+            Log.e(TAG, "PORT_NUMBER should be integer", ex);
+            portNumber = DEFAULT_PORT;
+            Log.i(TAG, "Using Default port : " + DEFAULT_PORT);
+        }
         clientServer = new ClientServer(context, portNumber, dbFactory);
         clientServer.start();
         addressLog = NetworkUtils.getAddressLog(context, portNumber);

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

@@ -38,7 +38,7 @@
 import com.amitshekhar.utils.DatabaseFileProvider;
 import com.amitshekhar.utils.DatabaseHelper;
 import com.amitshekhar.utils.PrefHelper;
-import com.amitshekhar.utils.Settings;
+import com.amitshekhar.utils.ResourceManager;
 import com.amitshekhar.utils.Utils;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -80,7 +80,10 @@ public RequestHandler(Context context, DBFactory dbFactory) {
         mGson = new GsonBuilder().serializeNulls().create();
         mDbFactory = dbFactory;
 
-        basicAuthAdminPW = Settings.BASIC_AUTH_ADMIN_PW;
+        basicAuthAdminPW = ResourceManager.getResourceString(context, "BASIC_AUTH_ADMIN_PW");
+        if (basicAuthAdminPW == null) {
+            basicAuthAdminPW = "";
+        }
     }
 
     public boolean checkHeader(PrintStream output, List<String> lines) {
@@ -145,7 +148,7 @@ public void handle(Socket socket) throws IOException {
             // Output stream that we send the response to
             output = new PrintStream(socket.getOutputStream());
 
-            if (basicAuthAdminPW != null && !checkHeader(output, lines)) {
+            if (!basicAuthAdminPW.isEmpty() && !checkHeader(output, lines)) {
                 return;
             }
 

debug-db-base/src/main/java/com/amitshekhar/utils/ResourceManager.java

@@ -0,0 +1,16 @@
+package com.amitshekhar.utils;
+
+import android.content.Context;
+
+public class ResourceManager {
+
+    public static String getResourceString(Context context, String resourceName) {
+        int resourceId = context.getResources().getIdentifier(resourceName, "string", context.getPackageName());
+        if (resourceId != 0) {
+            return context.getString(resourceId);
+        } else {
+            return null;
+        }
+    }
+
+}