eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-02 10:23:51 +00:00
Code Activity

fixed bug where the leaderboard display name was accidentally used for URL construction

Browse Source 
Change-Id: I78f6739cf3f7bf7f55c7291f27d3c87bfc320d82
This commit is contained in:
Axel Uhl committed 2016-07-23 14:43:34 +02:00
1 parent e39b49bfd6
commit 6eadec9dc3
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.java
+6 -6
View File
@@ -287,10 +287,10 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter {
for (Competitor competitor : competitors) {
final String toAddress = competitor.getEmail();
if (toAddress != null) {
String leaderboardName = leaderboard.getDisplayName() == null ? leaderboard.getName() : leaderboard.getDisplayName();
String leaderboardDisplayName = leaderboard.getDisplayName() == null ? leaderboard.getName() : leaderboard.getDisplayName();
String competitorName = competitor.getName();
String url = DeviceMappingConstants.getDeviceMappingForRegattaLogUrl(serverUrlWithoutTrailingSlash,
event.getId().toString(), leaderboardName, DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING,
event.getId().toString(), leaderboard.getName(), DeviceMappingConstants.URL_COMPETITOR_ID_AS_STRING,
competitor.getId().toString(), NonGwtUrlHelper.INSTANCE);
String logoUrl = null;
final List<ImageDescriptor> imagesWithTag = event.findImagesWithTag(MediaTagConstants.LOGO);
@@ -299,7 +299,7 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter {
}
try {
final ResourceBundleStringMessages B = RaceLogTrackingI18n.STRING_MESSAGES;
sendInvitationEmail(locale, toAddress, leaderboardName, event.getName(), competitorName, url,
sendInvitationEmail(locale, toAddress, leaderboardDisplayName, event.getName(), competitorName, url,
B.get(locale, "sailInSightAppName"), iOSAppUrl, androidAppUrl, logoUrl);
} catch (MailException e) {
occuredExceptions.append(e.getMessage() + "\r\n");
@@ -392,7 +392,7 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter {
String emails, String iOSAppUrl, String androidAppUrl, Locale locale) throws MailException {
StringBuilder occuredExceptions = new StringBuilder();
String[] emailArray = emails.split(",");
String leaderboardName = leaderboard.getDisplayName() == null ? leaderboard.getName() : leaderboard.getDisplayName();
String leaderboardDisplayName = leaderboard.getDisplayName() == null ? leaderboard.getName() : leaderboard.getDisplayName();
String eventId = event.getId().toString();
String logoUrl = null;
List<ImageDescriptor> imagesWithTag = event.findImagesWithTag(MediaTagConstants.LOGO);
@@ -400,12 +400,12 @@ public class RaceLogTrackingAdapterImpl implements RaceLogTrackingAdapter {
logoUrl = imagesWithTag.get(0).getURL().toString();
}
// http://<host>/buoy-tender/checkin?event_id=<event-id>&leaderboard_name=<leaderboard-name>
String url = DeviceMappingConstants.getBuoyTenderInvitationUrl(serverUrlWithoutTrailingSlash, leaderboardName,
String url = DeviceMappingConstants.getBuoyTenderInvitationUrl(serverUrlWithoutTrailingSlash, leaderboard.getName(),
eventId, NonGwtUrlHelper.INSTANCE);
for (String toAddress : emailArray) {
try {
final ResourceBundleStringMessages B = RaceLogTrackingI18n.STRING_MESSAGES;
sendInvitationEmail(locale, toAddress, leaderboardName,
sendInvitationEmail(locale, toAddress, leaderboardDisplayName,
event.getName(), RaceLogTrackingI18n.STRING_MESSAGES.get(locale, "buoyTender"), url, B.get(locale, "buoyPingerAppName"),
iOSAppUrl, androidAppUrl, logoUrl);
} catch (MailException e) {