#8896 move preconfigured providers to flavor normal and custom

13 files changed, 85 insertions, 0 deletions

diff --git a/app/assets/riseup.net.json b/app/src/custom/assets/riseup.net.json
index 82290ecd..82290ecd 100644
--- a/app/assets/riseup.net.json
+++ b/app/src/custom/assets/riseup.net.json
diff --git a/app/assets/riseup.net.pem b/app/src/custom/assets/riseup.net.pem
index c890aff4..c890aff4 100644
--- a/app/assets/riseup.net.pem
+++ b/app/src/custom/assets/riseup.net.pem
diff --git a/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java
new file mode 100644
index 00000000..3d4f801b
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java
@@ -0,0 +1,8 @@
+package se.leap.bitmaskclient;
+
+/**
+ * Created by cyberta on 17.08.18.
+ */
+
+public class CustomProviderSetupActivity {
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupInterface.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupInterface.java
new file mode 100644
index 00000000..30277b0e
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupInterface.java
@@ -0,0 +1,8 @@
+package se.leap.bitmaskclient;
+
+/**
+ * Created by cyberta on 17.08.18.
+ */
+
+public interface ProviderSetupInterface {
+}
diff --git a/app/assets/calyx.net.json b/app/src/normal/assets/calyx.net.json
index 69e1c2a6..69e1c2a6 100644
--- a/app/assets/calyx.net.json
+++ b/app/src/normal/assets/calyx.net.json
diff --git a/app/assets/calyx.net.pem b/app/src/normal/assets/calyx.net.pem
index cedb2e38..cedb2e38 100644
--- a/app/assets/calyx.net.pem
+++ b/app/src/normal/assets/calyx.net.pem
diff --git a/app/assets/demo.bitmask.net.json b/app/src/normal/assets/demo.bitmask.net.json
index e7fe6099..e7fe6099 100644
--- a/app/assets/demo.bitmask.net.json
+++ b/app/src/normal/assets/demo.bitmask.net.json
diff --git a/app/assets/demo.bitmask.net.pem b/app/src/normal/assets/demo.bitmask.net.pem
index 9a422161..9a422161 100644
--- a/app/assets/demo.bitmask.net.pem
+++ b/app/src/normal/assets/demo.bitmask.net.pem
diff --git a/app/src/normal/assets/riseup.net.json b/app/src/normal/assets/riseup.net.json
new file mode 100644
index 00000000..82290ecd
--- /dev/null
+++ b/app/src/normal/assets/riseup.net.json
@@ -0,0 +1,37 @@
+{
+  "api_uri": "https://api.black.riseup.net:443",
+  "api_version": "1",
+  "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494",
+  "ca_cert_uri": "https://black.riseup.net/ca.crt",
+  "default_language": "en",
+  "description": {
+    "en": "Riseup is a non-profit collective in Seattle that provides online communication tools for people and groups working toward liberatory social change."
+  },
+  "domain": "riseup.net",
+  "enrollment_policy": "open",
+  "languages": [
+    "en"
+  ],
+  "name": {
+    "en": "Riseup Networks"
+  },
+  "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/normal/assets/riseup.net.pem b/app/src/normal/assets/riseup.net.pem
new file mode 100644
index 00000000..c890aff4
--- /dev/null
+++ b/app/src/normal/assets/riseup.net.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl
+dXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE
+AwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw
+NDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM
+Emh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv
+b3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m
+TP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a
+7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE
+LliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY
+iw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK
+5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx
+HUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58
+m/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF
+PM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q
+hzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj
+shczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k
+ha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu
+f9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD
+VR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB
+AGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v
+qHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/
+3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ
+4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7
+3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch
+Td5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf
+Xu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg
+tsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF
+tGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ
+UN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp
+0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/app/assets/urls/calyx.net.url b/app/src/normal/assets/urls/calyx.net.url
index 807e9e18..807e9e18 100644
--- a/app/assets/urls/calyx.net.url
+++ b/app/src/normal/assets/urls/calyx.net.url
diff --git a/app/assets/urls/demo.bitmask.net.url b/app/src/normal/assets/urls/demo.bitmask.net.url
index 0c4de648..0c4de648 100644
--- a/app/assets/urls/demo.bitmask.net.url
+++ b/app/src/normal/assets/urls/demo.bitmask.net.url
diff --git a/app/assets/urls/riseup.net.url b/app/src/normal/assets/urls/riseup.net.url
index 42cdb979..42cdb979 100644
--- a/app/assets/urls/riseup.net.url
+++ b/app/src/normal/assets/urls/riseup.net.url