diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java index 3d915925d2b..831ee923dfa 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java @@ -13,6 +13,7 @@ public class AppConstants { 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 AUTHOR_TYPE_OFFICER_START = "Race Officer on Start Vessel"; public final static String AUTHOR_TYPE_OFFICER_FINISH = "Race Officer on Finish Vessel"; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java index 1caefdf73e7..efb0c42fef5 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java @@ -521,8 +521,8 @@ public class LoginActivity extends BaseActivity return ObjectAnimator.ofFloat(target, "alpha", 1f, 0f); } - private void resetData() { - if (backdrop.getY() != 0) { + private void resetData(boolean force) { + if (!force && backdrop.getY() != 0) { return; } @@ -543,9 +543,9 @@ public class LoginActivity extends BaseActivity String action = intent.getAction(); if (AppConstants.INTENT_ACTION_RESET.equals(action)) { - resetData(); + resetData(intent.getBooleanExtra(AppConstants.EXTRA_FORCE_REFRESH, false)); } else if (AppConstants.INTENT_ACTION_VALID_DATA.equals(action)) { - resetData(); + resetData(false); } } } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java index 586be6de2b7..8468ddbeb07 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java @@ -168,6 +168,7 @@ public class LoginBackdrop extends Fragment implements LoginTask.LoginTaskListen private void refreshData() { Intent intent = new Intent(AppConstants.INTENT_ACTION_RESET); + intent.putExtra(AppConstants.EXTRA_FORCE_REFRESH, true); BroadcastManager.getInstance(getActivity()).addIntent(intent); }