From 83f1fe3aab05094f0247c0e0eb0cd558cb6680f2 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 15 Dec 2015 22:32:57 -0600
Subject: [PATCH] Use restricted API key

---
 build.gradle                       | 11 -----------
 src/googleplay/AndroidManifest.xml |  2 +-
 src/main/res/values/keys.xml       |  2 --
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac5ae85ca..fb6e7ff4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,17 +76,6 @@ android {
     }
 }
 
-android.applicationVariants.all { variant ->
-    variant.mergeResources.doLast {
-        if (project.hasProperty('gapiKey')) {
-            File values = file("${buildDir}/intermediates/res/merged/${variant.dirName}/values/values.xml")
-            values.write(
-                    values.getText('UTF-8').replaceAll(/<string name="gapi_key">.*<\/string>/, "<string name=\"gapi_key\">${project.property('gapiKey')}</string>"),
-                    'UTF-8')
-        }
-    }
-}
-
 dependencies {
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
     compile 'com.squareup.dagger:dagger:1.2.2'
diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml
index 1ec1f0de0..65cb50fea 100644
--- a/src/googleplay/AndroidManifest.xml
+++ b/src/googleplay/AndroidManifest.xml
@@ -31,7 +31,7 @@
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/gapi_key"/>
+            android:value="AIzaSyBq82FiK4U8Ke2TV_F8UjDZwgtSy8K9cyQ"/>
 
         <activity
             android:name=".activities.DonationActivity"
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 343d38e4e..46c550329 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -8,8 +8,6 @@
   <string name="app_name">Tasks</string>
   <string name="FSA_label">Tasks Shortcut</string>
 
-  <string name="gapi_key">AIzaSyBXGYNWNQcfse4JS5gI9teTSKMzinWzL2M</string>
-
   <string name="p_date_shortcut_morning">date_shortcut_morning</string>
   <string name="p_date_shortcut_afternoon">date_shortcut_afternoon</string>
   <string name="p_date_shortcut_evening">date_shortcut_evening</string>