Use Crashlytics instead of ACRA.

Since BugSense was acquired by Splunk it now longer accepts ACRA crash reports.
lovethisshit · Oct 10, 2014 · 065a217 · 065a217
1 parent 95b17a4
commit 065a217
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 207 deletions.
diff --git a/Squeezer/build.gradle b/Squeezer/build.gradle
@@ -1,15 +1,19 @@
 buildscript {
     repositories {
         mavenCentral()
+        maven { url 'http://download.crashlytics.com/maven' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
     }
 }
 apply plugin: 'com.android.application'
+apply plugin: 'crashlytics'
 
 repositories {
     mavenCentral()
+    maven { url 'http://download.crashlytics.com/maven' }
 }
 
 dependencies {
@@ -22,13 +26,13 @@ dependencies {
     compile 'com.android.support:appcompat-v7:20.0.0'
 
     // Third party libraries
-    compile 'ch.acra:acra:4.5.0'
     compile 'com.google.guava:guava:17.0'
     // findbugs is required for Proguard to work with Guava.
     compile 'com.google.code.findbugs:jsr305:2.0.2'
 
     // Changelogs, see https://github.com/cketti/ckChangeLog.
     compile 'de.cketti.library.changelog:ckchangelog:1.2.0'
+    compile 'com.crashlytics.android:crashlytics:1.+'
 }
 
 android {
@@ -52,7 +56,7 @@ android {
             // same effect, but this ensures that any changes to
             // proguard-android-optimize.txt are automatically included.
             proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
-            proguardFile "proguard-acra.cfg"
+            proguardFile "proguard-crashlytics.cfg"
             proguardFile "proguard-guava.cfg"
             proguardFile "proguard-squeezer.cfg"
         }

diff --git a/Squeezer/proguard-acra.cfg b/Squeezer/proguard-acra.cfg
diff --git a/Squeezer/proguard-crashlytics.cfg b/Squeezer/proguard-crashlytics.cfg
@@ -0,0 +1,2 @@
+# See http://support.crashlytics.com/knowledgebase/articles/202926-android-studio-and-intellij-with-proguard
+-keepattributes SourceFile,LineNumberTable
diff --git a/Squeezer/proguard.cfg b/Squeezer/proguard.cfg
@@ -64,6 +64,6 @@
 -dontwarn android.support.**
 
 # Squeezer customisations
--include proguard-acra.cfg
+-include proguard-crashlytics.cfg
 -include proguard-guava.cfg
 -include proguard-squeezer.cfg
diff --git a/Squeezer/src/main/AndroidManifest.xml b/Squeezer/src/main/AndroidManifest.xml
@@ -85,12 +85,6 @@
 
         <activity android:name=".service.CancelDownloadsActivity" android:theme="@android:style/Theme.Dialog" />
 
-        <activity android:name="org.acra.CrashReportDialog"
-            android:theme="@android:style/Theme.Dialog"
-            android:launchMode="singleInstance"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true"/>
-
         <service android:exported="false" android:label="Squeezer Service"
             android:name=".service.SqueezeService">
         </service>
@@ -111,5 +105,6 @@
                 <action android:name="com.android.vending.INSTALL_REFERRER"/>
             </intent-filter>
         </receiver>
+        <meta-data android:name="com.crashlytics.ApiKey" android:value="564923eeae7942c2822447dec7527419e8e62e51"/>
     </application>
 </manifest>
diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/HomeActivity.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/HomeActivity.java
@@ -17,8 +17,6 @@
 package uk.org.ngo.squeezer;
 
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -34,6 +32,9 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import com.crashlytics.android.Crashlytics;
+import com.google.android.apps.analytics.GoogleAnalyticsTracker;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -98,6 +99,7 @@ public class HomeActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Crashlytics.start(this);
         setContentView(R.layout.item_list);
         listView = (ListView) findViewById(R.id.item_list);
 
@@ -259,9 +261,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 case INTERNET_RADIO:
                     // Uncomment these next two lines as an easy way to check
                     // crash reporting functionality.
-
-                    // String sCrashString = null;
-                    // Log.e("MyApp", sCrashString.toString());
+                    //String sCrashString = null;
+                    //Log.e("MyApp", sCrashString);
                     RadioListActivity.show(HomeActivity.this);
                     break;
                 case FAVORITES:

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/Squeezer.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/Squeezer.java
@@ -1,24 +1,12 @@
 package uk.org.ngo.squeezer;
 
 
-import org.acra.ACRA;
-import org.acra.ReportingInteractionMode;
-import org.acra.annotation.ReportsCrashes;
-
 import android.app.Application;
 import android.content.Context;
 
 // Trick to make the app context useful available everywhere.
 // See http://stackoverflow.com/questions/987072/using-application-context-everywhere
 
-@ReportsCrashes(formUri = "http://www.bugsense.com/api/acra?api_key=804fa58d",
-        mode = ReportingInteractionMode.DIALOG,
-        resToastText = R.string.crash_toast_text,
-        resDialogText = R.string.crash_dialog_text,
-        resDialogCommentPrompt = R.string.crash_dialog_comment_prompt,
-        resDialogOkToast = R.string.crash_dialog_ok_toast,
-        sharedPreferencesName = Preferences.NAME,
-        formKey = "")
 public class Squeezer extends Application {
 
     private static Squeezer instance;
@@ -30,11 +18,5 @@ public Squeezer() {
     public static Context getContext() {
         return instance;
     }
-
-    @Override
-    public void onCreate() {
-        ACRA.init(this);
-        super.onCreate();
-    }
 }
 
diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/dialog/ServerAddressPreference.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/dialog/ServerAddressPreference.java
@@ -39,7 +39,7 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import org.acra.ErrorReporter;
+import com.crashlytics.android.Crashlytics;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -430,13 +430,13 @@ protected Void doInBackground(Void... unused) {
                 }
             } catch (SocketException e) {
                 // new DatagramSocket(3483)
-                ErrorReporter.getInstance().handleException(e);
+                Crashlytics.logException(e);
             } catch (UnknownHostException e) {
                 // InetAddress.getByName()
-                ErrorReporter.getInstance().handleException(e);
+                Crashlytics.logException(e);
             } catch (IOException e) {
                 // socket.send()
-                ErrorReporter.getInstance().handleException(e);
+                Crashlytics.logException(e);
             }
 
             if (socket != null) {

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/CliClient.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/CliClient.java
@@ -18,10 +18,9 @@
 
 import android.util.Log;
 
+import com.crashlytics.android.Crashlytics;
 import com.google.common.base.Joiner;
 
-import org.acra.ACRA;
-
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -276,7 +275,7 @@ synchronized void sendCommandImmediately(String... commands) {
 
         String formattedCommands = mNewlineJoiner.join(commands);
         Log.v(TAG, "SENDING: " + formattedCommands);
-        ACRA.getErrorReporter().putCustomData("lastCommands", formattedCommands);
+        Crashlytics.setString("lastCommands", formattedCommands);
         writer.println(formattedCommands);
         writer.flush();
     }

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/SqueezeService.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/SqueezeService.java
@@ -34,7 +34,7 @@
 import android.util.Base64;
 import android.util.Log;
 
-import org.acra.ACRA;
+import com.crashlytics.android.Crashlytics;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -497,7 +497,7 @@ public void handle(List<String> tokens) {
 
     void onLineReceived(String serverLine) {
         Log.v(TAG, "LINE: " + serverLine);
-        ACRA.getErrorReporter().putCustomData("lastReceivedLine", serverLine);
+        Crashlytics.setString("lastReceivedLine", serverLine);
 
         List<String> tokens = Arrays.asList(serverLine.split(" "));
         if (tokens.size() < 2) {

diff --git a/Squeezer/src/main/res/values-da/strings.xml b/Squeezer/src/main/res/values-da/strings.xml
@@ -180,33 +180,8 @@
     <string name="songs_sort_order_title">Titel</string>
     <string name="songs_sort_order_tracknum">Spor</string>
 
-    <!--  Crash notifications -->
-    <string name="crash_toast_text">Beklager, der opstod en fejl.</string>
-    <string name="crash_dialog_text">En uventet fejl opstod, og Squeezer gik ned. En fejlrapport er
-        udarbejdet, tryk venligst på OK for at sende den. Ingen personidentificerende oplysninger er
-        medtaget i denne rapport.
-    </string>
-    <string name="crash_dialog_comment_prompt">Hvis du har yderligere kommentarer, som du mener er
-        nyttigte, kan du indtaste dem her.
-    </string>
-    <string name="crash_dialog_ok_toast">Tak fordi du hjælper os med at forbedre Squeezer.</string>
-
-    <!--  ACRA preference strings -->
-    <string name="pref_cat_error_reports">Fejlrapporter og statistik</string>
-    <string name="pref_disable_acra">Rapportér fejl</string>
-    <string name="pref_acra_enabled">Fejl fanges, og du har mulighed for at sende en rapport til
-        udviklerne.
-    </string>
-    <string name="pref_acra_disabled">Fejl bliver fanget, men du vil ikke blive bedt om at sende en
-        rapport. Ingen rapport sendes.
-    </string>
-
-    <string name="pref_acra_alwaysaccept">Send rapporter automatisk</string>
-    <string name="pref_acra_alwaysaccept_enabled">Fejl vil automatisk blive rapporteret.</string>
-    <string name="pref_acra_alwaysaccept_disabled">Fejl vil ikke automatisk blive rapporteret.
-    </string>
-
     <!--  Analytics preference strings -->
+    <string name="pref_cat_error_reports">Fejlrapporter og statistik</string>
     <string name="pref_analytics_enable">Send brugsstatistikker</string>
     <string name="pref_analytics_enable_enabled">Anonyme brugsstatistikker indsamles ved hjælp af
         Google Analytics.

diff --git a/Squeezer/src/main/res/values-de/strings.xml b/Squeezer/src/main/res/values-de/strings.xml
@@ -160,34 +160,8 @@
     <string name="songs_sort_order_title">Titel</string>
     <string name="songs_sort_order_tracknum">Nummer</string>
 
-    <!--  Crash notifications -->
-    <string name="crash_toast_text">Entschuldigung, es ist ein Fehler aufgetreten.</string>
-    <string name="crash_dialog_text">Ein unerwarteter Fehler hat Squeezer zum Absturz gebracht. Ein
-        Fehlerbericht wurde erstellt. Wählen Sie OK aus, um ihn zu senden. Der Bericht enthält keine
-        persönlichen Daten.
-    </string>
-    <string name="crash_dialog_comment_prompt">Hier können Sie weitere Kommentare eingeben, die bei
-        der Behebung des Problems hilfreich sein können.
-    </string>
-    <string name="crash_dialog_ok_toast">Vielen Dank für Ihre Hilfe, Squeezer zu Verbessern.
-    </string>
-
-    <!--  ACRA preference strings -->
-    <string name="pref_cat_error_reports">Fehlerberichte und Statistiken</string>
-    <string name="pref_disable_acra">Fehlerberichte senden</string>
-    <string name="pref_acra_enabled">Sie haben die Möglichkeit, im Fehlerfall einen Bericht an die
-        Entwickler zu senden.
-    </string>
-    <string name="pref_acra_disabled">Es werden keine Fehlerberichte gesendet.</string>
-
-    <string name="pref_acra_alwaysaccept">Fehlerbericht automatisch senden</string>
-    <string name="pref_acra_alwaysaccept_enabled">Fehlerberichte werden automatisch gesendet.
-    </string>
-    <string name="pref_acra_alwaysaccept_disabled">Fehlerberichte werden nicht automatisch
-        gesendet.
-    </string>
-
     <!--  Analytics preference strings -->
+    <string name="pref_cat_error_reports">Fehlerberichte und Statistiken</string>
     <string name="pref_analytics_enable">Benutzungsstatistiken senden</string>
     <string name="pref_analytics_enable_enabled">Anonyme Benutzungsstatistiken werden mit Google
         Analytics erstellt.

diff --git a/Squeezer/src/main/res/values-nl/strings.xml b/Squeezer/src/main/res/values-nl/strings.xml
@@ -161,34 +161,8 @@
     <string name="song_display_options">Opties bij view nummer</string>
     <string name="songs_sort_order_title">Titel</string>
     <string name="songs_sort_order_tracknum">Nummer</string>
-    <!--Crash notifications-->
-    <string name="crash_toast_text">Sorry, er trad een fout op.</string>
-    <string name="crash_dialog_text">Een onverwachte fout trad op, en Squeezer is gecrashed. Een
-        fouten-rapport is opgesteld, graag op OK drukken om het te versturen. Geen persoonlijke
-        informatie wordt verstrekt in dit rapport.
-    </string>
-    <string name="crash_dialog_comment_prompt">Als er andere toevoegingen zijn waarvan u denkt dat ze
-      handig zijn, gelieve ze hier in te vullen.
-    </string>
-    <string name="crash_dialog_ok_toast">Bedankt voor het meehelpen aan het verbeteren van
-        Squeezer.
-    </string>
-    <!--ACRA preference strings-->
-    <string name="pref_cat_error_reports">Fouten rapporten en statistieken</string>
-    <string name="pref_disable_acra">Rapporteer fouten</string>
-    <string name="pref_acra_enabled">Fouten worden afgehandeld, en u heeft de optie een rapport te
-        versturen naar de ontwikkelaars.
-    </string>
-    <string name="pref_acra_disabled">Fouten worden afgehandeld, maar u wordt niet gedwongen een
-        rapport te versturen. Er is geen rapport verzonden.
-    </string>
-    <string name="pref_acra_user_email">Je e-mail adres</string>
-    <string name="pref_acra_user_email_summary">Als je een geldig adres achterlaat dan kunnen de ontwikkelaars
-        je benaderen voor het verschaffen van meer informatie.</string>
-    <string name="pref_acra_alwaysaccept">Verstuur rapporten automatisch.</string>
-    <string name="pref_acra_alwaysaccept_enabled">Fouten zullen automatisch worden gerapporteerd.</string>
-    <string name="pref_acra_alwaysaccept_disabled">Fouten worden niet automatisch gerapporteerd.</string>
     <!--Analytics preference strings-->
+    <string name="pref_cat_error_reports">Fouten rapporten en statistieken</string>
     <string name="pref_analytics_enable">Verzend gebruiks-statistieken</string>
     <string name="pref_analytics_enable_enabled">Anonieme gebruiks-statistieken zijn verzameld met
         behulp van Google Analytics.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# See http://support.crashlytics.com/knowledgebase/articles/202926-android-studio-and-intellij-with-proguard
		-keepattributes SourceFile,LineNumberTable