remove hard coded demo setup, use real pt.demo.bitmask.net demo provider

4 files changed, 0 insertions, 179 deletions

diff --git a/app/src/custom/assets/ptdemo.bitmask.eip-service.json b/app/src/custom/assets/ptdemo.bitmask.eip-service.json
deleted file mode 100644
index d804d032..00000000
--- a/app/src/custom/assets/ptdemo.bitmask.eip-service.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "serial": 3,
-  "version": 3,
-  "locations": {
-    "Amsterdam": {
-      "name": "Amsterdam",
-      "country_code": "NL",
-      "hemisphere": "N",
-      "timezone": "-1"
-    }
-  },
-  "gateways": [
-    {
-      "host": "pt.demo.bitmask.net",
-      "ip_address": "37.218.247.60",
-      "location": "Amsterdam",
-      "capabilities": {
-        "adblock": false,
-        "filter_dns": false,
-        "limited": false,
-        "transport": [
-          {"type": "openvpn",
-            "protocols": ["tcp"],
-            "ports": ["443"]
-          },
-          {"type": "obfs4",
-            "protocols": ["tcp"],
-            "options": {"cert": "gZlp9k6br2vn2MLnmjXpNh8D/CrR5wtackwZof/iICv1QzPwkkTUa+7JVOKtPiD0NFwCMw", "iat-mode": "0"},
-            "ports": ["23042"]
-          }
-        ]
-      }
-    }
-  ],
-  "openvpn_configuration": {
-    "auth": "SHA1",
-    "cipher": "AES-256-CBC",
-    "dev": "tun",
-    "keepalive": "10 30",
-    "key-direction": "1",
-    "nobind": "True",
-    "persist-key": "True",
-    "rcvbuf": "0",
-    "sndbuf": "0",
-    "tls-cipher": "DHE-RSA-AES128-SHA",
-    "tun-ipv6": "True",
-    "verb": "3"
-  }
-}
\ No newline at end of file
diff --git a/app/src/custom/assets/ptdemo.bitmask.net.json b/app/src/custom/assets/ptdemo.bitmask.net.json
deleted file mode 100644
index 98afaa54..00000000
--- a/app/src/custom/assets/ptdemo.bitmask.net.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "api_uri": "https://leech.demo.bitmask.net:8000",
-  "api_version": "3",
-  "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e",
-  "ca_cert_uri": "https://leech.demo.bitmask.net:8000/ca.crt",
-  "default_language": "en",
-  "description": {
-    "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-    "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-    "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted."
-  },
-  "domain": "demo.bitmask.net",
-  "enrollment_policy": "open",
-  "languages": [
-    "de",
-    "en",
-    "es",
-    "pt"
-  ],
-  "name": {
-    "de": "Bitmask Pluggable Transports",
-    "en": "Bitmask Pluggable Transports"
-  },
-  "service": {
-    "allow_anonymous": true,
-    "allow_free": true,
-    "allow_limited_bandwidth": false,
-    "allow_paid": false,
-    "allow_registration": true,
-    "allow_unlimited_bandwidth": true,
-    "bandwidth_limit": 102400,
-    "default_service_level": 1,
-    "levels": {
-      "1": {
-        "description": "Please donate.",
-        "name": "free"
-      }
-    }
-  },
-  "services": [
-    "openvpn"
-  ]
-}
\ No newline at end of file
diff --git a/app/src/custom/assets/ptdemo.bitmask.secrets.json b/app/src/custom/assets/ptdemo.bitmask.secrets.json
deleted file mode 100644
index 85900ea3..00000000
--- a/app/src/custom/assets/ptdemo.bitmask.secrets.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ca_cert":"-----BEGIN CERTIFICATE-----\nMIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt\nYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v\nYml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw\nFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV\nBAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw\nggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai\ndHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB\n7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84\nCA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+\nznCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4\nMEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4\nlPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0\nbQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl\nDEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB\nlfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy\nYMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw\nXjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE\nMAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w\nDQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl\ncXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY\nk/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj\nRnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG\nhtD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX\nEIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J\naF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l\nmlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK\nG6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co\nJa8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d\n69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e\nyV8e\n-----END CERTIFICATE-----",
-  "cert":"-----BEGIN CERTIFICATE-----\nMIIEbDCCAlSgAwIBAgIRAJ079G+cghukAsL/LV5v4c0wDQYJKoZIhvcNAQELBQAw\nZjEQMA4GA1UECgwHQml0bWFzazEcMBoGA1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5l\ndDE0MDIGA1UEAwwrQml0bWFzayBSb290IENBIChjbGllbnQgY2VydGlmaWNhdGVz\nIG9ubHkhKTAeFw0xOTA4MzAyMTI5MjlaFw0xOTEwMDQyMTI5MjlaMBQxEjAQBgNV\nBAMTCVVOTElNSVRFRDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIy\nF+9n1gvkN3iHO7+wmED6WNhx23/XgYGhP8HrUsI1tu61gPEft/eUfo9yA2zOdZoe\nM3xw8Czj3U2gkpFOrq3VBzyOGeNGGD/yfuwO8/vY9kkubq/Um4S10lznPI1qjktB\nVuY3EJl95lAXmFmYE/ilpPSrRNoi1s4nm08rrW9DOrgEFePAXcz0MkNEMxLxniCo\n85lf0rtjmEJGBibQCrNS4c0jYxOJePXJRX+xfIy6RfRdNesCMglf8uTaRbmx7Nl6\n9XzjAqfOucLhopcSqs8yY87l8M81d25hFHtH1uY0iXxpSbMbTaKSL4QBHRnOUXYs\nAkF5PNqRnV2EQ4cTzIMCAwEAAaNnMGUwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQM\nMAoGCCsGAQUFBwMCMB0GA1UdDgQWBBTViW4hFR4M7hIHxgXq0DRRzMAatDAfBgNV\nHSMEGDAWgBSHfhO27FhbFFmofb2bj72ezvmibDANBgkqhkiG9w0BAQsFAAOCAgEA\njyXlQ0ltw1B3W0hX+Nf/R7ODdgz4pPL5ZlM0LdOQzyLCGS2Z5tlDT+veaF0dzGAF\nZwkdd93T/Hr0CXnN8eC/YYOv8OKwNXskYt+44tnbS8aRh6rJM/zAHpgcYBaD5hRp\nwidn30Q8ypsm+ge5460eFBXHVo1s+B2tQbmVFy4yZ74hWMt51csGutppQpJ6qK6b\nFYI+vApzCSHRDfFr6oly5pdiLsWult+yJ7S4u2OuvM/BNyfuhB39s+QsAa5ocZbk\njX42puhVAUv717dzTWCeJporMPWGG8fkylXwwIfTpys5pVZtQMdHZmhsaud3sLFe\nyomcWfMpKozCvbdLDn9siLjA76TU8bkCGqNVXZHaVRiConX7yLA7LPpX9+E9uqe1\nEtZLeIir4B0oUXKHqP/8qRGANLH1KaSrAdTWbTUHOCcgjxN3iVYYIg23Ns1xLocK\nfBaUrgxa6KYh+bMtwi5/WDEkjqUv3wPS59JZiHpU2WS0jmgJ0ou16wMzXhN3xHNd\nmScW6cwWKoeSjC3ru1TxB35mxNG32WXZUf6CzYNnCi2gJjYbDvWc75XT9CvNwpAJ\nJsU35MS+uVUPtRK2mX6qg9Qxgjr/SfBHio94lfelUt0QnS2uIoeKpaUxFX1ovbKq\nyhegtT3txnpgaC2zk4t7hl5TdBQ5XN6/QMiOWg37N6s=\n-----END CERTIFICATE-----",
-  "Constants.PROVIDER_PRIVATE_KEY":"-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwjIX72fWC+Q3eIc7v7CYQPpY2HHbf9eBgaE/wetSwjW27rWA\n8R+395R+j3IDbM51mh4zfHDwLOPdTaCSkU6urdUHPI4Z40YYP/J+7A7z+9j2SS5u\nr9SbhLXSXOc8jWqOS0FW5jcQmX3mUBeYWZgT+KWk9KtE2iLWziebTyutb0M6uAQV\n48BdzPQyQ0QzEvGeIKjzmV/Su2OYQkYGJtAKs1LhzSNjE4l49clFf7F8jLpF9F01\n6wIyCV/y5NpFubHs2Xr1fOMCp865wuGilxKqzzJjzuXwzzV3bmEUe0fW5jSJfGlJ\nsxtNopIvhAEdGc5RdiwCQXk82pGdXYRDhxPMgwIDAQABAoIBAQCWdat30RLVic+0\nscqIPbHpfk5B/Q1dIsLzhdTZUZOAZ4/BqZ0qtTGbQFFCoMqojdouO8IWY4aisTWw\nxH1q2fSbOJdvwoWqQo/dU+wkx30gHzzK/I/D6c1I6HsBgiO3SdzPz+MdYYKZ+iLs\n4SsoF505pFWHP/+LpzyY47UAhU3OCoY5xE48Z5OIU/y66zqpiG9ABiYmgb8lYUlc\nzk/EujRZ8G1Q5yC9KSt8SpJNLl3xQvA49BYD1IHSMfICAZjnH0HZ4vx1aOROdyfX\nnq4o7fGjuFJHHa85rf0XxpzhpHPL26oA51Ba0Gh/HxREfmK0gFaSNeUS7eY4HaEl\nHXZesvGRAoGBAOEAiqmPP0RY75Zx1doKxswaZVk8UAI2SYE8wLhGQtGuzqxyEkwH\nXFiKe3FQALiY7sexee5RFySR5tL1ZYlkB7i26jECigQzltAtxBrmx47tnO5g4PPI\nL4xomVE6d65OLW30/TG6FX/CHrJAYKIOteTsCFA9BjBntvTQvMQAJewLAoGBANzz\nDxWpFsvnKWRrvwQunUrPYO3s9MNFE2ak1/gjfBnS/5oBcGY0gUIrsr/qQOP6kQHx\n21gjZsLq0oHW57dQhs+288YS+hOBkP3pW9X8y38sViu9H4qCbn5AByxdhMNzooHQ\n9AFVx7rU7t8o+8YdNwLmKtuut1tzhoML3b/jU3RpAoGAU7xl3nCnNQJ8N9spoTn9\nfhwct7cQd6JIfMZlWq8bUvnhhJ/3W0AqB/GRuzvw6MJRqxPLsvuOx1ddNgmJvjXy\nAbZhNdgiESo56EQABZr5jaG0k6qOTWuk9nY/CNHflIkXsyJH0GfWdHOEBQacb/NV\nklqdRW9QjFcs6bN9bNw5QL0CgYBRiH/whk0bQVpM7FW4vVrd2Fj0c5R+2mamYf4w\nWyfYf7xCoHVRwd5RBL8ZguAfQL9x8EX46FdrZiv4Lc2kH9sfm2uplCckO5O9nvd8\np6SQcVP7H/cbrbYIcKg0/u2XEnzNWsYwF+90Sk87mmwOV4mNUFJQbtDKtn7UrPRP\ncxvAwQKBgD+wKwZWM/yEBaJKHA6XLbKlTrb27bKDBNTt8Pk8BK0uYcZLryIQtZY5\nokyJniA9rv38R5URRAIRwXXDxxIumuWk69CY92dYA5y1tm0ooPG8OFEbSWTBIh74\n3dKEnhNvHVpNQkUd67LlfWsS51YbMCpwqyxI9YPtRwWMGho8R+Ty\n-----END RSA PRIVATE KEY-----"
-}
\ No newline at end of file
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
index 945429fd..b89363b2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
@@ -25,36 +25,20 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import de.blinkt.openvpn.core.Preferences;
 import de.blinkt.openvpn.core.VpnStatus;
 import se.leap.bitmaskclient.eip.EipCommand;
-import se.leap.bitmaskclient.utils.PreferenceHelper;
 
-import static se.leap.bitmaskclient.BuildConfig.useDemoConfig;
 import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE;
 import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
 import static se.leap.bitmaskclient.Constants.PREFERENCES_APP_VERSION;
-import static se.leap.bitmaskclient.Constants.PROVIDER_CONFIGURED;
 import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION;
 import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
-import static se.leap.bitmaskclient.Constants.PROVIDER_PRIVATE_KEY;
-import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 import static se.leap.bitmaskclient.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
-import static se.leap.bitmaskclient.Provider.CA_CERT;
-import static se.leap.bitmaskclient.Provider.MAIN_URL;
 import static se.leap.bitmaskclient.utils.ConfigHelper.isDefaultBitmask;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.getSavedProviderFromSharedPreferences;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.providerInSharedPreferences;
@@ -106,10 +90,6 @@ public class StartActivity extends Activity{
         // initialize app necessities
         VpnStatus.initLogCache(getApplicationContext().getCacheDir());
 
-        if (useDemoConfig) {
-            demoSetup();
-        }
-
         prepareEIP();
 
     }
@@ -235,66 +215,4 @@ public class StartActivity extends Activity{
         startActivity(intent);
         finish();
     }
-
-    private String getInputAsString(InputStream fileAsInputStream) throws IOException {
-        BufferedReader br = new BufferedReader(new InputStreamReader(fileAsInputStream));
-        StringBuilder sb = new StringBuilder();
-        String line = br.readLine();
-        while (line != null) {
-            sb.append(line);
-            line = br.readLine();
-        }
-
-        return sb.toString();
-    }
-
-    private void demoSetup() {
-        try {
-            //set demo data
-            String demoEipServiceJson = getInputAsString(getAssets().open("ptdemo.bitmask.eip-service.json"));
-            String secrets = getInputAsString(getAssets().open("ptdemo.bitmask.secrets.json"));
-            String provider = getInputAsString(getAssets().open("ptdemo.bitmask.net.json"));
-
-            Log.d(TAG, "setup provider: " + provider);
-            Log.d(TAG, "setup eip json: " + demoEipServiceJson);
-            JSONObject secretsJson = new JSONObject(secrets);
-
-            preferences.edit().putString(PROVIDER_EIP_DEFINITION+".demo.bitmask.net", demoEipServiceJson).
-                    putString(PROVIDER_EIP_DEFINITION, demoEipServiceJson).
-                    putString(CA_CERT, secretsJson.getString(CA_CERT)).
-                    putString(PROVIDER_PRIVATE_KEY, secretsJson.getString(PROVIDER_PRIVATE_KEY)).
-                    putString(PROVIDER_VPN_CERTIFICATE, secretsJson.getString(PROVIDER_VPN_CERTIFICATE)).
-                    putString(Provider.KEY, provider).
-                    putString(MAIN_URL, "https://demo.bitmask.net").
-                    putBoolean(PROVIDER_CONFIGURED, true).commit();
-
-            PreferenceHelper.getSavedProviderFromSharedPreferences(preferences);
-            ProviderObservable.getInstance().updateProvider(PreferenceHelper.getSavedProviderFromSharedPreferences(preferences));
-
-            // remove last used profiles
-            SharedPreferences prefs = Preferences.getDefaultSharedPreferences(this);
-            SharedPreferences.Editor prefsedit = prefs.edit();
-            prefsedit.remove("lastConnectedProfile").commit();
-            File f  = new File(this.getCacheDir().getAbsolutePath() + "/android.conf");
-            if (f.exists()) {
-                Log.d(TAG, "android.conf exists -> delete:" + f.delete());
-            }
-
-            File filesDirectory = new File(this.getFilesDir().getAbsolutePath());
-            if (filesDirectory.exists() && filesDirectory.isDirectory()) {
-                File[] filesInDirectory = filesDirectory.listFiles();
-                for (File file : filesInDirectory) {
-                    Log.d(TAG, "delete profile: " + file.getName() + ": "+ file.delete());
-
-                }
-            } else Log.d(TAG, "file folder doesn't exist");
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-    }
-
 }