diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-07-13 19:41:54 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-07-13 19:41:54 -0400 |
| commit | 626bd2b0cb8beb8159f4d68df0c338f08415aff2 (patch) | |
| tree | 4ee4e8f76d2fade15310cf687c280dafdc454b5a /app/src/main/java/de/danoeh/antennapod/fragment | |
| parent | 0f8ed8e58ff7f9a6d72f7a17ef6428d50e899256 (diff) | |
| parent | d979c06a2bfd3191407839ce66fd8f3f271753a6 (diff) | |
| download | AntennaPod-626bd2b0cb8beb8159f4d68df0c338f08415aff2.zip | |
Merge pull request #1006 from mfietz/issue/1002-fragment-loading
Load fragment used in last session correctly
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/fragment')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 17bcd7d93..2a1a7aaed 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -614,7 +614,7 @@ public class ItemlistFragment extends ListFragment { Context context = getActivity(); if (context != null) { Feed feed = DBReader.getFeed(context, feedID); - if(feed.getItemFilter() != null) { + if(feed != null && feed.getItemFilter() != null) { FeedItemFilter filter = feed.getItemFilter(); feed.setItems(filter.filter(context, feed.getItems())); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java index fc6225409..975493ce9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java @@ -120,7 +120,7 @@ public class SearchFragment extends ListFragment { SearchResult result = (SearchResult) l.getAdapter().getItem(position); FeedComponent comp = result.getComponent(); if (comp.getClass() == Feed.class) { - ((MainActivity) getActivity()).loadFeedFragmentById(comp.getId()); + ((MainActivity) getActivity()).loadFeedFragmentById(comp.getId(), null); } else { if (comp.getClass() == FeedItem.class) { FeedItem item = (FeedItem) comp; |