Fix key in AndroidManifest.xml.in

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/AndroidManifest.xml.in
index 488a6766d95793b6bc8726bbf735a4ddbc017eb4..3409c9fe663b4b6ee2adbc679b8c18656380577b 100644 (file)
--- a/altosdroid/AndroidManifest.xml.in
+++ b/altosdroid/AndroidManifest.xml.in
@@ -100,7 +100,7 @@
         <service android:name=".TelemetryService" />
 
         <meta-data android:name="com.google.android.maps.v2.API_KEY"
-                   android:value="AIzaSyDSr6u4i9TJmVGhgGk4g0wUUhTy9FGyn0s"/>
+                   android:value="@GOOGLEKEY@"/>
         <meta-data android:name="com.google.android.gms.version"
                    android:value="@integer/google_play_services_version" />
     </application>

diff --git a/altoslib/AltosVersion.java.in b/altoslib/AltosVersion.java.in
index 050b9480d8e86b06467e7f65a14e21b181ee2a28..9ac94dcdec88acee9bf8b5fb67529e5066dacf47 100644 (file)
--- a/altoslib/AltosVersion.java.in
+++ b/altoslib/AltosVersion.java.in
@@ -20,7 +20,7 @@ package org.altusmetrum.altoslib_10;
 public class AltosVersion {
        public final static String version = "@VERSION@";
 
-       public final static String google_maps_api_key = @GOOGLEKEY@;
+       public final static String google_maps_api_key = "@GOOGLEKEY@";
 
        public static boolean has_google_maps_api_key() {
                return google_maps_api_key != null && google_maps_api_key.length() > 1;

diff --git a/configure.ac b/configure.ac
index 805901335e517c555e87dfadb2e2f6d362a8143c..ee3d4225f84d85fb58a7876fce82550a34554339 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -174,7 +174,7 @@ AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
            [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
 
 if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
-       GOOGLEKEY='"'`cat "$GOOGLEKEYFILE"`'"'
+       GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
        HAVE_GOOGLE_KEY="yes"
 else
        GOOGLEKEY='null'