eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

rename intent extra values (and add packageName to value)

Browse Source
This commit is contained in:
Peter Siegmund
2016-09-12 09:58:32 +02:00
parent 0b5ec0d6b0
commit df03cdf00f
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
+6 -10
View File
@@ -7,15 +7,11 @@ public class AppConstants {
// Intent extra fields
public final static String COURSE_AREA_UUID_KEY = "courseUuid";
public final static String RACE_ID_KEY = "raceUuid";
public final static String INTENT_EXTRA_LONG = "intent.extra.long";
public final static String INTENT_EXTRA_STRING = "intent.extra.string";
public final static String SERVICE_UNIQUE_ID = "serviceUID";
public final static String STARTPROCEDURE_SPECIFIC_EVENT_ID = "startProcedureSpecificEventId";
public final static String EXTRAS_RACE_STATE_EVENT = "raceStateEvent";
public final static String FLAG_KEY = "raceFlag";
public final static String EXTRAS_WIND_FIX = "windfix";
public final static String EXTRA_FORCE_REFRESH = "forceRefresh";
public final static String INTENT_EXTRA_RACE_ID = PACKAGE_NAME + ".raceUuid";
public final static String INTENT_EXTRA_TIMEPOINT_MILLIS = PACKAGE_NAME + ".timePoint.millis";
public final static String INTENT_EXTRA_EVENTNAME = PACKAGE_NAME + ".eventName";
public final static String FLAG_KEY = PACKAGE_NAME + ".raceFlag";
public final static String EXTRA_FORCE_REFRESH = PACKAGE_NAME + ".forceRefresh";
public final static String AUTHOR_TYPE_OFFICER_START = "Race Officer on Start Vessel";
public final static String AUTHOR_TYPE_OFFICER_FINISH = "Race Officer on Finish Vessel";
@@ -46,7 +42,7 @@ public class AppConstants {
// Inner process events
public final static String INTENT_ACTION_TOGGLE = PACKAGE_NAME + ".action.toggle";
public final static String INTENT_ACTION_EXTRA = "extra";
public final static String INTENT_ACTION_EXTRA = PACKAGE_NAME + ".extra";
public final static String INTENT_ACTION_TOGGLE_PROCEDURE = "procedure";
public final static String INTENT_ACTION_TOGGLE_PROCEDURE_MORE_MODE = "more_mode";
public final static String INTENT_ACTION_TOGGLE_PROCEDURE_MORE_PATHFINDER = "more_pathfinder";
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
+6 -6
View File
@@ -209,7 +209,7 @@ public class RaceStateService extends Service {
break;
default:
String id = intent.getStringExtra(AppConstants.RACE_ID_KEY);
String id = intent.getStringExtra(AppConstants.INTENT_EXTRA_RACE_ID);
ManagedRace race = dataManager.getDataStore().getRace(id);
if (race == null) {
ExLog.w(this, TAG, "No race for id " + id);
@@ -218,8 +218,8 @@ public class RaceStateService extends Service {
switch (action) {
case AppConstants.INTENT_ACTION_ALARM_ACTION:
long timePoint = intent.getLongExtra(AppConstants.INTENT_EXTRA_LONG, 0);
String eventName = intent.getStringExtra(AppConstants.INTENT_EXTRA_STRING);
long timePoint = intent.getLongExtra(AppConstants.INTENT_EXTRA_TIMEPOINT_MILLIS, 0);
String eventName = intent.getStringExtra(AppConstants.INTENT_EXTRA_EVENTNAME);
RaceStateEvent event = new RaceStateEventImpl(new MillisecondsTimePoint(timePoint), RaceStateEvents.valueOf(eventName));
ExLog.i(this, TAG, String.format("Processing %s", event.toString()));
race.getState().processStateEvent(event);
@@ -327,9 +327,9 @@ public class RaceStateService extends Service {
private PendingIntent createAlarmPendingIntent(ManagedRace managedRace, RaceStateEvent event) {
Intent intent = new Intent().setClass(this, RaceStateService.class);
intent.setAction(AppConstants.INTENT_ACTION_ALARM_ACTION);
intent.putExtra(AppConstants.RACE_ID_KEY, managedRace.getId());
intent.putExtra(AppConstants.INTENT_EXTRA_LONG, event.getTimePoint().asMillis());
intent.putExtra(AppConstants.INTENT_EXTRA_STRING, event.getEventName().name());
intent.putExtra(AppConstants.INTENT_EXTRA_RACE_ID, managedRace.getId());
intent.putExtra(AppConstants.INTENT_EXTRA_TIMEPOINT_MILLIS, event.getTimePoint().asMillis());
intent.putExtra(AppConstants.INTENT_EXTRA_EVENTNAME, event.getEventName().name());
return PendingIntent.getService(this, alarmManagerRequestCode++, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+1 -1
View File
@@ -549,7 +549,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
private void processIntent(final Intent intent) {
final Bundle args = new Bundle();
if (mSelectedRace != null) {
args.putSerializable(AppConstants.RACE_ID_KEY, mSelectedRace.getId());
args.putSerializable(AppConstants.INTENT_EXTRA_RACE_ID, mSelectedRace.getId());
}
// artificial delay (to prevent "java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState")
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceFragment.java
+3 -3
View File
@@ -53,7 +53,7 @@ public abstract class RaceFragment extends LoggableFragment implements TickListe
public static Bundle createArguments(ManagedRace race) {
Bundle arguments = new Bundle();
arguments.putString(AppConstants.RACE_ID_KEY, race.getId());
arguments.putString(AppConstants.INTENT_EXTRA_RACE_ID, race.getId());
return arguments;
}
@@ -72,7 +72,7 @@ public abstract class RaceFragment extends LoggableFragment implements TickListe
*/
protected Bundle getRecentArguments() {
Bundle args = new Bundle();
args.putString(AppConstants.RACE_ID_KEY, managedRace.getId());
args.putString(AppConstants.INTENT_EXTRA_RACE_ID, managedRace.getId());
return args;
}
@@ -89,7 +89,7 @@ public abstract class RaceFragment extends LoggableFragment implements TickListe
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (getArguments() != null) {
String raceId = getArguments().getString(AppConstants.RACE_ID_KEY);
String raceId = getArguments().getString(AppConstants.INTENT_EXTRA_RACE_ID);
managedRace = OnlineDataManager.create(getActivity()).getDataStore().getRace(raceId);
if (managedRace == null) {
throw new IllegalStateException("Unable to obtain ManagedRace " + raceId + " from datastore on start of " + getClass().getName());