Fixed event media navigation

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/app/MobileActivityMapper.java

@@ -11,7 +11,6 @@ import com.sap.sailing.gwt.home.mobile.places.events.EventsActivityProxy;
 import com.sap.sailing.gwt.home.mobile.places.latestnews.LatestNewsActivityProxy;
 import com.sap.sailing.gwt.home.mobile.places.latestnews.LatestNewsPlace;
 import com.sap.sailing.gwt.home.mobile.places.notmobile.NotMobileActivityProxy;
-import com.sap.sailing.gwt.home.mobile.places.start.StartActivityProxy;
 import com.sap.sailing.gwt.home.shared.app.HasMobileVersion;
 
 
@@ -31,8 +30,11 @@ public class MobileActivityMapper implements ActivityMapper {
             return new NotMobileActivityProxy(lastVisitedPlace, place, clientFactory);
         }
         if (place instanceof StartPlace) {
+            // going to events place
+            // lastVisitedPlace = place;
+            // return new StartActivityProxy((StartPlace) place, clientFactory);
             lastVisitedPlace = place;
-            return new StartActivityProxy((StartPlace) place, clientFactory);
+            return new EventsActivityProxy(new EventsPlace(), clientFactory);
         } else if (place instanceof EventsPlace) {
             lastVisitedPlace = place;
             EventsPlace eventPlace = (EventsPlace) place;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivity.java

@@ -11,7 +11,9 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.sap.sailing.gwt.home.client.place.error.ErrorPlace;
 import com.sap.sailing.gwt.home.client.place.event.AbstractEventPlace;
 import com.sap.sailing.gwt.home.client.place.event.EventContext;
+import com.sap.sailing.gwt.home.client.place.event.multiregatta.tabs.MultiregattaMediaPlace;
 import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaLeaderboardPlace;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.RegattaMediaPlace;
 import com.sap.sailing.gwt.home.mobile.app.MobileApplicationClientFactory;
 import com.sap.sailing.gwt.home.mobile.places.event.EventView.Presenter;
 import com.sap.sailing.gwt.home.mobile.places.latestnews.LatestNewsPlace;
@@ -23,6 +25,7 @@ import com.sap.sailing.gwt.ui.shared.dispatch.news.AbstractRaceNewsEntryDTO;
 import com.sap.sailing.gwt.ui.shared.dispatch.news.LeaderboardNewsEntryDTO;
 import com.sap.sailing.gwt.ui.shared.dispatch.news.NewsEntryDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO;
+import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;
 
 public class EventActivity extends AbstractActivity implements Presenter {
@@ -98,6 +101,15 @@ public class EventActivity extends AbstractActivity implements Presenter {
         return clientFactory.getNavigator().getEventNavigation(new RegattaLeaderboardPlace(ctx), null, false);
     }
 
+    @Override
+    public PlaceNavigation<?> getMediaPageNavigation() {
+        if (getCtx().getEventDTO().getType() == EventType.MULTI_REGATTA) {
+            return clientFactory.getNavigator().getEventNavigation(new MultiregattaMediaPlace(getCtx()), null, false);
+        } else {
+            return clientFactory.getNavigator().getEventNavigation(new RegattaMediaPlace(getCtx()), null, false);
+        }
+    }
+
     @Override
     public String getRaceViewerURL(String regattaName, String trackedRaceName) {
         // TODO Auto-generated method stub
@@ -120,4 +132,5 @@ public class EventActivity extends AbstractActivity implements Presenter {
     public void gotoNewsPlace(List<NewsEntryDTO> values) {
         clientFactory.getPlaceController().goTo(new LatestNewsPlace(place.getCtx(), values));
     }
+
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventView.java

@@ -30,6 +30,7 @@ public interface EventView {
 
         String getRaceViewerURL(String regattaName, String trackedRaceName);
 
+        PlaceNavigation<?> getMediaPageNavigation();
     }
 
     void setNavigator(MobilePlacesNavigator navigator);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventViewImpl.java

@@ -84,7 +84,7 @@ public class EventViewImpl extends Composite implements EventView {
         impressionsUi.setStatistis(nrOfImages, nrOfVideos);
         impressionsUi.addImages(images);
         // TODO: desktop media navigation
-        impressionsUi.setClickDestinaton(navigator.getHomeNavigation());
+        impressionsUi.setClickDestinaton(currentPresenter.getMediaPageNavigation());
     }
 
     @Override