aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorMichael Keppler <bananeweizen@gmx.de>2013-12-25 09:05:50 +0100
committerMichael Keppler <bananeweizen@gmx.de>2013-12-25 09:05:50 +0100
commita10eb5e69fd1754ade87e7138525d7a90440ff0e (patch)
tree63a1257f222488df146c095b016644a1affa2085 /main
parent85c55996229f67b013f6e076826a42d9d830baeb (diff)
downloadcgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.zip
cgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.tar.gz
cgeo-a10eb5e69fd1754ade87e7138525d7a90440ff0e.tar.bz2
fix #3468: ask for installation of qr code reader
Diffstat (limited to 'main')
-rw-r--r--main/res/values/strings.xml1
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java8
2 files changed, 6 insertions, 3 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 4f16860..d05e52e 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -255,6 +255,7 @@
<string name="menu_filter">Filter</string>
<string name="menu_scan_geo">Scan geocode</string>
<string name="menu_pocket_queries">Pocket queries</string>
+ <string name="menu_scan_description">c:geo can scan geocodes which are printed as QR code. The necessary app is not installed. Do you want to open Google Play to install it?</string>
<!-- main screen -->
<string name="live_map_button">Live map</string>
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);
}