Calyx/main

.gitreview

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

app/build.gradle

@@ -22,8 +22,8 @@ android {
     // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n
     // to extracted bundle apks, supplied by google
     // however we don't calculate the versionCode here, because F-Droid doesn't like that
-    versionCode 169000
-    versionName "1.1.8"
+    versionCode 169001
+    versionName "1.1.8-1"
     minSdkVersion 21
     targetSdkVersion 31
     vectorDrawables.useSupportLibrary = true
@@ -124,11 +124,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://black.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 = '""'
@@ -174,7 +174,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.
@@ -517,7 +517,7 @@ task updateIcsOpenVpn( type: Exec ) {
 
 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).execute().text.trim().replaceAll("calyx/", "")
 }
 
 task cleanNative( type: Delete ) {

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: b2ae8b075a0e5634160c4dceec2e651dfabf9e4ea9409cc896cd2e1054c92372",
+  "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",
-  "enrollment_policy": "closed",
+  "domain": "calyx.net",
+  "enrollment_policy": "open",
   "languages": [
     "en"
   ],
   "name": {
-    "en": "Riseup Networks"
+    "en": "calyx"
   },
   "service": {
     "allow_anonymous": true,
@@ -34,4 +34,4 @@
   "services": [
     "openvpn"
   ]
-}
+}

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

@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBEMQ4wDAYDVQQKDAVjYWx5
+eDEaMBgGA1UECwwRaHR0cHM6Ly9jYWx5eC5uZXQxFjAUBgNVBAMMDWNhbHl4IFJv
+b3QgQ0EwHhcNMjMwNzA3MDAwMDAwWhcNMzMwNzA3MDAwMDAwWjBEMQ4wDAYDVQQK
+DAVjYWx5eDEaMBgGA1UECwwRaHR0cHM6Ly9jYWx5eC5uZXQxFjAUBgNVBAMMDWNh
+bHl4IFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6XPE2
+yo/eZvmT/moOWilKRkKtQ1RtZYodcPnCkw1ogbUbQpv45nwrYO5c0PPf44MkaKdQ
+6lAjrbgqYY6VxmktBYTkxV8DMIg+xu816x2vZ9wv9Dbf80F3abU7L3aKb1esCPzi
+zDdwZ8d/8C4WTXfT9EdsbjJvL+nkMbVIYdGVJ0sDb6JmblohWyVyIjLSPW+xVwjF
+p0XzcOwHGknSiUDactoILOW8uBtu51XVa2MpD2UC+ZojsoNaHOYT8w9u1qKCUQ3w
+zUx9kCbhnt4h7JjzrAtLAB9PYP01/TDTmoIBR6LySqImXUpGTF4mSw05BqJMHnm5
+n/WXhYCUhWLf4C0ioPrc/oMBUFurd3t/QcZk639MzIx4lqi3TbSeoyOHtmuWRFbV
+UAcLp3PiNbQKPVGgR6OsaXeQvhgXgetMfYiDhGLm7zcrwuyuCmQeiBqgwzc9lCXi
+FAnldKY7TmweIj9FZHOZuEjKNYH/XMJpPG8E8E265XLv8qqfOyDWWzZCgwWZqcJl
+Bf7GgCdR2m/sJaNjYzcOsWqrk4qmIGDAOgRPCjyXrmWkvCstK2GQDZVryw8hQNcw
+hm4Ww5nmV1kmJia5Hth5e8V3TZv7IBroJeCiuAQyq+TccvXz4taHFVNyHwA9hQHn
+UpZufEKDpmDIXbSl4VTEgfO/TRiTgeTm6WJj/QIDAQABo2AwXjAdBgNVHQ4EFgQU
+VHsNI6ke1wvusobYCw7o1mw6qh0wDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMB
+Af8wHwYDVR0jBBgwFoAUVHsNI6ke1wvusobYCw7o1mw6qh0wDQYJKoZIhvcNAQEN
+BQADggIBACiyutZdXpcNWrXg8xNPnS5EK7R6rmAZOm6/tzEUmcQMC0Mz9vEogdWi
+3qXemzVbiyFh3v/0nspL4fJrZGrcdZJF4/VKYlWfWBnv8l0kaoT4NjZSaaiD4ZTD
+adrOiJHf4/BcZhI0IivKF4jEd4DSuRTX3yKwOXVf2Tz8xOjPmrWGwuxhHpvPTo3U
+/b+h9GQ2sMYNV8Zw/M0EUXSofy2C7II+qGpNhxtIuQzCPIKUphY4qzHFlMdwIl0w
+G60nCmX1IFa6gV20g/VGxX1afBcNieMUNOPrEjQWyg3ev6+qLFGcR7mJ0nfko0eU
+BldofGEmxWtGmlhUyqPHPaAp6M9p4YQJmPWqVKz3r5Sy0s+XILV1NV1Dd8ZW1iUv
+5ufrco6Dpw+uM833adOGzAkXnoAFWciIbfftX52cV+va3jIxLm5B6dSBIzldcJSX
+nnxnqsLQJ6EM5lTCdl8pIGnQMu+pzL21SgTf+yKPdXzADt4Xq4wMneC3AgpdxqAj
+vDyLdyhY63mtWpaa68FKpeYlHXOOS3Z+VXkz1DvFLNRAqQv9DakuJSqiUkuctABN
+tPFtO/W9CsQPveD5XKi5uG/OFa8ljruSoJ4l6V7mrMljgfy20RRNmmOnyEuP5z6u
+uVY1VgsuQUqf08TV0h3vLVBD6QICq5P8A3MahYoJZ7MRbbE+tgcC
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIBYjCCAQigAwIBAgIBATAKBggqhkjOPQQDAjAXMRUwEwYDVQQDEwxMRUFQIFJv
+b3QgQ0EwHhcNMjIwMTI1MjAwODQ4WhcNMjcwMTI1MjAxMzQ4WjAXMRUwEwYDVQQD
+EwxMRUFQIFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR5sb4Lwq77
+09TgMRcZWuzgeSI4/oCBynRt6aDiMMMcbEqRbp968UT+1swcsoPmMBBm0YhODPWb
+8o55JCJcyMfro0UwQzAOBgNVHQ8BAf8EBAMCAqQwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAdBgNVHQ4EFgQU64nDDTqCutWEISvwMgXNfSjqOXUwCgYIKoZIzj0EAwIDSAAw
+RQIgQIccvto5OJ1GA3u3sZ2v8XRXvCpeZ3GnIKld9VFHSIcCIQDjhOmkF7y2jeAA
+MwurWljzGRHJqBJwHdNVQQlxbUMfxA==
+-----END CERTIFICATE-----

app/src/custom/res/drawable-anydpi-v24/ic_motd.xml

@@ -1,18 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="288"
-    android:viewportHeight="288"
-    android:width="288dp"
-    android:height="288dp">
-    <group
-        android:scaleX="1"
-        android:scaleY="1"
-        android:translateX="82"
-        android:translateY="52"
-        >
-        <path
-            android:pathData="M69.8243 44.3636C69.8243 44.3636 66.935 38.7879 66.6942 38.0606C66.4534 37.3333 65.0088 29.3333 65.0088 29.3333L66.935 25.9394L71.2689 19.6364L77.2882 14.7879L78.7328 14.303L93.42 8.72727L94.8647 7.27273L93.42 4.84849L91.2531 3.63636L87.4007 2.66666L77.7698 1.69697H70.3058L65.2496 2.90909L60.6749 1.21212L54.8963 0.484846L46.4692 0.242421L42.1353 0L35.1529 2.66666L24.3181 15.2727L22.8735 20.1212L22.1511 24.4848L18.5395 32.4848L16.1318 40L14.9279 48V49.697L9.39016 58.1818L6.26011 64.4848V73.4545L7.2232 92.1212L8.90861 98.9091L12.2794 105.212L16.6134 109.333L18.5395 117.333L25.7627 133.576L34.4306 144L34.9121 144.485L38.0422 160.242L27.4482 179.636L24.0773 182.303L21.6696 184.242H17.3357L14.9279 185.455L12.0387 185.697L10.3533 187.394L6.74165 186.909L3.13006 186.667L0.481548 188.606L0 192L1.92619 189.818L5.05624 188.848L5.29701 192L10.3533 190.303L13.2425 190.061L18.2988 190.788C18.2988 190.788 22.6327 190.545 23.355 190.303C24.0773 190.303 28.8928 190.788 28.8928 190.788L32.2636 190.303L34.1898 191.03L36.5975 190.303L39.246 191.515L43.0984 191.03L43.58 188.364L43.3392 186.909L45.9877 187.879L48.1547 189.576L49.5993 191.515V189.091L47.9139 186.182C47.9139 186.182 46.71 184.485 45.9877 184.727C45.2654 184.727 42.3761 184.242 42.3761 184.242L40.4499 184.97L38.283 184L36.116 185.212L34.1898 184.485L33.2267 182.545L31.7821 182.061L33.2267 178.182L36.5975 173.333L41.1722 165.576L45.2654 160.727L46.71 158.788C46.71 158.788 48.6362 155.879 48.6362 155.152C48.6362 154.424 49.1178 146.182 49.1178 146.182L46.71 140.848L45.5061 136.485L67.6573 141.818H68.8612L87.8823 155.636L90.5308 159.03L91.4938 172.848L91.0123 176L89.5677 178.424L88.6046 179.879L87.8823 182.061L87.4007 183.515L83.7891 184.727L80.1775 184L78.0106 183.758L73.9174 184.242L72.232 185.939L71.5097 188.121L71.9912 190.303L72.7135 188.121L73.9174 186.667L75.1213 186.424V188.364L76.5659 189.333L79.696 187.879L81.1406 187.636L81.6221 189.818H86.1968L89.3269 188.848L91.9754 189.333L95.8278 189.818L97.0316 189.333L97.9947 188.364L99.6801 191.758V187.879L97.9947 183.515L95.587 182.061L96.0686 180.848L94.3831 177.455L94.6239 164.849L104.255 176.242L117.016 186.182C117.016 186.182 125.684 189.333 126.406 189.333C127.128 189.333 133.148 188.606 133.148 188.606L137 182.303L134.111 173.576L135.315 170.667L129.295 162.667L116.293 149.333L113.163 138.909L113.404 131.879L110.515 124.364L107.385 118.788L109.311 112.727L107.866 104L101.366 89.2121L103.773 88.7273L99.4394 81.9394L102.088 81.2121L97.5132 73.697L99.4394 72.7273L96.0686 66.9091L97.2724 66.1818L92.9385 62.5455L94.3831 61.8182L83.5483 54.0606L69.8243 44.3636Z"
-            android:fillColor="#000000" />
-    </group>
-
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="166dp"
+    android:height="220dp"
+    android:viewportWidth="166"
+    android:viewportHeight="220">
+    <path
+        android:pathData="M75.79,211.93C37.76,190.78 9.33,157.39 2.89,126.29C1.07,117.5 1,115.37 1,69.98L1,26.61L4.76,24.19C20.66,13.94 37.48,7.1 54.61,3.64C89.59,-3.41 125.88,3.66 158.33,24.85L161,26.6V70.18C161,115.75 160.93,117.94 159.12,126.65C152.71,157.49 128.09,187.57 91.75,208.96C81.19,215.17 81.52,215.11 75.79,211.93Z"
+        android:fillColor="#739B4C"/>
+    <path
+        android:pathData="M81.01,1C72.18,1 63.36,1.88 54.61,3.64C37.48,7.1 20.66,13.94 4.76,24.18L1,26.61L1,69.98C1,115.37 1.07,117.5 2.89,126.29C9.33,157.39 37.76,190.78 75.79,211.93C78.26,213.3 79.61,214.09 81.18,214.05V1C81.13,1 81.07,1 81.01,1L81.01,1Z"
+        android:fillColor="#81A55D"/>
+    <path
+        android:pathData="M4,84.38L39.93,67.56L38.72,76.71L42.95,73.73L42.35,64.79L51.43,57.98L54.66,57.56L60.11,50.75L70.81,48.41L77.27,45H89.78L92.61,49.68L95.43,47.77L101.28,47.55L109.36,52.66V67.56L111.78,67.99L112.39,70.75L119.45,70.97L114,61.39L149.32,56.28L158,79.48L132.97,77.14L139.23,88.42H114V99.06L94.83,119.71L94.07,143.23L78.68,171L58.95,133.97L58.5,116.3L46.99,90.33L22.77,90.12L24.79,83.52L4,84.38Z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M125.5,73.95L120.86,64.16L146.49,62.67L151.34,74.16L128.13,73.09L133.17,84.8L114.2,84.59L113.19,74.16L125.5,73.95Z"
+        android:fillColor="#FFF200"/>
+    <path
+        android:pathData="M19.34,80.33L34.28,73.95L34.48,81.4L45.17,77.35L51.63,82.46L50.22,87.14H28.22L29.43,80.12L19.34,80.33Z"
+        android:fillColor="#FFF200"/>
+    <path
+        android:pathData="M84.73,80.12L86.55,90.76C86.55,90.76 88.97,92.04 94.22,89.7C99.47,87.35 101.49,86.72 101.49,86.72C101.49,86.72 101.69,87.99 99.27,89.7C96.84,91.4 92.2,92.25 92.2,92.25C92.2,92.25 94.22,93.95 97.25,92.68C100.28,91.4 101.28,90.76 101.28,90.76C101.28,90.76 101.28,94.59 98.86,95.23C96.44,95.87 90.39,94.38 87.36,94.59C84.33,94.8 82.92,97.57 82.72,99.7C82.51,101.83 83.93,108 83.93,108C83.93,108 80.7,103.53 80.7,100.34C80.7,97.15 81.3,95.02 81.3,95.02L76.26,94.38L74.04,90.76L63.79,91.35C63.79,91.35 63.74,99.91 67.58,105.02C71.41,110.13 75.65,113.75 75.65,113.75L78.68,161.63L90.79,142.69L90.99,118L81.1,114.6C81.1,114.6 89.17,115.45 93.21,113.53C97.25,111.62 107.34,102.04 108.95,98.85C110.57,95.66 108.55,72.46 108.55,72.46C108.55,72.46 101.89,75.65 95.23,77.78C88.57,79.91 84.73,80.12 84.73,80.12Z"
+        android:fillColor="#C4A43F"/>
+    <path
+        android:pathData="M93.61,52.66C93.61,52.66 96.84,50.53 100.88,51.81C104.92,53.09 106.13,53.94 106.13,53.94V67.99C106.13,67.99 104.31,69.26 101.28,70.75C98.26,72.24 96.24,72.24 96.24,72.24C96.24,72.24 95.63,62.45 94.83,58.41C94.02,54.37 93.61,52.66 93.61,52.66Z"
+        android:fillColor="#C4A43F"/>
+    <path
+        android:pathData="M79.08,47.77H86.75C86.75,47.77 89.98,51.6 90.79,56.07C91.6,60.54 92,74.16 92,74.16C92,74.16 89.38,75.22 85.94,75.65C82.51,76.07 81.3,75.86 81.3,75.86C81.3,75.86 80.5,61.18 79.89,56.28C79.28,51.39 79.08,47.77 79.08,47.77Z"
+        android:fillColor="#C4A43F"/>
+    <path
+        android:pathData="M63.94,53.51L70.61,51.39C70.61,51.39 75.25,54.58 76.06,60.54C76.86,66.5 76.46,75.65 76.46,75.65L67.17,77.35C67.17,77.35 66.37,63.3 65.36,59.26C64.35,55.22 63.94,53.51 63.94,53.51Z"
+        android:fillColor="#C4A43F"/>
+    <path
+        android:pathData="M49.82,65.01C49.82,65.01 51.23,62.03 54.05,61.81C56.88,61.6 58.5,62.24 58.5,62.24L62.13,77.14C62.13,77.14 61.72,77.99 59.1,79.05C56.48,80.12 54.86,79.91 54.86,79.91C54.86,79.91 52.24,73.09 51.43,70.33C50.62,67.56 49.82,65.01 49.82,65.01Z"
+        android:fillColor="#C4A43F"/>
+    <path
+        android:pathData="M56.07,59.69L60.72,54.58C60.72,54.58 63.14,56.92 63.54,59.69C63.94,62.45 63.74,73.31 63.74,73.31C63.74,73.31 61.52,61.18 60.11,60.54C58.7,59.9 56.07,59.69 56.07,59.69Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M48,64.37L45.17,67.14L45.38,73.31L51.63,78.2L48.61,69.69L48,64.37Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M76.86,48.62L73.43,50.11L77.27,56.49L76.86,48.62Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M75.45,81.61L81.91,80.97L83.93,91.82H77.87L75.45,81.61Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M73.23,79.05L66.57,80.33L65.16,87.78L72.42,87.14L72.02,80.33L73.23,79.05Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M62.53,80.54C62.53,80.54 61.12,81.82 58.7,82.03C56.28,82.25 55.27,82.25 55.27,82.25L54.66,87.35L61.12,87.78L62.53,80.54Z"
+        android:fillColor="#796621"/>
+    <path
+        android:pathData="M52.44,91.19L60.31,90.87L59.91,94.38L57.69,95.02L60.51,95.66C60.51,95.66 60.77,96.83 61.35,98.48C61.44,98.73 59.86,99.81 59.86,99.81C59.86,99.81 61.81,99.7 61.9,99.92C62.45,101.28 63.19,102.78 64.15,104.17C66.77,108 72.42,114.6 72.42,114.6L68.79,115.45L72.62,116.73L74.64,155.46L62.53,134.18L62.13,118L64.95,116.3L61.52,115.02L52.44,91.19Z"
+        android:fillColor="#796621"/>
+</vector>