From b30458a87755da78b098dfd823e4ecfa1cc6262c Mon Sep 17 00:00:00 2001 From: Robert Benedikt Date: Thu, 9 Apr 2020 17:11:13 +0200 Subject: [PATCH 1/4] feat: return an unmodifiable and shallow copied map of competitors and boats --- .../racecommittee/app/domain/impl/ManagedRaceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java index e934fac64b9..3b0233197b6 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java @@ -1,6 +1,7 @@ package com.sap.sailing.racecommittee.app.domain.impl; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -44,7 +45,7 @@ public class ManagedRaceImpl implements ManagedRace { * doesn't tell anything about the "horizontal" position in the "grid" or in other words what the index * is of the race column in which this cell lies. *

- * + * * 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) * Util.indexOf(series.getRaceColumns(), thisCellsRaceColumn)}, except in case the first race column is a @@ -134,7 +135,7 @@ public class ManagedRaceImpl implements ManagedRace { @Override public Map getCompetitorsAndBoats() { - return competitorsAndBoats; + return Collections.unmodifiableMap(new HashMap<>(competitorsAndBoats)); } @Override From 182fb3dce18ff4fdb2bf809ff11141a7d51b34a6 Mon Sep 17 00:00:00 2001 From: Robert Benedikt Date: Thu, 9 Apr 2020 17:16:26 +0200 Subject: [PATCH 2/4] fix: sort the cached of competitors of the race to avoid re-sorting them after load --- .../app/ui/fragments/raceinfo/TrackingListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java index f241644342f..bc75fdec6ab 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java +++ b/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(); From 96ce38f7af7b9c3f30b917ef55a2ca7b7f70643f Mon Sep 17 00:00:00 2001 From: Alexandr Timoshenko Date: Tue, 14 Apr 2020 13:59:34 +0200 Subject: [PATCH 3/4] fix issue Bug 4995 - Dark theme being used for popup dialogs --- .../app/ui/activities/SendingServiceAwareActivity.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java index ee43d75df49..84760fdba0b 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java @@ -194,10 +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(); - } + final Context context = this; AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(getString(R.string.sending_exception_title)); builder.setMessage(getString(R.string.sending_exception_message)); From 192367c30659a2c6e3d38274f6b6ddced8c22bdb Mon Sep 17 00:00:00 2001 From: Robert Benedikt Date: Wed, 15 Apr 2020 11:29:01 +0200 Subject: [PATCH 4/4] style: rearrange code --- .../app/ui/activities/SendingServiceAwareActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java index 84760fdba0b..b2f1038a791 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SendingServiceAwareActivity.java @@ -194,8 +194,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity @Override public void onException(Exception exception) { if (exception == null || exception instanceof UnauthorizedException) { - final Context context = this; - 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() {