diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-08 08:10:40 -0500 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-08 08:10:40 -0500 |
| commit | 02a7bf1d8a20138a24efa4ba880f98a8f11f6c65 (patch) | |
| tree | bde8015ff74d397892694a7b364ffa0b6453d16e | |
| parent | ed9387e4206ef8cfa479d1694a592d92d96b29cf (diff) | |
| parent | 3f3484b0fe484a29f3f1c12ad813f38fe329e46b (diff) | |
| download | AntennaPod-02a7bf1d8a20138a24efa4ba880f98a8f11f6c65.zip | |
Merge pull request #1359 from mfietz/issue/1358-itemlistfragment-delete-feed
ItemFragmentList: Exception when deleting current feed
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 4 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index d860f2b01..df680a297 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -278,7 +278,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity } } - public void loadFragment(final String tag, Bundle args) { + public void loadFragment(String tag, Bundle args) { Log.d(TAG, "loadFragment(tag: " + tag + ", args: " + args + ")"); Fragment fragment = null; switch (tag) { @@ -299,7 +299,9 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity break; default: // default to the queue + tag = QueueFragment.TAG; fragment = new QueueFragment(); + args = null; break; } currentTitle = navAdapter.getLabel(tag); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java index 8505cf143..ba3dfc2af 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -274,7 +274,7 @@ public class ItemlistFragment extends ListFragment { @Override protected void onPostExecute(Void result) { super.onPostExecute(result); - ((MainActivity) getActivity()).loadFragment(NewEpisodesFragment.TAG, null); + ((MainActivity) getActivity()).loadFragment(EpisodesFragment.TAG, null); } }; ConfirmationDialog conDialog = new ConfirmationDialog(getActivity(), |