mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Merge pull request #621 from timrae/develop

Browse Source 
Don't store persistent reference to mCurrentFragment
This commit is contained in:
Tim Rae 2014-11-09 13:48:52 +09:00
commit f238f09eb5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/ichi2/anki/StudyOptionsActivity.java
View File

@ -39,8 +39,6 @@ import org.json.JSONArray;
public class StudyOptionsActivity extends NavigationDrawerActivity implements StudyOptionsListener {
private StudyOptionsFragment mCurrentFragment;
private BroadcastReceiver mUnmountReceiver = null;
private StyledOpenCollectionDialog mNotMountedDialog;
@ -79,14 +77,19 @@ public class StudyOptionsActivity extends NavigationDrawerActivity implements St
private void loadStudyOptionsFragment(long deckId, Bundle cramConfig) {
mCurrentFragment = StudyOptionsFragment.newInstance(deckId, null);
StudyOptionsFragment currentFragment = StudyOptionsFragment.newInstance(deckId, null);
Bundle args = getIntent().getExtras();
if (cramConfig != null) {
args.putBundle("cramInitialConfig", cramConfig);
}
mCurrentFragment.setArguments(args);
getSupportFragmentManager().beginTransaction().replace(R.id.studyoptions_frame, mCurrentFragment).commit();
currentFragment.setArguments(args);
getSupportFragmentManager().beginTransaction().replace(R.id.studyoptions_frame, currentFragment).commit();
}
private StudyOptionsFragment getCurrentFragment() {
return (StudyOptionsFragment) getSupportFragmentManager().findFragmentById(R.id.studyoptions_frame);
}
@ -97,8 +100,6 @@ public class StudyOptionsActivity extends NavigationDrawerActivity implements St
}
// TODO: onpause, onstop
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// The action bar home/up action should open or close the drawer.
@ -129,9 +130,7 @@ public class StudyOptionsActivity extends NavigationDrawerActivity implements St
if (AnkiDroidApp.setLanguage(newLanguage)) {
AnkiDroidApp.getCompat().invalidateOptionsMenu(this);
}
if (mCurrentFragment != null) {
mCurrentFragment.restorePreferences();
}
getCurrentFragment().restorePreferences();
}
@ -212,12 +211,12 @@ public class StudyOptionsActivity extends NavigationDrawerActivity implements St
@Override
public void refreshMainInterface() {
mCurrentFragment.resetAndRefreshInterface();
getCurrentFragment().resetAndRefreshInterface();
}
@Override
public void createFilteredDeck(JSONArray delays, Object[] terms, Boolean resched) {
mCurrentFragment.createFilteredDeck(delays, terms, resched);
getCurrentFragment().createFilteredDeck(delays, terms, resched);
}
}