From ce37aa607b2d7d233d6cf0f68f7590ec0c9c42f3 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 27 Feb 2013 16:22:12 -0800
Subject: [PATCH] Move facebook app id to keys.xml file so we can reference it
 from the manifest

---
 astrid/AndroidManifest.xml                         |  1 +
 astrid/build.xml                                   | 14 ++++++++++----
 .../todoroo/astrid/actfm/ActFmLoginActivity.java   |  2 --
 astrid/res/values/keys.xml                         |  2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 486fde02c..7cde14b5a 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -92,6 +92,7 @@
                android:hardwareAccelerated="false" 
                android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
   
+	<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/fb_app_id"/>
     <!-- ====================================================== Activities = -->
         
     <!-- Activity that displays task list -->
diff --git a/astrid/build.xml b/astrid/build.xml
index b699ffd3e..02e266c30 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -70,7 +70,7 @@
       <taskdef name="proguard" classname="proguard.ant.ProGuardTask" classpath="${proguard.jar}" />
     </target>
 
-    <target name="-post-astrid-build" depends="teardown-lite" />
+    <target name="-post-astrid-build" depends="teardown-lite, teardown" />
 
     <target name="copy-sources">
       <delete dir="${source.dir}" />
@@ -183,9 +183,9 @@
     <target name="updatekeys-release" if="build.is.mode.release" depends="updatekeys-pre"
             description="update release-only api key values">
       <property file="${apikey.keyfile}" />
-      <replaceregexp file="${source.dir}/com/todoroo/astrid/actfm/ActFmLoginActivity.java"
-                     match="APP_ID = .*"
-                     replace="APP_ID = &quot;${apikey.facebook.id}&quot;;" />
+      <replaceregexp file="res/values/keys.xml"
+                     match="fb_app_id&quot;&gt;.*&lt;"
+                     replace="fb_app_id&quot;&gt;${apikey.facebook.id}&lt;" />
     </target>
 
 
@@ -342,6 +342,12 @@
 	      <fileset file="../api/build.xml"/>
 	  </subant>
 	</target>
+	
+	<target name="teardown">
+		<replaceregexp file="res/values/keys.xml"
+                       match="fb_app_id&quot;&gt;.*&lt;"
+                       replace="fb_app_id&quot;&gt;183862944961271&lt;" />
+	</target>
 
     <!-- build custom unsigned package with updated version name -->
     <target name="unsigned-custom" depends="clean">
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 47d1d94e4..d1622e85d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -95,8 +95,6 @@ import com.todoroo.astrid.service.TaskService;
  */
 public class ActFmLoginActivity extends SherlockFragmentActivity {
 
-    public static final String APP_ID = "183862944961271"; //$NON-NLS-1$
-
     @Autowired
     protected ExceptionService exceptionService;
     @Autowired
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index bd80961ab..d3e3a4072 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -5,6 +5,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  
+  <string name="fb_app_id">183862944961271</string>
+    
   <!-- ======================================================== REMINDERS == -->
 
   <!-- whether reminders should appear at all -->