From 1db6965e6c4c8fbae7c84489bd603e9fdc9962db Mon Sep 17 00:00:00 2001 From: wagnst Date: Sat, 18 Jul 2015 23:37:50 +0200 Subject: [PATCH] remove (if available) slash in baseUrl when opening wind map --- .../sailing/racecommittee/app/utils/WindHelper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/WindHelper.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/WindHelper.java index 8c82a632b2b..a577387126b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/WindHelper.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/WindHelper.java @@ -24,7 +24,7 @@ import java.net.URL; public class WindHelper { private static String TAG = WindHelper.class.getName(); - private final static String GWT_MAP_AND_WIND_CHART_HTML = "gwt/EmbeddedMapAndWindChart.html"; + private final static String GWT_MAP_AND_WIND_CHART_HTML = "/gwt/EmbeddedMapAndWindChart.html"; public static void isTrackedRace(final Context context, final ManagedRace race){ try { @@ -61,7 +61,13 @@ public class WindHelper { } private static String getBaseUrl(Context context){ - return AppPreferences.on(context).getServerBaseURL(); + /* remove trailing slash on baseUrl if exists */ + String baseUrl = AppPreferences.on(context).getServerBaseURL(); + if( baseUrl != null && baseUrl.substring(baseUrl.length() - 1).equals("/")) { + return baseUrl.substring(0, baseUrl.length() - 1); + } else { + return baseUrl; + } } private static String getEventId(Context context){