mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 05:11:04 +00:00
keep onReset() in LoginActivity alive in case the "Reload" menu item is re-activated
This commit is contained in:
1 parent
8a14c0a35f
commit
91cbb8b9d6
2 files changed
+11
-6
No files matched your search
+8
-4
@@ -45,8 +45,9 @@ public class BaseActivity extends SendingServiceAwareActivity {
|
||||
|
||||
case R.id.options_menu_reload:
|
||||
ExLog.i(this, TAG, "Clicked RESET");
|
||||
resetApp();
|
||||
return true;
|
||||
final boolean result = onReset();
|
||||
fadeActivity(LoginActivity.class, true);
|
||||
return result;
|
||||
|
||||
case R.id.options_menu_info:
|
||||
ExLog.i(this, TAG, "Clicked INFO");
|
||||
@@ -66,10 +67,13 @@ public class BaseActivity extends SendingServiceAwareActivity {
|
||||
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
||||
}
|
||||
|
||||
private void resetApp() {
|
||||
/**
|
||||
* Redefinitions must call this method.
|
||||
*/
|
||||
protected boolean onReset() {
|
||||
DataManager dataManager = (DataManager) DataManager.create(this);
|
||||
dataManager.resetAll();
|
||||
fadeActivity(LoginActivity.class, true);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+3
-2
@@ -320,14 +320,15 @@ public class LoginActivity extends BaseActivity
|
||||
updateSignInButtonState();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@Override
|
||||
protected boolean onReset() {
|
||||
final boolean result = super.onReset();
|
||||
Fragment courseAreaFragment = getFragmentManager().findFragmentByTag(CourseAreaListFragmentTag);
|
||||
if (courseAreaFragment != null) {
|
||||
getFragmentManager().beginTransaction().remove(courseAreaFragment).commitAllowingStateLoss();
|
||||
}
|
||||
recreate();
|
||||
return true;
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user