summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-02-15 21:27:17 +0100
committerFup Duck <fupduck@sacknagel.com>2018-02-15 21:27:17 +0100
commit6c1434addf1ee25a8c7ce30c240e2033d5075f35 (patch)
tree13f0ab9d1c61ff64c1870338c02013f2caf32851 /app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
parent9b6c368a25510c462ea357121c97edb6d0310021 (diff)
8797 - pair programming effort
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
index 40b2ea7f..7d1054f1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
@@ -52,6 +52,7 @@ import static se.leap.bitmaskclient.R.string.error_io_exception_user_message;
import static se.leap.bitmaskclient.R.string.error_no_such_algorithm_exception_user_message;
import static se.leap.bitmaskclient.R.string.keyChainAccessError;
import static se.leap.bitmaskclient.R.string.server_unreachable_message;
+import static se.leap.bitmaskclient.R.string.warning_corrupted_provider_cert;
/**
* Created by cyberta on 08.01.18.
@@ -90,7 +91,8 @@ public class OkHttpClientGenerator {
return clientBuilder.build();
} catch (IllegalArgumentException e) {
e.printStackTrace();
- addErrorMessageToJson(initError, resources.getString(R.string.certificate_error));
+ // TODO ca cert is invalid - show better error ?!
+ addErrorMessageToJson(initError, resources.getString(certificate_error));
} catch (IllegalStateException | KeyManagementException | KeyStoreException e) {
e.printStackTrace();
addErrorMessageToJson(initError, String.format(resources.getString(keyChainAccessError), e.getLocalizedMessage()));
@@ -99,6 +101,7 @@ public class OkHttpClientGenerator {
addErrorMessageToJson(initError, resources.getString(error_no_such_algorithm_exception_user_message));
} catch (CertificateException e) {
e.printStackTrace();
+ // TODO ca cert is invalid - show better error ?!
addErrorMessageToJson(initError, resources.getString(certificate_error));
} catch (UnknownHostException e) {
e.printStackTrace();