From 81fe998237add85739834640184750e9b27a4fa3 Mon Sep 17 00:00:00 2001 From: Armin Zamani Date: Thu, 11 Apr 2013 12:38:31 +0800 Subject: [PATCH] Bug fixes in the app --- .../racecommittee/app/data/OnlineDataManager.java | 9 +++++++-- .../app/domain/state/impl/RaceStateImpl.java | 11 ++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java index b1619993513..e5789be32e8 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.Serializable; import java.net.MalformedURLException; import java.net.URI; +import java.net.URLEncoder; import java.util.Collection; import android.content.Context; @@ -162,10 +163,14 @@ public class OnlineDataManager extends DataManager { ManagedRaceIdentifier identifier = managedRace.getIdentifier(); + String raceGroupName = URLEncoder.encode(identifier.getRaceGroup().getName()); + String raceColumnName = URLEncoder.encode(identifier.getRaceName()); + String fleetName = URLEncoder.encode(identifier.getFleet().getName()); + try { new DataLoader>(context, URI.create(AppConstants.getServerBaseURL(context) - + "/sailingserver/rc/marks?leaderboard=" + identifier.getRaceGroup().getName() + "&raceColumn=" + identifier.getRaceName() - + "&fleet=" + identifier.getFleet().getName()), parser, handler) + + "/sailingserver/rc/marks?leaderboard=" + raceGroupName + "&raceColumn=" + raceColumnName + + "&fleet=" + fleetName), parser, handler) .forceLoad(); } catch (MalformedURLException e) { e.printStackTrace(); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java index 86b3f3eb6cd..c2def51cdc6 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java @@ -155,13 +155,14 @@ public class RaceStateImpl implements RaceState, RaceLogChangedListener { @Override public void onRaceAborted(TimePoint eventTime) { - TimePoint passChangeEventTime = eventTime.plus(1); - RaceLogEvent abortEvent = RaceLogEventFactory.INSTANCE.createRaceStatusEvent(eventTime, raceLog.getCurrentPassId(), RaceLogRaceStatus.UNSCHEDULED); - this.raceLog.add(abortEvent); - - RaceLogEvent passChangeEvent = RaceLogEventFactory.INSTANCE.createPassChangeEvent(passChangeEventTime, raceLog.getCurrentPassId() + 1); + TimePoint abortEventTime = eventTime.plus(1); + + RaceLogEvent passChangeEvent = RaceLogEventFactory.INSTANCE.createPassChangeEvent(eventTime, raceLog.getCurrentPassId() + 1); this.raceLog.add(passChangeEvent); + RaceLogEvent abortEvent = RaceLogEventFactory.INSTANCE.createRaceStatusEvent(abortEventTime, raceLog.getCurrentPassId(), RaceLogRaceStatus.UNSCHEDULED); + this.raceLog.add(abortEvent); + notifyListenersAboutRaceAbortion(); }