From caadb236f39b4b6139a697eec57aa2796595422f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 21 May 2019 11:54:20 +0200 Subject: * show error dialog if provider is misconfigured and has not allowed registration nor anonymous usage * always download provider.json, Use preseeded provider.json only to check if the client can connect with preseeded certificate. Keeps the provider.json updated if provider changes it's config * Tests for both cases --- app/src/test/resources/error_messages.json | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'app/src/test/resources/error_messages.json') diff --git a/app/src/test/resources/error_messages.json b/app/src/test/resources/error_messages.json index 4d72b074..8430d9e0 100644 --- a/app/src/test/resources/error_messages.json +++ b/app/src/test/resources/error_messages.json @@ -1,16 +1,17 @@ { "server_unreachable_message": "Server is unreachable, please try again.", -"error.security.pinnedcertificate": "Security error, update the app or choose another provider.", -"malformed_url": "It doesn't seem to be a Bitmask provider.", -"certificate_error": "This is not a trusted Bitmask provider.", -"error_srp_math_error_user_message": "Try again: server math error.", -"error_bad_user_password_user_message": "Incorrect username or password.", -"error_not_valid_password_user_message": "It should have at least 8 characters.", -"error_client_http_user_message": "Try again: Client HTTP error", -"error_io_exception_user_message": "Try again: I/O error", -"error_json_exception_user_message": "Try again: Bad response from the server", -"error_no_such_algorithm_exception_user_message": "Encryption algorithm not found. Please update your OS!", -"warning_corrupted_provider_details": "Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.", -"warning_corrupted_provider_cert": "Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.", -"warning_expired_provider_cert": "Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate." + "error.security.pinnedcertificate": "Security error, update the app or choose another provider.", + "malformed_url": "It doesn't seem to be a Bitmask provider.", + "certificate_error": "This is not a trusted Bitmask provider.", + "error_srp_math_error_user_message": "Try again: server math error.", + "error_bad_user_password_user_message": "Incorrect username or password.", + "error_not_valid_password_user_message": "It should have at least 8 characters.", + "error_client_http_user_message": "Try again: Client HTTP error", + "error_io_exception_user_message": "Try again: I/O error", + "error_json_exception_user_message": "Try again: Bad response from the server", + "error_no_such_algorithm_exception_user_message": "Encryption algorithm not found. Please update your OS!", + "warning_corrupted_provider_details": "Stored provider details are corrupted. You can either update Bitmask (recommended) or update the provider details using a commercial CA certificate.", + "warning_corrupted_provider_cert": "Stored provider certificate is invalid. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.", + "warning_expired_provider_cert": "Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.", + "setup_error_text": "There was an error configuring Bitmask with your chosen provider." } \ No newline at end of file -- cgit v1.2.3