Move crashlytics to App start & only start up for non-debug builds

Author: niftynei

app/src/main/java/com/zulip/android/ZulipActivity.java

@@ -1,10 +1,7 @@
 package com.zulip.android;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -47,7 +44,6 @@
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.crashlytics.android.Crashlytics;
 import com.j256.ormlite.android.AndroidDatabaseResults;
 
 public class ZulipActivity extends FragmentActivity implements
@@ -156,12 +152,6 @@ public boolean setViewValue(View view, Cursor cursor, int i) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Build.HARDWARE.contains("goldfish")) {
-            Log.i("hardware", "running in emulator");
-        } else {
-            Crashlytics.start(this);
-        }
-
         app = (ZulipApp) getApplicationContext();
         settings = app.settings;
 

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -10,9 +10,11 @@
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
 
+import com.crashlytics.android.Crashlytics;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.RuntimeExceptionDao;
 
@@ -70,6 +72,13 @@ public void onCreate() {
         lastEventId = settings.getInt("lastEventId", -1);
         pointer = settings.getInt("pointer", -1);
 
+
+        if (Build.HARDWARE.contains("goldfish") || BuildConfig.DEBUG) { // dont load crashlytics for debug builds
+            Log.i("hardware", "running in emulator");
+        } else {
+            Crashlytics.start(this);
+        }
+
         this.api_key = settings.getString("api_key", null);
 
         if (api_key != null) {