Replace psiphon_config with stub and make it so test config will be excluded from source control; add DatastoreFilename to config

.gitignore

@@ -1,3 +1,5 @@
+# Exclude test config files from source control
+/AndroidApp/app/src/main/res/raw/psiphon_config
 psiphon.config
 psiphon.db*
 

AndroidApp/README.md

@@ -23,4 +23,4 @@ Psiphon Android Library and config file
 
 Uses the [Psiphon Android Library](../AndroidLibrary/README.md).
 
-In `app\src\main\res\raw\psiphon_config`, placeholders must be replaced with valid values.
+`app\src\main\res\raw\psiphon_config_stub` and its placeholder values must be replaced with `app\src\main\res\raw\psiphon_config` and valid configuration values.

AndroidApp/app/src/main/res/raw/psiphon_config → AndroidApp/app/src/main/res/raw/psiphon_config_stub

@@ -3,12 +3,16 @@
     "SponsorId" : "<placeholder>",
     "RemoteServerListUrl" : "<placeholder>",
     "RemoteServerListSignaturePublicKey" : "<placeholder>",
+    "DataStoreFilename" : "/data/data/ca.psiphon.psibot/psiphon.db",
     "LogFilename" : "",
     "LocalHttpProxyPort" : 0,
     "LocalSocksProxyPort" : 0,
     "EgressRegion" : "",
     "TunnelProtocol" : "",
     "ConnectionWorkerPoolSize" : 10,
+    "TunnelPoolSize" : 1,
+    "PortForwardFailureThreshold" : 10,
+    "UpstreamHttpProxyAddress" : "",
     "BindToDeviceServiceAddress" : "",
     "BindToDeviceDnsServer" : "8.8.4.4"
 }

README.md

@@ -28,6 +28,7 @@ Setup
         "SponsorId" : "<placeholder>",
         "RemoteServerListUrl" : "<placeholder>",
         "RemoteServerListSignaturePublicKey" : "<placeholder>",
+        "DataStoreFilename" : "",
         "LogFilename" : "",
         "LocalHttpProxyPort" : 0,
         "LocalSocksProxyPort" : 0,