eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-24 04:53:54 +00:00
Code Activity

encode URLs before sending them in an HTML e-mail

Browse Source 
Change-Id: Ic71c4a6a66a110dac3148261f01aa5b2ffd1c19c
This commit is contained in:
Axel Uhl committed 2016-07-15 19:46:10 +02:00
1 parent 451a67cb82
commit 42429da7a1
1 file changed
+20 -5
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
+20 -5
View File
@@ -1,12 +1,15 @@
package com.sap.sailing.server.notification.impl;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.osgi.framework.BundleContext;
@@ -228,7 +231,7 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
protected String constructBody(BoatClass objectToNotifyAbout, Locale locale) {
String raceDescription = calculateRaceDescription(locale, event, leaderboard, raceColumn, fleet);
return messages.get(locale, "boatClassRaceFinishedBody", boatClass.getDisplayName(),
raceDescription, link);
raceDescription, encodeLink(link));
}
});
});
@@ -250,7 +253,7 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
protected String constructBody(BoatClass objectToNotifyAbout, Locale locale) {
String leaderboardDescription = calculateLeaderboardDescription(locale, event, leaderboard);
return messages.get(locale, "boatClassScoreCorrectionBody", boatClass.getDisplayName(),
leaderboardDescription, link);
leaderboardDescription, encodeLink(link));
}
});
});
@@ -273,12 +276,24 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
// TODO properly format time in the user's locale
String time = when.toString();
return messages.get(locale, "boatClassUpcomingRaceBody", boatClass.getDisplayName(),
raceDescription, time, link);
raceDescription, time, encodeLink(link));
}
});
});
}
private String encodeLink(String link) {
String encodedLink;
try {
encodedLink = URLEncoder.encode(link, "UTF-8");
} catch (UnsupportedEncodingException e) {
logger.log(Level.WARNING, "Why is UTF-8 not known?", e);
encodedLink = link;
}
return encodedLink;
}
@Override
public void notifyUserOnCompetitorPassesFinish(Competitor competitor, TrackedRace trackedRace,
Leaderboard leaderboard, RaceColumn raceColumn, Fleet fleet) {
@@ -295,7 +310,7 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
protected String constructBody(Competitor objectToNotifyAbout, Locale locale) {
String raceDescription = calculateRaceDescription(locale, event, leaderboard, raceColumn, fleet);
return messages.get(locale, "competitorPassesFinishBody", competitor.getName(), raceDescription,
link);
encodeLink(link));
}
});
});
@@ -316,7 +331,7 @@ public class SailingNotificationServiceImpl implements Stoppable, SailingNotific
protected String constructBody(Competitor objectToNotifyAbout, Locale locale) {
String leaderboardDescription = calculateLeaderboardDescription(locale, event, leaderboard);
return messages.get(locale, "boatClassScoreCorrectionBody", competitor.getName(),
leaderboardDescription, link);
leaderboardDescription, encodeLink(link));
}
});
});