Merge pull request #1066 from TomHennen/resolve_race_condition

create PreferenceController before the main fragment

1 files changed, 5 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
index 3802de2a6..94970d833 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -60,10 +60,13 @@ public class PreferenceActivity extends ActionBarActivity {
         root.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
         setContentView(root);
-        prefFragment = new MainFragment();
-        getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
 
+        // we need to create the PreferenceController before the MainFragment
+        // since the MainFragment depends on the preferenceController already being created
         preferenceController = new PreferenceController(preferenceUI);
+
+        prefFragment = new MainFragment();
+        getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit();
     }
 
     @Override