diff --git a/src/com/annimon/donetskwebcam/MainActivity.java b/src/com/annimon/donetskwebcam/MainActivity.java index dca9d4b..6230078 100644 --- a/src/com/annimon/donetskwebcam/MainActivity.java +++ b/src/com/annimon/donetskwebcam/MainActivity.java @@ -26,13 +26,20 @@ public class MainActivity extends FragmentActivity implements WebcamChooserFragm public boolean onCreateOptionsMenu(Menu menu) { if (isLandscape()) { getMenuInflater().inflate(R.menu.main, menu); - if (lastUrl != null && lastUrl.contains("videoprobki")) { - menu.add(0, R.string.menu_videos, 0, getString(R.string.menu_videos)); - } } return true; } + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + if (isLandscape()) { + final boolean show = (lastUrl != null && lastUrl.contains("videoprobki")); + menu.findItem(R.id.menu_videos).setVisible(show); + } + return true; + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/src/com/annimon/donetskwebcam/WebcamViewerActvity.java b/src/com/annimon/donetskwebcam/WebcamViewerActvity.java index a90a9b4..fb3c5d6 100644 --- a/src/com/annimon/donetskwebcam/WebcamViewerActvity.java +++ b/src/com/annimon/donetskwebcam/WebcamViewerActvity.java @@ -28,10 +28,17 @@ public class WebcamViewerActvity extends FragmentActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.main, menu); - final String lastUrl = getIntent().getExtras().getString("url"); - if (lastUrl != null && lastUrl.contains("videoprobki")) { - menu.add(0, R.string.menu_videos, 0, getString(R.string.menu_videos)); - } return true; } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + super.onPrepareOptionsMenu(menu); + final String lastUrl = getIntent().getExtras().getString("url"); + final boolean show = (lastUrl != null && lastUrl.contains("videoprobki")); + menu.findItem(R.id.menu_videos).setVisible(show); + return true; + } + + } diff --git a/src/com/annimon/donetskwebcam/WebcamViewerFragment.java b/src/com/annimon/donetskwebcam/WebcamViewerFragment.java index 0676ec9..928bc82 100644 --- a/src/com/annimon/donetskwebcam/WebcamViewerFragment.java +++ b/src/com/annimon/donetskwebcam/WebcamViewerFragment.java @@ -60,7 +60,7 @@ public class WebcamViewerFragment extends Fragment { ex.printStackTrace(); } break; - case R.string.menu_videos: + case R.id.menu_videos: final String camimg = "/camimg/cam"; final int start = imageUrl.indexOf(camimg) + camimg.length(); String camId = imageUrl.substring(start, imageUrl.indexOf("-5.jpg"));