Merge branch 'prepare_release' into 'master'1.1.3

Prepare release

See merge request leap/bitmask_android!179

5 files changed, 18 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4486ac58..028912c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+1.1.3
+features:
+* set donation nagging to 7 days
+* point all donation links to Riseup
+
+bugfixes:
+* fix crash in tile service on some devices
+
 1.1.2 - Snowflakes winter wonder release
 features:
 * Tor on Snowflake: use new circumvention tech to unblock the communication from Bitmask to it's configuration servers
diff --git a/app/build.gradle b/app/build.gradle
index 1a15f470..5b1c0a7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
     applicationId "se.leap.bitmaskclient"
     // 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
-    versionCode 160 * 1000
-    versionName "1.1.2"
+    versionCode 161 * 1000
+    versionName "1.1.3"
     minSdkVersion 16
     targetSdkVersion 30
     vectorDrawables.useSupportLibrary = true
diff --git a/app/src/custom/assets/riseup.net.json b/app/src/custom/assets/riseup.net.json
index dac08bc2..ef764827 100644
--- a/app/src/custom/assets/riseup.net.json
+++ b/app/src/custom/assets/riseup.net.json
@@ -1,14 +1,14 @@
 {
   "api_uri": "https://api.black.riseup.net:443",
   "api_version": "3",
-  "ca_cert_fingerprint": "SHA256: dd919b7513b4a1368faa20e38cd3314156805677f48b787cdd9b4a92dec64eb0",
+  "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",
+  "enrollment_policy": "closed",
   "languages": [
     "en"
   ],
@@ -34,4 +34,4 @@
   "services": [
     "openvpn"
   ]
-}
+}
\ No newline at end of file
diff --git a/app/src/normal/assets/calyx.net.json b/app/src/normal/assets/calyx.net.json
index e3680dee..876fdaab 100644
--- a/app/src/normal/assets/calyx.net.json
+++ b/app/src/normal/assets/calyx.net.json
@@ -1,7 +1,7 @@
 {
   "api_uri": "https://api.calyx.net:4430",
-  "api_version": "1",
-  "ca_cert_fingerprint": "SHA256: b2ae8b075a0e5634160c4dceec2e651dfabf9e4ea9409cc896cd2e1054c92372",
+  "api_version": "3",
+  "ca_cert_fingerprint": "SHA256: 43683c9ba3862c5384a8c1885072fcac40b5d2d4dd67331443f13a3077fa2e69",
   "ca_cert_uri": "https://calyx.net/ca.crt",
   "default_language": "en",
   "description": {
@@ -20,7 +20,7 @@
     "allow_free": true,
     "allow_limited_bandwidth": false,
     "allow_paid": false,
-    "allow_registration": true,
+    "allow_registration": false,
     "allow_unlimited_bandwidth": true,
     "bandwidth_limit": 102400,
     "default_service_level": 1,
diff --git a/app/src/normal/assets/riseup.net.json b/app/src/normal/assets/riseup.net.json
index b72091b4..ef764827 100644
--- a/app/src/normal/assets/riseup.net.json
+++ b/app/src/normal/assets/riseup.net.json
@@ -1,14 +1,14 @@
 {
   "api_uri": "https://api.black.riseup.net:443",
   "api_version": "3",
-  "ca_cert_fingerprint": "SHA256: dd919b7513b4a1368faa20e38cd3314156805677f48b787cdd9b4a92dec64eb0",
+  "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",
+  "enrollment_policy": "closed",
   "languages": [
     "en"
   ],