Clean up more Google Analytics stuff

CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ---
 
+### 6.0.4 (2018-04-25)
+
+* Fix crash caused by leftover Google Analytics campaign tracker
+
 ### 6.0.3 (2018-04-25)
 
 * Fix crash when manually sorting Google Task lists

app/build.gradle

@@ -20,8 +20,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 529
+        versionCode 530
-        versionName "6.0.3"
+        versionName "6.0.4"
         targetSdkVersion 27
         minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/amazon/AndroidManifest.xml

@@ -1,31 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
   package="org.tasks">
 
-  <application>
+  <application/>
-    <!-- Google Analytics -->
-
-    <receiver
-      android:enabled="true"
-      android:name="com.google.android.gms.analytics.AnalyticsReceiver">
-      <intent-filter>
-        <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
-      </intent-filter>
-    </receiver>
-
-    <service
-      android:enabled="true"
-      android:exported="false"
-      android:name="com.google.android.gms.analytics.AnalyticsService"/>
-
-    <receiver
-      android:exported="true"
-      android:name="com.google.android.gms.analytics.CampaignTrackingReceiver">
-      <intent-filter>
-        <action android:name="com.android.vending.INSTALL_REFERRER"/>
-      </intent-filter>
-    </receiver>
-
-  </application>
 
 </manifest>

app/src/googleplay/AndroidManifest.xml

@@ -47,29 +47,6 @@
     <activity
       android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
       android:theme="@style/TranslucentDialog"/>
-
-    <!-- Google Analytics -->
-
-    <receiver
-      android:enabled="true"
-      android:name="com.google.android.gms.analytics.AnalyticsReceiver">
-      <intent-filter>
-        <action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
-      </intent-filter>
-    </receiver>
-
-    <service
-      android:enabled="true"
-      android:exported="false"
-      android:name="com.google.android.gms.analytics.AnalyticsService"/>
-
-    <receiver
-      android:exported="true"
-      android:name="com.google.android.gms.analytics.CampaignTrackingReceiver">
-      <intent-filter>
-        <action android:name="com.android.vending.INSTALL_REFERRER"/>
-      </intent-filter>
-    </receiver>
   </application>
 
 </manifest>