From e2cc92e7fafa078b4e579ec5af4a3aca4a4fc32d Mon Sep 17 00:00:00 2001 From: Scott Owades Date: Thu, 10 Feb 2022 10:37:18 -0800 Subject: [PATCH] resolve changes to sendgrid.java that served on graas report --- gtfu/src/main/java/gtfu/tools/SendGrid.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gtfu/src/main/java/gtfu/tools/SendGrid.java b/gtfu/src/main/java/gtfu/tools/SendGrid.java index 48b5d21f..ef7557f1 100644 --- a/gtfu/src/main/java/gtfu/tools/SendGrid.java +++ b/gtfu/src/main/java/gtfu/tools/SendGrid.java @@ -12,13 +12,13 @@ public class SendGrid { private String[] tos; private String subject; private String body; - private Map blobMap; + private Map imageMap; - public SendGrid(String[] recipients, String emailSubject, String body, Map images) { + public SendGrid(String[] recipients, String emailSubject, String body, Map imageMap) { this.tos = recipients; this.subject = emailSubject; this.body = escape(body); - this.blobMap = images; + this.imageMap = imageMap; } private String escape(String s) { @@ -54,8 +54,8 @@ private String makeTos() { private String makeAttachments() { StringBuffer sb = new StringBuffer(); - for (String key : blobMap.keySet()) { - byte[] buf = blobMap.get(key); + for (String key : imageMap.keySet()) { + byte[] buf = imageMap.get(key); if (sb.length() > 0) { sb.append(','); @@ -74,11 +74,12 @@ private String makeAttachments() { public int send() { String attach = ""; - - if (blobMap.size() > 0) { - attach = String.format(",\"attachments\": [%s]", makeAttachments()); - } else{ - body = "There are no files in today's GRaaS report"; + if(imageMap != null){ + if (imageMap.size() > 0) { + attach = String.format(",\"attachments\": [%s]", makeAttachments()); + } else{ + body = "There are no images attached"; + } } String from = "calitp.gtfsrt@gmail.com";