Merge pull request #160 from dougt/api_key

Add support for an API key

Author: cpeterso

AndroidManifest.xml.in

@@ -66,6 +66,10 @@
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="MY_GOOGLE_API_KEY"/>
 
+        <meta-data
+            android:name="org.mozilla.mozstumbler.API_KEY"
+            android:value="MY_MOZILLA_API_KEY"/>
+
     </application>
 
 </manifest>

build.gradle

@@ -63,9 +63,14 @@ if (hasProperty('StoreFile')) {
 }
 
 // Generate AndroidManifest.xml
-String myAPIKey = hasProperty('APIKey') ? APIKey : "FAKE_GOOGLE_API_KEY";
+String googleAPIKey = hasProperty('APIKey') ? APIKey : "FAKE_GOOGLE_API_KEY";
+String mozillaAPIKey = hasProperty('MozAPIKey') ? MozAPIKey : "FAKE_MOZILLA_API_KEY";
+
 File manifest = file("./AndroidManifest.xml.in")
 String content = manifest.getText('UTF-8')
-content = content.replaceAll(/MY_GOOGLE_API_KEY/, myAPIKey)
+content = content.replaceAll(/MY_GOOGLE_API_KEY/, googleAPIKey)
+content = content.replaceAll(/MY_MOZILLA_API_KEY/, mozillaAPIKey)
+
 manifest = file("./AndroidManifest.xml")
 manifest.write(content, 'UTF-8')
+

src/org/mozilla/mozstumbler/Reporter.java

@@ -3,6 +3,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -30,11 +34,13 @@ class Reporter extends BroadcastReceiver {
     private static final int REPORTER_WINDOW  = 3000; //ms
 
     private static String       MOZSTUMBLER_USER_AGENT_STRING;
+    private static String       MOZSTUMBLER_API_KEY_STRING;
 
     private final Context       mContext;
     private final Prefs         mPrefs;
     private JSONArray           mReports;
-    private volatile long       mLastUploadTime;  //TODO why volatile
+    private long                mLastUploadTime;
+    private URL                 mURL;
 
     private String mWifiData;
     private long   mWifiDataTime;
@@ -61,6 +67,23 @@ class Reporter extends BroadcastReceiver {
             mReports = new JSONArray();
         }
 
+        try {
+            ApplicationInfo appi = context.getPackageManager().getApplicationInfo(context.getPackageName(),
+                                                                                  PackageManager.GET_META_DATA);
+            String apiKey = (String) appi.metaData.get("org.mozilla.mozstumbler.API_KEY");
+            mURL = new URL(LOCATION_URL + "?key=" +  apiKey);
+        } catch (Exception e) {
+            Log.w(LOGTAG, "Not reporting with a valid API key.");
+        }
+
+        try {
+            if (mURL == null) {
+                mURL = new URL(LOCATION_URL);
+            }
+        } catch (Exception f) {
+            Log.e(LOGTAG, "Bad URL: " + LOCATION_URL);
+        }
+
         resetData();
         mContext.registerReceiver(this, new IntentFilter(ScannerService.MESSAGE_TOPIC));
     }
@@ -169,8 +192,7 @@ public void run() {
                 try {
                     Log.d(LOGTAG, "sending results...");
 
-                    URL url = new URL(LOCATION_URL);
-                    HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+                    HttpURLConnection urlConnection = (HttpURLConnection) mURL.openConnection();
                     try {
                         urlConnection.setDoOutput(true);
                         urlConnection.setRequestProperty(USER_AGENT_HEADER, MOZSTUMBLER_USER_AGENT_STRING);
@@ -188,7 +210,7 @@ public void run() {
                         out.write(bytes);
                         out.flush();
 
-                        Log.d(LOGTAG, "uploaded wrapperData: " + wrapperData + " to " + LOCATION_URL);
+                        Log.d(LOGTAG, "uploaded wrapperData: " + wrapperData + " to " + mURL.toString());
 
                         int code = urlConnection.getResponseCode();
                         if (code>=200 && code <= 299) {