Merge branch 'UI_tweaks' into 'master'

Ui tweaks

See merge request leap/bitmask_android!90

1 files changed, 3 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
index 7d1054f1..69270140 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OkHttpClientGenerator.java
@@ -52,7 +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;
+import static se.leap.bitmaskclient.utils.ConfigHelper.getProviderFormattedString;
 
 /**
  * Created by cyberta on 08.01.18.
@@ -92,7 +92,7 @@ public class OkHttpClientGenerator {
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
             // TODO ca cert is invalid - show better error ?!
-            addErrorMessageToJson(initError, resources.getString(certificate_error));
+            addErrorMessageToJson(initError, getProviderFormattedString(resources, certificate_error));
         } catch (IllegalStateException | KeyManagementException | KeyStoreException e) {
             e.printStackTrace();
             addErrorMessageToJson(initError, String.format(resources.getString(keyChainAccessError), e.getLocalizedMessage()));
@@ -102,7 +102,7 @@ public class OkHttpClientGenerator {
         } catch (CertificateException e) {
             e.printStackTrace();
             // TODO ca cert is invalid - show better error ?!
-            addErrorMessageToJson(initError, resources.getString(certificate_error));
+            addErrorMessageToJson(initError, getProviderFormattedString(resources, certificate_error));
         } catch (UnknownHostException e) {
             e.printStackTrace();
             addErrorMessageToJson(initError, resources.getString(server_unreachable_message));