For #1039: Adds back build config checks

mozilla-mobile · Mar 18, 2019 · 1d1edfe · 1d1edfe
1 parent 26240f3
commit 1d1edfe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -85,6 +85,13 @@ open class FenixApplication : Application() {
     }
 
     private fun setupCrashReporting() {
+        @Suppress("ConstantConditionIf")
+        if (!BuildConfig.CRASH_REPORTING || BuildConfig.BUILD_TYPE != "release") {
+            // Only enable crash reporting if this is a release build and if crash reporting was explicitly enabled
+            // via a Gradle command line flag.
+            return
+        }
+
         components
             .analytics
             .crashReporter

diff --git a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
@@ -27,11 +27,10 @@ import org.mozilla.geckoview.BuildConfig.MOZ_APP_VERSION
 class Analytics(
     private val context: Context
 ) {
-
     val crashReporter: CrashReporter by lazy {
         val sentryService = SentryService(
             context,
-            SENTRY_TOKEN,
+            BuildConfig.SENTRY_TOKEN,
             tags = mapOf("geckoview" to "$MOZ_APP_VERSION-$MOZ_APP_BUILDID"),
             sendEventForNativeCrashes = true
         )
@@ -70,8 +69,4 @@ class Analytics(
             isTelemetryEnabled = { Settings.getInstance(context).isTelemetryEnabled }
         )
     }
-
-    companion object {
-        val SENTRY_TOKEN = "https://718d381780b54062a571b990e1cecd07@sentry.prod.mozaws.net/368"
-    }
 }