From c5b9b05bcc9540b1552362d315668268edf506d8 Mon Sep 17 00:00:00 2001
From: Eric Mill <eric@konklone.com>
Date: Thu, 24 Apr 2014 16:58:12 -0400
Subject: [PATCH] split analytics into global config and tracker-specific
 fields, fix up install tracking

---
 .gitignore                                    |  2 +-
 AndroidManifest.xml                           | 21 ++++++++++++-------
 res/xml/analytics.xml                         |  6 ++++++
 .../android/congress/CongressApp.java         |  8 +++----
 analytics.xml.example => tracker.xml.example  |  3 ---
 5 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 res/xml/analytics.xml
 rename analytics.xml.example => tracker.xml.example (68%)

diff --git a/.gitignore b/.gitignore
index 6f56822e..28172fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /bin
 /gen
 /res/values/keys.xml
-/res/*/analytics*
+/res/*/tracker_*
 /.idea
 
 # gradle/android studio stuff
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 22aa6e77..23da094e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -155,13 +155,20 @@
         </receiver>
 		
 		<service android:name=".notifications.NotificationService" />
-		
-		<!-- Used for install referrer tracking -->
-		<receiver android:name="com.google.android.apps.analytics.AnalyticsReceiver" android:exported="true">
-		  <intent-filter>
-		    <action android:name="com.android.vending.INSTALL_REFERRER" />
-		  </intent-filter>
-		</receiver>
+
+        <!-- Used for install referrer tracking-->
+        <service android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
+        <receiver
+            android:name="com.google.android.gms.analytics.CampaignTrackingReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER" />
+            </intent-filter>
+        </receiver>
+
+        <meta-data android:name="com.google.android.gms.analytics.globalConfigResource"
+            android:resource="@xml/analytics"
+            />
 		
     </application>
 </manifest>
diff --git a/res/xml/analytics.xml b/res/xml/analytics.xml
new file mode 100644
index 00000000..282d48df
--- /dev/null
+++ b/res/xml/analytics.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <bool name="ga_anonymizeIp">true</bool>
+    <string name="ga_logLevel">warn</string>
+    <integer name="ga_dispatchPeriod">1</integer>
+</resources>
\ No newline at end of file
diff --git a/src/com/sunlightlabs/android/congress/CongressApp.java b/src/com/sunlightlabs/android/congress/CongressApp.java
index 1dc30ea0..b0103448 100644
--- a/src/com/sunlightlabs/android/congress/CongressApp.java
+++ b/src/com/sunlightlabs/android/congress/CongressApp.java
@@ -22,13 +22,13 @@ public synchronized Tracker appTracker() {
         if (local == null) {
 
             try {
-                getResources().getXml(R.xml.analytics);
+                getResources().getXml(R.xml.tracker_app);
             } catch(Resources.NotFoundException e) {
                 hasLocal = false;
                 return null;
             }
 
-            local = GoogleAnalytics.getInstance(this).newTracker(R.xml.analytics);
+            local = GoogleAnalytics.getInstance(this).newTracker(R.xml.tracker_app);
         }
 
         return local;
@@ -39,13 +39,13 @@ public synchronized Tracker globalTracker() {
 
         if (global == null) {
             try {
-                getResources().getXml(R.xml.analytics_global);
+                getResources().getXml(R.xml.tracker_global);
             } catch(Resources.NotFoundException e) {
                 hasGlobal = false;
                 return null;
             }
 
-            global = GoogleAnalytics.getInstance(this).newTracker(R.xml.analytics_global);
+            global = GoogleAnalytics.getInstance(this).newTracker(R.xml.tracker_global);
         }
 
         return global;
diff --git a/analytics.xml.example b/tracker.xml.example
similarity index 68%
rename from analytics.xml.example
rename to tracker.xml.example
index 2097a774..e9c32411 100644
--- a/analytics.xml.example
+++ b/tracker.xml.example
@@ -4,7 +4,4 @@ tools:ignore="TypographyDashes">
   <string name="ga_trackingId">UA-XXX-YY</string>
   <bool name="ga_autoActivityTracking">true</bool>
   <bool name="ga_reportUncaughtExceptions">true</bool>
-  <bool name="ga_anonymizeIp">true</bool>
-  <string name="ga_logLevel">warning</string>
-  <integer name="ga_dispatchPeriod">1</integer>
 </resources>