From f3622bbc2bcc5e7bc97e94fc147c3ed5b4c3de98 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Tue, 9 Jun 2015 18:29:10 +0200 Subject: [PATCH] Fix bug/crash when opening contextual action bar on tablet layout where two different cab's are present. --- .../main/java/org/transdroid/core/gui/DetailsFragment.java | 5 ++--- .../main/java/org/transdroid/core/gui/TorrentsFragment.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java index 5e2db024..b6189e98 100644 --- a/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/DetailsFragment.java @@ -485,9 +485,8 @@ public class DetailsFragment extends Fragment implements OnTrackersUpdatedListen return onActionItemClicked(mode, menuItem); } }); - if (contextualMenu.getMenu().size() == 0) { - getActivity().getMenuInflater().inflate(R.menu.fragment_details_cab_main, contextualMenu.getMenu()); - } + contextualMenu.getMenu().clear(); + getActivity().getMenuInflater().inflate(R.menu.fragment_details_cab_main, contextualMenu.getMenu()); Context themedContext = ((ActionBarActivity) getActivity()).getSupportActionBar().getThemedContext(); mode.getMenuInflater().inflate(R.menu.fragment_details_cab_secondary, menu); selectionManagerMode = new SelectionManagerMode(themedContext, detailsList, R.plurals.navigation_filesselected); diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java index b5d371c3..ede7e13f 100644 --- a/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java +++ b/app/src/main/java/org/transdroid/core/gui/TorrentsFragment.java @@ -279,9 +279,8 @@ public class TorrentsFragment extends Fragment implements OnLabelPickedListener return onActionItemClicked(mode, menuItem); } }); - if (actionsMenu.getMenu().size() == 0) { - getActivity().getMenuInflater().inflate(R.menu.fragment_torrents_cab, actionsMenu.getMenu()); - } + actionsMenu.getMenu().clear(); + getActivity().getMenuInflater().inflate(R.menu.fragment_torrents_cab, actionsMenu.getMenu()); Context themedContext = ((ActionBarActivity) getActivity()).getSupportActionBar().getThemedContext(); selectionManagerMode = new SelectionManagerMode(themedContext, torrentsList, R.plurals.navigation_torrentsselected); selectionManagerMode.onCreateActionMode(mode, menu);