From fdbc8ca146b8e3aff0425e2faf94c0b4a6e3dd28 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 18 Nov 2014 20:07:36 +0000
Subject: [PATCH] #396 fix - Corrected cancel action and added Settings entity
---
securis/src/main/java/net/curisit/securis/utils/EmailManager.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/utils/EmailManager.java b/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
index 8657d03..e6b686a 100644
--- a/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
+++ b/securis/src/main/java/net/curisit/securis/utils/EmailManager.java
@@ -56,9 +56,9 @@
* @throws SeCurisException
*/
public EmailManager() throws SeCurisException {
- String domain = Params.get(Params.KEYS.MAILGUN_DOMAIN);
+ String domain = Config.get(Config.KEYS.MAILGUN_DOMAIN);
if (domain == null) {
- throw new SeCurisException("Please, add '" + Params.KEYS.MAILGUN_DOMAIN + "' parameter to config file");
+ throw new SeCurisException("Please, add '" + Config.KEYS.MAILGUN_DOMAIN + "' parameter to config file");
}
serverUrl = String.format("https://api.mailgun.net/v2/%s/messages", domain);
httpClient = createHttpClient();
@@ -81,7 +81,7 @@
throw new SeCurisException("Error creating SSL socket factory");
}
CredentialsProvider provider = new BasicCredentialsProvider();
- UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("api", Params.get(Params.KEYS.MAILGUN_API_KEY));
+ UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("api", Config.get(Config.KEYS.MAILGUN_API_KEY));
provider.setCredentials(AuthScope.ANY, credentials);
return HttpClientBuilder.create().setDefaultCredentialsProvider(provider).setSSLSocketFactory(sslsf).build();
@@ -105,7 +105,7 @@
builder.setCharset(Charset.forName("utf-8"));
builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
- builder.addTextBody("from", Params.get(Params.KEYS.EMAIL_FROM_ADDRESS));
+ builder.addTextBody("from", Config.get(Config.KEYS.EMAIL_FROM_ADDRESS));
builder.addTextBody("to", to);
if (cc != null) {
builder.addTextBody("cc", cc);
--
Gitblit v1.3.2