diff options
| author | Michael Keppler <bananeweizen@gmx.de> | 2013-12-25 09:05:50 +0100 |
|---|---|---|
| committer | Michael Keppler <bananeweizen@gmx.de> | 2013-12-25 09:05:50 +0100 |
| commit | a10eb5e69fd1754ade87e7138525d7a90440ff0e (patch) | |
| tree | 63a1257f222488df146c095b016644a1affa2085 /main/src/cgeo/geocaching/MainActivity.java | |
| parent | 85c55996229f67b013f6e076826a42d9d830baeb (diff) | |
| download | cgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.zip cgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.tar.gz cgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.tar.bz2 | |
fix #3468: ask for installation of qr code reader
Diffstat (limited to 'main/src/cgeo/geocaching/MainActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/MainActivity.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 4010888..af62430 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -19,7 +19,6 @@ import cgeo.geocaching.ui.dialog.Dialogs; import cgeo.geocaching.utils.DatabaseBackupUtils; import cgeo.geocaching.utils.GeoDirHandler; import cgeo.geocaching.utils.Log; -import cgeo.geocaching.utils.ProcessUtils; import cgeo.geocaching.utils.RunnableWithArgument; import cgeo.geocaching.utils.Version; @@ -72,7 +71,6 @@ public class MainActivity extends AbstractActivity { @InjectView(R.id.offline_count) protected TextView countBubble; @InjectView(R.id.info_area) protected LinearLayout infoArea; - private static final String SCAN_INTENT = "com.google.zxing.client.android.SCAN"; public static final int SEARCH_REQUEST_CODE = 2; private int version = 0; @@ -268,7 +266,6 @@ public class MainActivity extends AbstractActivity { @Override 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; } @@ -312,6 +309,11 @@ public class MainActivity extends AbstractActivity { private void startScannerApplication() { IntentIntegrator integrator = new IntentIntegrator(this); + // integrator dialog is English only, therefore localize it + integrator.setButtonYesByID(android.R.string.yes); + integrator.setButtonNoByID(android.R.string.no); + integrator.setTitleByID(R.string.menu_scan_geo); + integrator.setMessageByID(R.string.menu_scan_description); integrator.initiateScan(IntentIntegrator.QR_CODE_TYPES); } |
