Using a custom script to build Config.java to include app tokens

wordpress-mobile · roundhill · Jun 7, 2013 · Apr 11, 2013 · Apr 10, 2013 · Apr 8, 2013
commit a589de3011cdf431978a37de2bddc79affac1307
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /gen
 local.properties
 res/raw/config.properties
-.jdbrc
+.jdbrc
+src/org/wordpress/android/Config.java
diff --git a/config.properties.sample b/config.properties.sample
diff --git a/custom_rules.xml b/custom_rules.xml
@@ -0,0 +1,11 @@
+<project default="package">
+    <property file="local.properties"/>
+    <property file="project.properties"/>
+    <!-- Create a config class with values for this build -->
+    <target name="-pre-build">
+      <exec executable="./wpconfig">
+        <arg value="${source.absolute.dir}/org/wordpress/android/Config.java" />
+      </exec>      
+    </target>
+
+</project>
diff --git a/src/org/wordpress/android/WordPress.java b/src/org/wordpress/android/WordPress.java
@@ -9,7 +9,6 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import android.app.Application;
 import android.content.Context;
@@ -43,6 +42,7 @@
 import org.wordpress.android.ui.WPActionBarActivity;
 import org.wordpress.android.util.BitmapLruCache;
 import org.wordpress.android.util.WPRestClient;
+import org.wordpress.android.Config;
 
 public class WordPress extends Application {
 
@@ -63,7 +63,6 @@ public class WordPress extends Application {
     public static boolean postsShouldRefresh;
     public static boolean shouldRestoreSelectedActivity;
     public static WPRestClient restClient;
-    public static Properties config;
     public static RequestQueue requestQueue;
     public static ImageLoader imageLoader;
     public static JSONObject latestNotes;
@@ -72,7 +71,6 @@ public class WordPress extends Application {
 
     @Override
     public void onCreate() {
-        loadProperties();
         versionName = getVersionName();
         wpDB = new WordPressDB(this);
 
@@ -103,7 +101,7 @@ public static void registerForCloudMessaging(Context ctx) {
                 GCMRegistrar.checkDevice(ctx);
                 GCMRegistrar.checkManifest(ctx);
                 token = GCMRegistrar.getRegistrationId(ctx);
-                String gcmId = WordPress.config.getProperty("gcm.id").toString();
+                String gcmId = Config.GCM_ID;
                 if (gcmId != null && token.equals("")) {
                     GCMRegistrar.register(ctx, gcmId);
                 } else {
@@ -278,19 +276,6 @@ public static Blog setCurrentBlog(int id) {
 
         return currentBlog;
     }
-    /**
-     * Load res/raw/config.properties into a Properties object
-     */
-    private void loadProperties(){
-        config = new Properties();
-        InputStream stream = getResources().openRawResource(R.raw.config);
-        try {
-            config.load(stream);               
-        } catch(java.io.IOException error){
-            config = null;
-            Log.e(TAG, "Could not load config.properties", error);
-        }
-    }
     /**
      * Restores notifications from cached file
      */
@@ -425,9 +410,7 @@ public void requestAccessToken(final WPRestClient.Request request){
             final SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(WordPress.this);
             String username = settings.getString(WPCOM_USERNAME_PREFERENCE, null);
             String password = WordPressDB.decryptPassword(settings.getString(WPCOM_PASSWORD_PREFERENCE, null));
-            Oauth oauth = new Oauth(config.getProperty(APP_ID_PROPERTY),
-                                        config.getProperty(APP_SECRET_PROPERTY),
-                                        config.getProperty(APP_REDIRECT_PROPERTY));
+            Oauth oauth = new Oauth(Config.OAUTH_APP_ID, Config.OAUTH_APP_SECRET, Config.OAUTH_REDIRECT_URI);
             // make oauth volley request
             Request oauthRequest = oauth.makeRequest(username, password,
                 new Oauth.Listener(){

diff --git a/src/org/wordpress/android/WordPressDB.java b/src/org/wordpress/android/WordPressDB.java
@@ -125,7 +125,7 @@ public class WordPressDB {
 
     private SQLiteDatabase db;
 
-    protected static final String PASSWORD_SECRET = "nottherealpasscode";
+    protected static final String PASSWORD_SECRET = Config.DB_SECRET;
 
     public String defaultBlog = "";
 

diff --git a/wpconfig b/wpconfig
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'erb'
+
+constants = {}
+
+File.open('local.properties', 'r') do |f|
+  f.each_line do |line|
+    if line.index '='
+      name, value = line.split '=', 2
+      key = name.split '.'
+      constants[key[1..-1].join('_').upcase.strip] = value.strip if key[0] == 'wp'
+    end
+  end
+end
+
+File.open(ARGV[0], 'w') do |f|
+  f.puts ERB.new(<<-JAVA).result binding
+package org.wordpress.android;
+
+class Config {
+  <% constants.each do |name, value| %>
+    protected static final String <%=name%>="<%=value%>";
+  <% end %>
+}
+JAVA
+end