MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Event unregistered in onDestroy() should be registered in onCreate() to
avoid being registered multiple times.
This commit is contained in:
tonymanou 2017-01-12 00:51:44 +01:00 committed by topjohnwu
parent ae74d54451
commit 4dbacd79ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -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
@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

2
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -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