From 24a8122a79255265488883ab38f0faeb754f1c38 Mon Sep 17 00:00:00 2001 From: Ewan Dennis Date: Wed, 22 Feb 2017 10:57:52 +0000 Subject: [PATCH 1/2] Client.sendMessage(): set options.sandbox=true iff sending from sparkpostbox.com --- libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java b/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java index 7ff4ff8..b1512a0 100644 --- a/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java +++ b/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java @@ -8,6 +8,7 @@ import com.sparkpost.model.AddressAttributes; import com.sparkpost.model.RecipientAttributes; import com.sparkpost.model.TemplateContentAttributes; +import com.sparkpost.model.OptionsAttributes; import com.sparkpost.model.TransmissionWithRecipientArray; import com.sparkpost.model.responses.Response; import com.sparkpost.resources.ResourceTransmissions; @@ -111,6 +112,12 @@ public Response sendMessage(String from, List recipients, String subject contentAttributes.setText(text); transmission.setContentAttributes(contentAttributes); + if (from.contains("@sparkpostbox.com")) { + OptionsAttributes options = new OptionsAttributes(); + options.setSandbox(true); + transmission.setOptions(options); + } + RestConnection connection = new RestConnection(this); Response response = ResourceTransmissions.create(connection, 0, transmission); From 008543cc6ce9d2507257bf2fc9da930aa72adb3a Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 22 Feb 2017 09:34:50 -0800 Subject: [PATCH 2/2] * Minor format change to match style of rest of project. * Makes check for `@sparpostbox.com` case insensitive --- .../src/main/java/com/sparkpost/Client.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java b/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java index b1512a0..8f76702 100644 --- a/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java +++ b/libs/sparkpost-lib/src/main/java/com/sparkpost/Client.java @@ -6,9 +6,9 @@ import com.sparkpost.exception.SparkPostException; import com.sparkpost.model.AddressAttributes; +import com.sparkpost.model.OptionsAttributes; import com.sparkpost.model.RecipientAttributes; import com.sparkpost.model.TemplateContentAttributes; -import com.sparkpost.model.OptionsAttributes; import com.sparkpost.model.TransmissionWithRecipientArray; import com.sparkpost.model.responses.Response; import com.sparkpost.resources.ResourceTransmissions; @@ -112,10 +112,10 @@ public Response sendMessage(String from, List recipients, String subject contentAttributes.setText(text); transmission.setContentAttributes(contentAttributes); - if (from.contains("@sparkpostbox.com")) { - OptionsAttributes options = new OptionsAttributes(); - options.setSandbox(true); - transmission.setOptions(options); + if (from.toLowerCase().contains("@sparkpostbox.com")) { + OptionsAttributes options = new OptionsAttributes(); + options.setSandbox(true); + transmission.setOptions(options); } RestConnection connection = new RestConnection(this);