diff --git a/.gitreview b/.gitreview new file mode 100644 index 000000000..433605ca4 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=review.calyxos.org +port=29418 +project=CalyxOS/bitmask_android +defaultbranch=calyx/master diff --git a/app/build.gradle b/app/build.gradle index f1331e124..38530741d 100644 --- a/app/build.gradle +++ b/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() diff --git a/app/src/custom/assets/riseup.net.json b/app/src/custom/assets/calyx.net.json similarity index 55% rename from app/src/custom/assets/riseup.net.json rename to app/src/custom/assets/calyx.net.json index cc8ad183b..81e1ca365 100644 --- a/app/src/custom/assets/riseup.net.json +++ b/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, diff --git a/app/src/custom/assets/calyx.net.pem b/app/src/custom/assets/calyx.net.pem new file mode 100644 index 000000000..cedb2e382 --- /dev/null +++ b/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----- \ No newline at end of file diff --git a/app/src/custom/assets/riseup.net.pem b/app/src/custom/assets/riseup.net.pem deleted file mode 100644 index c890aff40..000000000 --- a/app/src/custom/assets/riseup.net.pem +++ /dev/null @@ -1,32 +0,0 @@ ------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/src/custom/res/drawable-hdpi/logo.png b/app/src/custom/res/drawable-hdpi/logo.png new file mode 100644 index 000000000..2e3873724 Binary files /dev/null and b/app/src/custom/res/drawable-hdpi/logo.png differ diff --git a/app/src/custom/res/drawable-land/background_main.png b/app/src/custom/res/drawable-land/background_main.png index 5e22dfa13..40ff306c5 100644 Binary files a/app/src/custom/res/drawable-land/background_main.png and b/app/src/custom/res/drawable-land/background_main.png differ diff --git a/app/src/custom/res/drawable-land/ic_splash_background.png b/app/src/custom/res/drawable-land/ic_splash_background.png index 8d8ed3d10..7c6b6b938 100644 Binary files a/app/src/custom/res/drawable-land/ic_splash_background.png and b/app/src/custom/res/drawable-land/ic_splash_background.png differ diff --git a/app/src/custom/res/drawable-ldpi/logo.png b/app/src/custom/res/drawable-ldpi/logo.png index 4e22d99fe..bb5b6d299 100644 Binary files a/app/src/custom/res/drawable-ldpi/logo.png and b/app/src/custom/res/drawable-ldpi/logo.png differ diff --git a/app/src/custom/res/drawable-mdpi/logo.png b/app/src/custom/res/drawable-mdpi/logo.png index e53cb15c0..5e06e27ac 100644 Binary files a/app/src/custom/res/drawable-mdpi/logo.png and b/app/src/custom/res/drawable-mdpi/logo.png differ diff --git a/app/src/custom/res/drawable-nodpi/background_drawer.png b/app/src/custom/res/drawable-nodpi/background_drawer.png index 0c42b73ce..989e6d5b6 100644 Binary files a/app/src/custom/res/drawable-nodpi/background_drawer.png and b/app/src/custom/res/drawable-nodpi/background_drawer.png differ diff --git a/app/src/custom/res/drawable-nodpi/background_main.png b/app/src/custom/res/drawable-nodpi/background_main.png index c01e26c3b..9944de4c9 100644 Binary files a/app/src/custom/res/drawable-nodpi/background_main.png and b/app/src/custom/res/drawable-nodpi/background_main.png differ diff --git a/app/src/custom/res/drawable-nodpi/ic_splash_background.png b/app/src/custom/res/drawable-nodpi/ic_splash_background.png index 6a06ddc9d..08ed3e662 100644 Binary files a/app/src/custom/res/drawable-nodpi/ic_splash_background.png and b/app/src/custom/res/drawable-nodpi/ic_splash_background.png differ diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.png b/app/src/custom/res/drawable-sw600dp-port/background_main.png index c01e26c3b..9944de4c9 100644 Binary files a/app/src/custom/res/drawable-sw600dp-port/background_main.png and b/app/src/custom/res/drawable-sw600dp-port/background_main.png differ diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png index 6a06ddc9d..08ed3e662 100644 Binary files a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png and b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png differ diff --git a/app/src/custom/res/drawable-sw600dp/background_main.png b/app/src/custom/res/drawable-sw600dp/background_main.png index 9ec4de06e..44db35f66 100644 Binary files a/app/src/custom/res/drawable-sw600dp/background_main.png and b/app/src/custom/res/drawable-sw600dp/background_main.png differ diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png index 6b8c753ff..575002fba 100644 Binary files a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png and b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png differ diff --git a/app/src/custom/res/drawable-xhdpi/logo.png b/app/src/custom/res/drawable-xhdpi/logo.png new file mode 100644 index 000000000..59270350f Binary files /dev/null and b/app/src/custom/res/drawable-xhdpi/logo.png differ diff --git a/app/src/custom/res/drawable-xxxhdpi/logo.png b/app/src/custom/res/drawable-xxxhdpi/logo.png deleted file mode 100644 index 4297d90c5..000000000 Binary files a/app/src/custom/res/drawable-xxxhdpi/logo.png and /dev/null differ diff --git a/app/src/custom/res/drawable/ic_launcher.png b/app/src/custom/res/drawable/ic_launcher.png index eb46e2f60..66e5588b1 100644 Binary files a/app/src/custom/res/drawable/ic_launcher.png and b/app/src/custom/res/drawable/ic_launcher.png differ diff --git a/app/src/custom/res/drawable/logo_square.png b/app/src/custom/res/drawable/logo_square.png index 3cec6cec8..f7658b42e 100644 Binary files a/app/src/custom/res/drawable/logo_square.png and b/app/src/custom/res/drawable/logo_square.png differ diff --git a/app/src/custom/res/mipmap-hdpi/ic_launcher.png b/app/src/custom/res/mipmap-hdpi/ic_launcher.png index faaaa0f8f..57ac559bc 100644 Binary files a/app/src/custom/res/mipmap-hdpi/ic_launcher.png and b/app/src/custom/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/custom/res/mipmap-mdpi/ic_launcher.png b/app/src/custom/res/mipmap-mdpi/ic_launcher.png index cf774afb4..209f1b3e5 100644 Binary files a/app/src/custom/res/mipmap-mdpi/ic_launcher.png and b/app/src/custom/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/custom/res/mipmap-xhdpi/ic_launcher.png b/app/src/custom/res/mipmap-xhdpi/ic_launcher.png index eb46e2f60..59270350f 100644 Binary files a/app/src/custom/res/mipmap-xhdpi/ic_launcher.png and b/app/src/custom/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml index 1c8f1ab22..dba399d33 100644 --- a/app/src/custom/res/values/custom-theme.xml +++ b/app/src/custom/res/values/custom-theme.xml @@ -2,9 +2,9 @@ - #5e9ee3 + #8ea844 - #5c7ce1 + #8ea844 #ffffff diff --git a/app/src/custom/res/values/strings.xml b/app/src/custom/res/values/strings.xml index e3ffeee94..aed5f66f2 100644 --- a/app/src/custom/res/values/strings.xml +++ b/app/src/custom/res/values/strings.xml @@ -1,5 +1,5 @@ - 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. - 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. - + Calyx VPN is an easy, fast and secure VPN service from The Calyx Institute Please donate at https://calyxinstitute.org. + 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. + \ No newline at end of file