diff options
5 files changed, 13 insertions, 6 deletions
diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java index 395d289cb..5fcd45289 100644 --- a/src/de/danoeh/antennapod/activity/MainActivity.java +++ b/src/de/danoeh/antennapod/activity/MainActivity.java @@ -119,8 +119,6 @@ public class MainActivity extends ActionBarActivity { navList.setAdapter(navAdapter); navList.setOnItemClickListener(navListClickListener); - loadData(); - } public ActionBar getMainActivtyActionBar() { @@ -272,6 +270,8 @@ public class MainActivity extends ActionBarActivity { } else if (feeds != null && intent.hasExtra(EXTRA_NAV_INDEX) && intent.hasExtra(EXTRA_NAV_TYPE)) { handleNavIntent(); } + + loadData(); } @Override @@ -342,6 +342,7 @@ public class MainActivity extends ActionBarActivity { }; private void loadData() { + cancelLoadTask(); loadTask = new AsyncTask<Void, Void, List<Feed>>() { @Override protected List<Feed> doInBackground(Void... params) { diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java index c3533bff5..82fe13c32 100644 --- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -96,8 +96,6 @@ public class ItemlistFragment extends ListFragment { Bundle args = getArguments(); if (args == null) throw new IllegalArgumentException("args invalid"); feedID = args.getLong(ARGUMENT_FEED_ID); - - startItemLoader(); } @Override @@ -124,6 +122,7 @@ public class ItemlistFragment extends ListFragment { public void onResume() { super.onResume(); updateProgressBarVisibility(); + startItemLoader(); } @Override diff --git a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java index ae4083c86..3e67599f0 100644 --- a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java +++ b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java @@ -72,13 +72,12 @@ public class NewEpisodesFragment extends Fragment { super.onCreate(savedInstanceState); setRetainInstance(true); setHasOptionsMenu(true); - - startItemLoader(); } @Override public void onResume() { super.onResume(); + startItemLoader(); } @Override diff --git a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index 2abc7a9fb..6369a51c1 100644 --- a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -52,7 +52,11 @@ public class PlaybackHistoryFragment extends ListFragment { super.onCreate(savedInstanceState); setRetainInstance(true); setHasOptionsMenu(true); + } + @Override + public void onResume() { + super.onResume(); startItemLoader(); } diff --git a/src/de/danoeh/antennapod/fragment/QueueFragment.java b/src/de/danoeh/antennapod/fragment/QueueFragment.java index 13f21e3c8..086e8f062 100644 --- a/src/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/src/de/danoeh/antennapod/fragment/QueueFragment.java @@ -73,7 +73,11 @@ public class QueueFragment extends Fragment { super.onCreate(savedInstanceState); setRetainInstance(true); setHasOptionsMenu(true); + } + @Override + public void onResume() { + super.onResume(); startItemLoader(); } |