diff options
| author | Tom Hennen <tom.hennen@gmail.com> | 2015-04-17 17:37:49 -0400 |
|---|---|---|
| committer | Tom Hennen <tom.hennen@gmail.com> | 2015-04-17 17:37:49 -0400 |
| commit | 5203808f5d816c143f770608d811b6ac2907b397 (patch) | |
| tree | 33be437f81b9f27ebac7a0b8217ac0a3976c33a1 /app/src/main/java/de/danoeh/antennapod | |
| parent | 6142ed7280e7a96e127cc1f129db78e9abcb0921 (diff) | |
| parent | 4b427423b43c78c08a2c60703e2a931a74ea4cc4 (diff) | |
| download | AntennaPod-5203808f5d816c143f770608d811b6ac2907b397.zip | |
Merge branch 'version_1.1.1' of https://github.com/danieloeh/AntennaPod into version_1.1.1
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java | 5 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java index 58b6f734f..2eef7b635 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java @@ -219,7 +219,10 @@ public class AllEpisodesFragment extends Fragment { public void onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); if (itemsLoaded && !MenuItemUtils.isActivityDrawerOpen((NavDrawerActivity) getActivity())) { - menu.findItem(R.id.mark_all_read_item).setVisible(unreadItems != null && !unreadItems.isEmpty()); + MenuItem menuItem = menu.findItem(R.id.mark_all_read_item); + if (menuItem != null) { + menuItem.setVisible(unreadItems != null && !unreadItems.isEmpty()); + } } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index ab38af106..9002227d6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -146,7 +146,10 @@ public class PlaybackHistoryFragment extends ListFragment { public void onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); if (itemsLoaded && !MenuItemUtils.isActivityDrawerOpen((NavDrawerActivity) getActivity())) { - menu.findItem(R.id.clear_history_item).setVisible(playbackHistory != null && !playbackHistory.isEmpty()); + MenuItem menuItem = menu.findItem(R.id.clear_history_item); + if (menuItem != null) { + menuItem.setVisible(playbackHistory != null && !playbackHistory.isEmpty()); + } } } |