Commit 4dbacd79 authored by tonymanou's avatar tonymanou Committed by topjohnwu

Matching event [un]registering, call super at the end of onPause/onDestroy

Event unregistered in onDestroy() should be registered in onCreate() to
avoid being registered multiple times.
parent ae74d544
...@@ -92,13 +92,13 @@ public class MainActivity extends AppCompatActivity ...@@ -92,13 +92,13 @@ public class MainActivity extends AppCompatActivity
} }
navigationView.setNavigationItemSelectedListener(this); navigationView.setNavigationItemSelectedListener(this);
CallbackHandler.register(recreate, this);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
CallbackHandler.register(StatusFragment.updateCheckDone, this); CallbackHandler.register(StatusFragment.updateCheckDone, this);
CallbackHandler.register(recreate, this);
if (StatusFragment.updateCheckDone.isTriggered) { if (StatusFragment.updateCheckDone.isTriggered) {
onTrigger(StatusFragment.updateCheckDone); onTrigger(StatusFragment.updateCheckDone);
} }
...@@ -107,14 +107,14 @@ public class MainActivity extends AppCompatActivity ...@@ -107,14 +107,14 @@ public class MainActivity extends AppCompatActivity
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause();
CallbackHandler.unRegister(StatusFragment.updateCheckDone, this); CallbackHandler.unRegister(StatusFragment.updateCheckDone, this);
super.onPause();
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy();
CallbackHandler.unRegister(recreate, this); CallbackHandler.unRegister(recreate, this);
super.onDestroy();
} }
@Override @Override
......
...@@ -131,8 +131,8 @@ public class SettingsActivity extends AppCompatActivity { ...@@ -131,8 +131,8 @@ public class SettingsActivity extends AppCompatActivity {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy();
prefs.unregisterOnSharedPreferenceChangeListener(this); prefs.unregisterOnSharedPreferenceChangeListener(this);
super.onDestroy();
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment