Calyx/master

.gitreview

@@ -0,0 +1,5 @@
+[gerrit]
+host=review.calyxos.org
+port=29418
+project=CalyxOS/bitmask_android
+defaultbranch=calyx/master

app/build.gradle

@@ -94,11 +94,11 @@ android {
       //Configurations for custom branded app.
 
       //Change the package name as needed, e.g. "org.example.myapp"
-      applicationId "se.leap.riseupvpn"
+      applicationId "org.calyxinstitute.vpn"
       //Set app name here
-      appName = "Riseup VPN"
+      appName = "Calyx VPN"
       //Provider base url, e.g. '"https://example.com"'
-      def customProviderUrl = '"https://riseup.net"'
+      def customProviderUrl = '"https://calyx.net"'
       buildConfigField "String", "customProviderUrl", customProviderUrl
       //static ip address of provider, using a commercially validated CA certificate to serve the provider.json
       def customProviderIp = '"198.252.153.70"'
@@ -132,7 +132,7 @@ android {
       //Build Config Fields for default donation details
 
       //This is the donation URL and should be set to the relevant donation page.
-      buildConfigField 'String', 'donation_url', '"https://riseup.net/vpn/donate"'
+      buildConfigField 'String', 'donation_url', '"https://calyxinstitute.org"'
       //The field to enable donations in the app.
       buildConfigField 'boolean', 'enable_donation', 'true'
       //The field to enable donation reminder popup in the app if enable_donation is set to 'false' this will be disabled.
@@ -614,14 +614,12 @@ task copyIcsOpenVPNFiles(dependsOn: 'updateIcsOpenVpn') {
 }
 
 task updateIcsOpenVpn( type: Exec ) {
-  commandLine 'git', 'submodule', 'sync'
-  commandLine 'git', 'submodule', 'update', '--init', '--recursive'
 
 }
 
 def getTag() {
   String commit = "git log --pretty=format:'%h' -n 1".execute().text.trim().replaceAll("'", "")
-  return ("git describe --tags --exact-match "+ commit).execute().text.trim()
+  return ("git describe --tags --exact-match "+ commit + "| cut -d - -f 1").execute().text.trim().replaceAll("calyx/", "")
 }
 
 
@@ -637,10 +635,6 @@ task cleanNative( type: Delete ) {
   }
 }
 
-task updateSdkLicences ( type: Exec ) {
-  println "say yes to licenses"
-  commandLine 'sh', 'yes', '|', 'sdkmanager', '--licenses'
-}
 
 def getCurrentFlavorForBetaOrRelease() {
   Gradle gradle = getGradle()

app/src/custom/assets/riseup.net.json → app/src/custom/assets/calyx.net.json

@@ -1,19 +1,19 @@
 {
-  "api_uri": "https://api.black.riseup.net:443",
-  "api_version": "3",
-  "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494",
-  "ca_cert_uri": "https://black.riseup.net/ca.crt",
+  "api_uri": "https://api.calyx.net:4430",
+  "api_version": "1",
+  "ca_cert_fingerprint": "SHA256: 43683c9ba3862c5384a8c1885072fcac40b5d2d4dd67331443f13a3077fa2e69",
+  "ca_cert_uri": "https://calyx.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."
+    "en": "Calyx Institute privacy focused ISP testbed"
   },
-  "domain": "riseup.net",
+  "domain": "calyx.net",
   "enrollment_policy": "open",
   "languages": [
     "en"
   ],
   "name": {
-    "en": "Riseup Networks"
+    "en": "calyx"
   },
   "service": {
     "allow_anonymous": true,

app/src/custom/assets/calyx.net.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBEMQ4wDAYDVQQKDAVjYWx5
+eDEaMBgGA1UECwwRaHR0cHM6Ly9jYWx5eC5uZXQxFjAUBgNVBAMMDWNhbHl4IFJv
+b3QgQ0EwHhcNMTMwNzAyMDAwMDAwWhcNMjMwNzAyMDAwMDAwWjBEMQ4wDAYDVQQK
+DAVjYWx5eDEaMBgGA1UECwwRaHR0cHM6Ly9jYWx5eC5uZXQxFjAUBgNVBAMMDWNh
+bHl4IFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDupdnx
+Bgat537XOqrZOulE/RvjoXB1S07sy9/MMtksXFoQuWJZRCSTp1Jaqg3H/e9o1nct
+LQO91+izfJe07TUyajFl7CfllYgMeyKTYcT85dFwNX4pcIHZr8UpmO0MpGBoR4W1
+8cPa3vxAG0CsyUmrASJVyhRouk4qazRosM5RwBxTdMzCK7L3SwqPQoxlY9YmRJlD
+XYZlK5VMJd0dj9XxhMeFs5n43R0bsDENryrExSbuxoNfnUoQg3wffKk+Z0gW7YgW
+ivPsbObqOgXUuBEU0xr9xMNBpU33ffLIsccrHq1EKp8zGfCOcww6v7+zEadUkVLo
+6j/rRhYYgRw9lijZG1rMuV/mTGnUqbjHsdoz5mzkFFWeTSqo44lvhveUyCcwRNmi
+2sjS77l0fCTzfreufffFoOEcRVMRfsnJdu/xPeARoXILEx8nQ421mSn6spOZlDQr
+Tt0T0BAWt+VNc+m0IGSW3SwS7r5MUyQ/M5GrbQBGi5W2SzPriKZ79YTOwPVmXKLZ
+vJoEuKRDkEPJLBAhcD5oSQljOm/Wp/hjmRH4HnI1y4XMshWlDsyRDB1Au5yrsfwN
+noFVSskEcbXlZfNgml4lktLBqz+qwsw+voq6Ak7ROKbc0ii5s8+iNMbAtIK7GcFF
+kuKKIyRmmGlDim/SDhlNdWo7Ah4Akde7zfWufwIDAQABo2AwXjAdBgNVHQ4EFgQU
+AY8+K4ZupAQ+L9ttFJG3vaLBq5gwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMB
+Af8wHwYDVR0jBBgwFoAUAY8+K4ZupAQ+L9ttFJG3vaLBq5gwDQYJKoZIhvcNAQEN
+BQADggIBAOpXi5o3g/2o2rPa53iG7Zgcy8RpePGgZk6xknGYWeLamEqSh+XWQZ2w
+2kQP54bf8HfPj3ugJBWsVtYAs/ltJwzeBfYDrwEJd1N8tw2IRuGlQOWiTAVVLBj4
+Zs+dikSuMoA399f/7BlUIEpVLUiV/emTtbkjFnDeKEV9zql6ypR0BtR8Knf8ALvL
+YfMsWLvTe4rXeypzxIaE2pn8ttcXLYAX0ml2MofTi5xcDhMn1vznKIvs82xhncQx
+I1MJMWqPHNHgJUJpA+y1IFh5LPbpag9PKQ0yQ9sM+/dyGumF2jElsMw71flh/Txr
+2dEv8+FNV1pPK26XJZBK24rNWFs30eAFfH9EQCwVla174I4PDoWqsIR7vtQMObDt
+Bq34R3TjjJJIt2sCSlYLooWwiK7Q+d/SgYqA+MSDmmwhzm86ToK6cwbCsvuw1AxR
+X6VIs4U8wOotgljzX/CSpKqlxcqZjhnAuelZ1+KiN8RHKPj7AzSLYOv/YwTjLTIq
+EOxquoNR58uDa5pBG22a7xWbSaKosn/mEl8SrUr6klzzc8Vh09IMoxrw74uLdAg2
+1jnrhm7qg91Ttb0aXiqbV+Kg/qQzojdewnnoBFnv4jaQ3y8zDCfMhsBtWlWz4Knb
+Zqga1WyRm3Gj1j6IV0oOincYMrw5YA7bgXpwop/Lo/mmliMA14ps
+-----END CERTIFICATE-----

app/src/custom/res/values/custom-theme.xml

@@ -2,9 +2,9 @@
 <resources>
     <!--Colors-->
     <!--Color of the action bar-->
-    <color name="colorPrimary">#5e9ee3</color>
+    <color name="colorPrimary">#8ea844</color>
     <!--Color of the status bar-->
-    <color name="colorPrimaryDark">#5c7ce1</color>
+    <color name="colorPrimaryDark">#8ea844</color>
     <!--Font color of the action bar title-->
     <color name="colorActionBarTitleFont">#ffffff</color>
     <!--Font color of the action bar subtitle-->

app/src/custom/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="donate_message">RiseupVPN is an easy, fast and secure VPN service from riseup.net. RiseupVPN does not require an user account, keep logs or track you in any way. This service is paid for entirely by donations from users like you. Please donate at https://riseup.net/vpn/donate. </string>
-  <string name="terms_of_service">By using this application you agree to the Terms of Service available at https://riseup.net/tos. This service is provided as-is, without any warranty and is intended for people who work to make the world a better place.</string>
-</resources>
+  <string name="donate_message">Calyx VPN is an easy, fast and secure VPN service from The Calyx Institute Please donate at https://calyxinstitute.org. </string>
+  <string name="terms_of_service">By using this application you agree to the Terms of Service available at https://calyx.net/terms-of-service. This service is provide as-is, without any warranty and is intended for people who work to make the world a better place.</string>
+</resources>