From 69389ee7db23ce7182b21da08d227d88d6cfdc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 24 Apr 2013 20:01:28 +0200 Subject: "Trust completely" checkbox saves that trust for the new provider entered, so that if in the future the client tries to log in or whatever, it can use the certificate downloaded when added. Log in dialog works ok, showing a toast when authentication fails (by this time, I have not managed to get a correct login due to dev.bitmask.net problems). dev.bitmask.net works perfectly, via adding it as a new provider (MeanderingCode, this is for you ;) ). All GET requests are done by default Android URL class, which means that certificates trusted by Android are also trusted by us. If there are problems when logging in due to certificates, the app is able to use only the certificate associated to the provider in the moment it was selected as the chosen provider. --- assets/urls/bitmask.url | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'assets') diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url index 910f0400..bc4d59db 100644 --- a/assets/urls/bitmask.url +++ b/assets/urls/bitmask.url @@ -3,5 +3,6 @@ "assets_json_provider" : "providers/bitmask.net_provider.json", "json_provider" : "https://bitmask.net/provider.json", "cert" : "https://bitmask.net/ca.crt", - "json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json" + "json_eip_service_antiguo" : "https://api.bitmask.net:4430/1/config/eip-service.json", + "json_eip_service" : "https://api.bitmask.net:4430/config/eip-service.json" } \ No newline at end of file -- cgit v1.2.3 From 84a11bb1620d2b9080992427c847b58007f2304a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 9 May 2013 17:29:38 +0200 Subject: Log in and Log out options are shown only if allow registration is true. Allow registration is present in provider.json. Provider.json is downloaded from both preseeded and custom providers. Authentication success or fail is notified correctly to the user. --- assets/providers/bitmask.net_provider.json | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 assets/providers/bitmask.net_provider.json (limited to 'assets') diff --git a/assets/providers/bitmask.net_provider.json b/assets/providers/bitmask.net_provider.json deleted file mode 100644 index d61be196..00000000 --- a/assets/providers/bitmask.net_provider.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "api_uri": "https://api.bitmask.net:4430", - "api_version": "1", - "ca_cert_fingerprint": "SHA256: 0f17c033115f6b76ff67871872303ff65034efe7dd1b910062ca323eb4da5c7e", - "ca_cert_uri": "https://bitmask.net/ca.crt", - "default_language": "en", - "description": { - "el": "Bitmask είναι ένα έργο του LEAP με σκοπό τον έλεγχο της απόδοσης και της αξιοπιστίας του λογισμικού LEAP. Bitmask τρέχει για τις τελευταίες αιμορραγία άκρο του κώδικα LEAP, και θα έχει πιθανότατα περισσότερες δυνατότητες και λιγότερα αξιοπιστία από άλλους φορείς παροχής υπηρεσιών.", - "en": "Bitmask is a project of LEAP with the purpose to test the performance and reliability of the LEAP software. Bitmask runs on the latest bleeding edge of the LEAP code, and will likely have more features and less reliability than other service providers.", - "es": "Bitmask es un proyecto de LEAP con el propósito de probar el rendimiento y la fiabilidad del software LEAP. Bitmask corre la última versión del código LEAP, y es de esperar que tenga más funciones y menos fiabilidad que los proveedores de servicios." - }, - "domain": "bitmask.net", - "enrollment_policy": "open", - "languages": [ - "el", - "en", - "es" - ], - "name": { - "en": "Bitmask" - }, - "services": [ - "openvpn" - ] -} \ No newline at end of file -- cgit v1.2.3 From 30c7bab5d8618df665e602fdd08bafa010a15497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 13 Jun 2013 17:37:37 +0200 Subject: bitmask json files are downloaded. There was a problem on the assets file "bitmask.url". It had an error in the eip-service url. We should use this file only for main url, and proceed as if it were a new provider but with a preseeded main url. --- assets/urls/bitmask.url | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'assets') diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url index bc4d59db..910f0400 100644 --- a/assets/urls/bitmask.url +++ b/assets/urls/bitmask.url @@ -3,6 +3,5 @@ "assets_json_provider" : "providers/bitmask.net_provider.json", "json_provider" : "https://bitmask.net/provider.json", "cert" : "https://bitmask.net/ca.crt", - "json_eip_service_antiguo" : "https://api.bitmask.net:4430/1/config/eip-service.json", - "json_eip_service" : "https://api.bitmask.net:4430/config/eip-service.json" + "json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json" } \ No newline at end of file -- cgit v1.2.3 From f4956bb818fb9ed04760e6de3b53b876272da5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 20 Jun 2013 16:52:43 +0200 Subject: User messages are now in string.xml Some more constants added to ConfigHelper. This solves #2908. --- assets/urls/bitmask.url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets') diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url index 910f0400..a17a5ff8 100644 --- a/assets/urls/bitmask.url +++ b/assets/urls/bitmask.url @@ -1,7 +1,7 @@ { "name" : "bitmask", "assets_json_provider" : "providers/bitmask.net_provider.json", - "json_provider" : "https://bitmask.net/provider.json", + "provider_json_url" : "https://bitmask.net/provider.json", "cert" : "https://bitmask.net/ca.crt", "json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json" } \ No newline at end of file -- cgit v1.2.3