Merge branch 'master' into bug4319

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java

@@ -6,6 +6,7 @@ import com.sap.sailing.domain.abstractlog.race.analyzing.impl.FinishedTimeFinder
 import com.sap.sailing.domain.common.abstractlog.NotRevokableException;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,7 +55,7 @@ public class ManagedRaceImpl implements ManagedRace {
      *                              the index
      *                              is of the race column in which this cell lies.
      *                              <p>
-     *                              <p>
+     *
      *                              Indices returned by this method start with zero, meaning the first race column in the series.
      *                              This
      *                              corresponds to what one would get by asking {@link Util#indexOf(Iterable, Object)
@@ -147,7 +148,7 @@ public class ManagedRaceImpl implements ManagedRace {
 
     @Override
     public Map<Competitor, Boat> getCompetitorsAndBoats() {
-        return competitorsAndBoats;
+        return Collections.unmodifiableMap(new HashMap<>(competitorsAndBoats));
     }
 
     @Override

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java

@@ -194,11 +194,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity
     @Override
     public void onException(Exception exception) {
         if (exception == null || exception instanceof UnauthorizedException) {
-            Context context = this;
-            if (getSupportActionBar() != null) {
-                context = getSupportActionBar().getThemedContext();
-            }
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(getString(R.string.sending_exception_title));
             builder.setMessage(getString(R.string.sending_exception_message));
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java

@@ -243,8 +243,8 @@ public class TrackingListFragment extends BaseFragment
         mComparator = mComparators.get(SORT_SAIL_NUMBER);
 
         Util.addAll(getRace().getCompetitorsAndBoats().entrySet(), mCompetitorData);
-        mFilteredCompetitorData.clear();
         mFilteredCompetitorData.addAll(mCompetitorData);
+        sortCompetitors();
 
         initializeFinishList();