From 865049e156cfdac0d4c01367e74e243a027286ca Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Wed, 18 Dec 2013 22:30:56 +0100 Subject: fix #3398: have options menu for pocket queries --- main/src/cgeo/geocaching/MainActivity.java | 33 ++++++++++++------------------ 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 5a1ca6f..4233d1f 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -268,6 +268,7 @@ public class MainActivity extends AbstractActivity { public boolean onPrepareOptionsMenu(final Menu menu) { super.onPrepareOptionsMenu(menu); menu.findItem(R.id.menu_scan).setEnabled(ProcessUtils.isIntentAvailable(SCAN_INTENT)); + menu.findItem(R.id.menu_pocket_queries).setVisible(Settings.isPremiumMember()); return true; } @@ -290,6 +291,18 @@ public class MainActivity extends AbstractActivity { case R.id.menu_scan: startScannerApplication(); return true; + case R.id.menu_pocket_queries: + if (!Settings.isPremiumMember()) { + return true; + } + new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument() { + + @Override + public void run(final PocketQueryList pql) { + CacheListActivity.startActivityPocket(MainActivity.this, pql); + } + }); + return true; default: return super.onOptionsItemSelected(item); } @@ -512,26 +525,6 @@ public class MainActivity extends AbstractActivity { } }); nearestView.setBackgroundResource(R.drawable.main_nearby); - - nearestView.setOnLongClickListener(new View.OnLongClickListener() { - - @Override - public boolean onLongClick(View v) { - if (!Settings.isPremiumMember()) { - return true; - } - new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument() { - - @Override - public void run(final PocketQueryList pql) { - CacheListActivity.startActivityPocket(MainActivity.this, pql); - } - }); - return true; - } - }); - nearestView.setLongClickable(true); - } navType.setText(res.getString(geo.getLocationProvider().resourceId)); -- cgit v1.1