Fix breaking APIs from CrashReporter and adds AppServices init

Author: jonalmeida

app/build.gradle

@@ -330,10 +330,9 @@ dependencies {
     implementation libs.mozilla.service.location
     implementation libs.mozilla.service.sync.logins
 
+    implementation libs.mozilla.support.appservices
     implementation libs.mozilla.support.base
     implementation libs.mozilla.support.ktx
-    implementation libs.mozilla.support.rusthttp
-    implementation libs.mozilla.support.rustlog
     implementation libs.mozilla.support.utils
     implementation libs.mozilla.support.webextensions
 

app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt

@@ -26,7 +26,6 @@ import org.mozilla.reference.browser.addons.WebExtensionActionPopupActivity
 import org.mozilla.reference.browser.browser.BrowserFragment
 import org.mozilla.reference.browser.browser.CrashIntegration
 import org.mozilla.reference.browser.ext.components
-import org.mozilla.reference.browser.ext.isCrashReportActive
 
 /**
  * Activity that holds the [BrowserFragment].
@@ -59,12 +58,10 @@ open class BrowserActivity : AppCompatActivity() {
             }
         }
 
-        if (isCrashReportActive) {
-            crashIntegration = CrashIntegration(this, components.analytics.crashReporter) { crash ->
-                onNonFatalCrash(crash)
-            }
-            lifecycle.addObserver(crashIntegration)
+        crashIntegration = CrashIntegration(this, components.analytics.crashReporter) { crash ->
+            onNonFatalCrash(crash)
         }
+        lifecycle.addObserver(crashIntegration)
 
         NotificationManager.checkAndNotifyPolicy(this)
         lifecycle.addObserver(webExtensionPopupObserver)

app/src/main/java/org/mozilla/reference/browser/BrowserApplication.kt

@@ -13,15 +13,14 @@ import mozilla.components.browser.state.action.SystemAction
 import mozilla.components.concept.engine.webextension.isUnsupported
 import mozilla.components.concept.push.PushProcessor
 import mozilla.components.feature.addons.update.GlobalAddonDependencyProvider
+import mozilla.components.support.AppServicesInitializer
 import mozilla.components.support.base.log.Log
 import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.base.log.sink.AndroidLogSink
 import mozilla.components.support.ktx.android.content.isMainProcess
 import mozilla.components.support.ktx.android.content.runOnlyInMainProcess
 import mozilla.components.support.rusthttp.RustHttpConfig
-import mozilla.components.support.rustlog.RustLog
 import mozilla.components.support.webextensions.WebExtensionSupport
-import org.mozilla.reference.browser.ext.isCrashReportActive
 import org.mozilla.reference.browser.push.PushFxaIntegration
 import org.mozilla.reference.browser.push.WebPushEngineIntegration
 import java.util.concurrent.TimeUnit
@@ -34,8 +33,10 @@ open class BrowserApplication : Application() {
 
         setupCrashReporting(this)
 
+        AppServicesInitializer.init(components.analytics.crashReporter)
         RustHttpConfig.setClient(lazy { components.core.client })
-        setupLogging()
+
+        Log.addSink(AndroidLogSink())
 
         if (!isMainProcess()) {
             // If this is not the main process then do not continue with the initialization here. Everything that
@@ -136,18 +137,10 @@ open class BrowserApplication : Application() {
     }
 }
 
-private fun setupLogging() {
-    // We want the log messages of all builds to go to Android logcat
-    Log.addSink(AndroidLogSink())
-    RustLog.enable()
-}
-
 private fun setupCrashReporting(application: BrowserApplication) {
-    if (isCrashReportActive) {
-        application
-            .components
-            .analytics
-            .crashReporter
-            .install(application)
-    }
+    application
+        .components
+        .analytics
+        .crashReporter
+        .install(application)
 }

app/src/main/java/org/mozilla/reference/browser/CrashListActivity.kt

@@ -5,20 +5,40 @@
 package org.mozilla.reference.browser
 
 import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
 import mozilla.components.lib.crash.CrashReporter
-import mozilla.components.lib.crash.ui.AbstractCrashListActivity
-import org.mozilla.reference.browser.ext.components
+import mozilla.components.lib.crash.ui.AbstractCrashListFragment
+import org.mozilla.reference.browser.ext.requireComponents
 
-class CrashListActivity : AbstractCrashListActivity() {
-    override val crashReporter: CrashReporter by lazy { components.analytics.crashReporter }
+/**
+ * A simple activity whose only purpose is to load the [CrashListFragment].
+ */
+class CrashListActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        packageName
+        supportFragmentManager
+            .beginTransaction()
+            .add(android.R.id.content, CrashListFragment())
+            .commit()
+    }
+}
+
+/**
+ * An [AbstractCrashListFragment] implementor that uses the application [CrashReporter].
+ */
+class CrashListFragment : AbstractCrashListFragment() {
+    override val reporter: CrashReporter by lazy { requireComponents.analytics.crashReporter }
 
     override fun onCrashServiceSelected(url: String) {
         val intent = Intent(Intent.ACTION_VIEW).apply {
             data = url.toUri()
-            `package` = packageName
+            `package` = context?.packageName
         }
         startActivity(intent)
-        finish()
+        activity?.finish()
     }
 }

app/src/main/java/org/mozilla/reference/browser/EngineProvider.kt

@@ -14,7 +14,6 @@ import mozilla.components.feature.webcompat.WebCompatFeature
 import mozilla.components.lib.crash.handler.CrashHandlerService
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoRuntimeSettings
-import org.mozilla.reference.browser.ext.isCrashReportActive
 
 object EngineProvider {
     private var runtime: GeckoRuntime? = null
@@ -24,9 +23,7 @@ object EngineProvider {
         if (runtime == null) {
             val builder = GeckoRuntimeSettings.Builder()
 
-            if (isCrashReportActive) {
-                builder.crashHandler(CrashHandlerService::class.java)
-            }
+            builder.crashHandler(CrashHandlerService::class.java)
 
             // About config it's no longer enabled by default
             builder.aboutConfigEnabled(true)

app/src/main/java/org/mozilla/reference/browser/browser/CrashIntegration.kt

@@ -18,7 +18,6 @@ import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.support.utils.ext.registerReceiverCompat
 import org.mozilla.reference.browser.BrowserApplication.Companion.NON_FATAL_CRASH_BROADCAST
-import org.mozilla.reference.browser.ext.isCrashReportActive
 
 class CrashIntegration(
     private val context: Context,
@@ -41,20 +40,16 @@ class CrashIntegration(
 
     override fun onStart(owner: LifecycleOwner) {
         super.onStart(owner)
-        if (isCrashReportActive) {
-            context.registerReceiverCompat(
-                receiver,
-                IntentFilter(NON_FATAL_CRASH_BROADCAST),
-                ContextCompat.RECEIVER_NOT_EXPORTED,
-            )
-        }
+        context.registerReceiverCompat(
+            receiver,
+            IntentFilter(NON_FATAL_CRASH_BROADCAST),
+            ContextCompat.RECEIVER_NOT_EXPORTED,
+        )
     }
 
     override fun onStop(owner: LifecycleOwner) {
         super.onStop(owner)
-        if (isCrashReportActive) {
-            context.unregisterReceiver(receiver)
-        }
+        context.unregisterReceiver(receiver)
     }
 
     @OptIn(DelicateCoroutinesApi::class)

gradle/libs.versions.toml

@@ -173,10 +173,9 @@ mozilla-service-firefox-accounts = { group = "org.mozilla.components", name = "s
 mozilla-service-location = { group = "org.mozilla.components", name = "service-location", version.ref = "android-components" }
 mozilla-service-sync-logins = { group = "org.mozilla.components", name = "service-sync-logins", version.ref = "android-components" }
 
+mozilla-support-appservices = { group = "org.mozilla.components", name = "support-appservices", version.ref = "android-components" }
 mozilla-support-base = { group = "org.mozilla.components", name = "support-base", version.ref = "android-components" }
 mozilla-support-ktx = { group = "org.mozilla.components", name = "support-ktx", version.ref = "android-components" }
-mozilla-support-rusthttp = { group = "org.mozilla.components", name = "support-rusthttp", version.ref = "android-components" }
-mozilla-support-rustlog = { group = "org.mozilla.components", name = "support-rustlog", version.ref = "android-components" }
 mozilla-support-utils = { group = "org.mozilla.components", name = "support-utils", version.ref = "android-components" }
 mozilla-support-webextensions = { group = "org.mozilla.components", name = "support-webextensions", version.ref = "android-components" }