diff options
| author | cyberta <cyberta@riseup.net> | 2021-11-12 00:46:35 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-11-12 00:46:35 +0000 |
| commit | c5d722f555b952407dade3abb1ffd537e6747317 (patch) | |
| tree | a9ebb8b33438589a33ed9ce54ade50371c9fe147 /app/src/test/resources | |
| parent | 571c0479f7400e56cfdb27408160d8a816cc8610 (diff) | |
| parent | 8aeb4791b6e024de9aa9c61b574d8c798a3c0a2c (diff) | |
Merge branch 'tor-snowflake' into 'master'
tor-over-snowflake
Closes #9045
See merge request leap/bitmask_android!138
Diffstat (limited to 'app/src/test/resources')
| -rw-r--r-- | app/src/test/resources/error_messages.json | 4 | ||||
| -rw-r--r-- | app/src/test/resources/v4/riseup.net.json | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/src/test/resources/error_messages.json b/app/src/test/resources/error_messages.json index e3b92d78..ae04bdb0 100644 --- a/app/src/test/resources/error_messages.json +++ b/app/src/test/resources/error_messages.json @@ -13,5 +13,7 @@ "warning_corrupted_provider_details": "Stored provider details are corrupted. You can either update %s (recommended) or update the provider details using a commercial CA certificate.", "warning_corrupted_provider_cert": "Stored provider certificate is invalid. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.", "warning_expired_provider_cert": "Stored provider certificate is expired. You can either update %s (recommended) or update the provider certificate using a commercial CA certificate.", - "setup_error_text": "There was an error configuring %s with your chosen provider." + "setup_error_text": "There was an error configuring %s with your chosen provider.", + "error_tor_timeout": "Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s?", + "error_network_connection": "%s has no internet connection. Please check your WiFi and cellular data settings." }
\ No newline at end of file diff --git a/app/src/test/resources/v4/riseup.net.json b/app/src/test/resources/v4/riseup.net.json index 10e12df9..2f921e57 100644 --- a/app/src/test/resources/v4/riseup.net.json +++ b/app/src/test/resources/v4/riseup.net.json @@ -1,6 +1,6 @@ { "api_uri": "https://api.black.riseup.net:443", - "api_version": "1", + "api_version": "4", "ca_cert_fingerprint": "SHA256: a5244308a1374709a9afce95e3ae47c1b44bc2398c0a70ccbf8b3a8a97f29494", "ca_cert_uri": "https://black.riseup.net/ca.crt", "default_language": "en", |