refactor: address review feedback for CrashReporter extraction

Author: criticalAY

AnkiDroid/src/androidTest/java/com/ichi2/anki/tests/ACRATest.kt

@@ -22,14 +22,14 @@ import androidx.core.content.edit
 import androidx.test.annotation.UiThreadTest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.anki.AnkiDroidApp
-import com.ichi2.anki.CrashReportService
-import com.ichi2.anki.CrashReporter.Companion.FEEDBACK_REPORT_ALWAYS
-import com.ichi2.anki.CrashReporter.Companion.FEEDBACK_REPORT_ASK
-import com.ichi2.anki.CrashReporter.Companion.FEEDBACK_REPORT_KEY
-import com.ichi2.anki.CrashReporter.Companion.FEEDBACK_REPORT_NEVER
 import com.ichi2.anki.R
+import com.ichi2.anki.acraCoreConfigBuilder
 import com.ichi2.anki.analytics.UsageAnalytics
-import com.ichi2.anki.getAcraCoreConfigBuilder
+import com.ichi2.anki.common.crash.CrashReportService
+import com.ichi2.anki.common.crash.CrashReporter.Companion.FEEDBACK_REPORT_ALWAYS
+import com.ichi2.anki.common.crash.CrashReporter.Companion.FEEDBACK_REPORT_ASK
+import com.ichi2.anki.common.crash.CrashReporter.Companion.FEEDBACK_REPORT_KEY
+import com.ichi2.anki.common.crash.CrashReporter.Companion.FEEDBACK_REPORT_NEVER
 import com.ichi2.anki.logging.ProductionCrashReportingTree
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.servicelayer.ThrowableFilterService
@@ -78,7 +78,7 @@ class ACRATest : InstrumentedTest() {
         setDebugACRAConfig(sharedPrefs)
         assertArrayEquals(
             "Debug logcat arguments not set correctly",
-            getAcraCoreConfigBuilder()
+            CrashReportService.acraCoreConfigBuilder
                 .build()
                 .logcatArguments
                 .toTypedArray(),
@@ -158,12 +158,12 @@ class ACRATest : InstrumentedTest() {
         val crashData =
             CrashReportDataFactory(
                 testContext,
-                getAcraCoreConfigBuilder().build(),
+                CrashReportService.acraCoreConfigBuilder.build(),
             ).createCrashData(ReportBuilder().exception(crash))
         assertTrue(
             LimitingReportAdministrator().shouldSendReport(
                 testContext,
-                getAcraCoreConfigBuilder().build(),
+                CrashReportService.acraCoreConfigBuilder.build(),
                 crashData,
             ),
         )
@@ -172,7 +172,7 @@ class ACRATest : InstrumentedTest() {
         assertFalse(
             LimitingReportAdministrator().shouldSendReport(
                 testContext,
-                getAcraCoreConfigBuilder().build(),
+                CrashReportService.acraCoreConfigBuilder.build(),
                 crashData,
             ),
         )
@@ -184,7 +184,7 @@ class ACRATest : InstrumentedTest() {
         assertTrue(
             LimitingReportAdministrator().shouldSendReport(
                 testContext,
-                getAcraCoreConfigBuilder().build(),
+                CrashReportService.acraCoreConfigBuilder.build(),
                 crashData,
             ),
         )
@@ -291,7 +291,7 @@ class ACRATest : InstrumentedTest() {
         message: String,
         isEnabled: Boolean,
     ) {
-        val config = getAcraCoreConfigBuilder().build()
+        val config = CrashReportService.acraCoreConfigBuilder.build()
         for (configuration in config.pluginConfigurations) {
             // Make sure the dialog is set to pop up
             if (configuration.javaClass.toString().contains("Dialog")) {
@@ -302,7 +302,7 @@ class ACRATest : InstrumentedTest() {
 
     @Throws(ACRAConfigurationException::class)
     private fun assertToastIsEnabled() {
-        val config = getAcraCoreConfigBuilder().build()
+        val config = CrashReportService.acraCoreConfigBuilder.build()
         for (configuration in config.pluginConfigurations) {
             if (configuration.javaClass.toString().contains("Toast")) {
                 assertThat("Toast should be enabled", configuration.enabled(), equalTo(true))
@@ -314,7 +314,7 @@ class ACRATest : InstrumentedTest() {
     private fun assertToastMessage(
         @StringRes res: Int,
     ) {
-        val config = getAcraCoreConfigBuilder().build()
+        val config = CrashReportService.acraCoreConfigBuilder.build()
         for (configuration in config.pluginConfigurations) {
             if (configuration.javaClass.toString().contains("Toast")) {
                 assertEquals(

AnkiDroid/src/main/java/com/ichi2/anki/AcraCrashReporter.kt

@@ -27,6 +27,8 @@ import androidx.webkit.WebViewCompat
 import com.ichi2.anki.analytics.AnkiDroidCrashReportDialog
 import com.ichi2.anki.analytics.UsageAnalytics
 import com.ichi2.anki.analytics.UsageAnalytics.sendAnalyticsException
+import com.ichi2.anki.common.crash.CrashReportService
+import com.ichi2.anki.common.crash.CrashReporter
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.exception.ManuallyReportedException
 import com.ichi2.anki.exception.UserSubmittedException
@@ -45,11 +47,11 @@ import org.acra.sender.HttpSender
 import timber.log.Timber
 
 private object AcraCrashReporter : CrashReporter {
-    // ACRA constants used for stored preferences
-    const val FEEDBACK_REPORT_KEY = "reportErrorMode"
-    const val FEEDBACK_REPORT_ASK = "2"
-    const val FEEDBACK_REPORT_NEVER = "1"
-    const val FEEDBACK_REPORT_ALWAYS = "0"
+    // ACRA constants — reference the interface companion
+    val FEEDBACK_REPORT_KEY = CrashReporter.FEEDBACK_REPORT_KEY
+    val FEEDBACK_REPORT_ASK = CrashReporter.FEEDBACK_REPORT_ASK
+    val FEEDBACK_REPORT_NEVER = CrashReporter.FEEDBACK_REPORT_NEVER
+    val FEEDBACK_REPORT_ALWAYS = CrashReporter.FEEDBACK_REPORT_ALWAYS
 
     /** Our ACRA configurations, initialized during Application.onCreate()  */
     @JvmStatic
@@ -410,19 +412,20 @@ private object AcraCrashReporter : CrashReporter {
 }
 
 /**
- * Initializes ACRA crash reporting and returns the reporter
- * as a [CrashReporter] for use with [CrashReportService].
+ * Initializes ACRA crash reporting and wires it up as the
+ * global [CrashReportService] reporter.
  */
 context(application: Application)
-fun initializeAcraCrashReporter(): CrashReporter {
+fun initializeAcraCrashReporter() {
     AcraCrashReporter.initialize(application)
-    return AcraCrashReporter
+    CrashReportService.setReporter(AcraCrashReporter)
 }
 
 fun isAcraSenderProcess(): Boolean = AcraCrashReporter.isProperServiceProcess()
 
 @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-fun getAcraCoreConfigBuilder(): CoreConfigurationBuilder = AcraCrashReporter.acraCoreConfigBuilder
+val CrashReportService.acraCoreConfigBuilder: CoreConfigurationBuilder
+    get() = AcraCrashReporter.acraCoreConfigBuilder
 
 @VisibleForTesting(otherwise = VisibleForTesting.NONE)
 fun setDebugACRAConfig(sharedPrefs: SharedPreferences) = AcraCrashReporter.setDebugACRAConfig(sharedPrefs)

AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.kt

@@ -61,6 +61,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.common.annotations.LegacyNotifications
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.compat.CompatHelper
 import com.ichi2.anki.compat.CompatHelper.Companion.registerReceiverCompat

AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.kt

@@ -35,11 +35,11 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.MutableLiveData
 import anki.collection.OpChanges
 import com.ichi2.anki.AnkiDroidApp.Companion.sharedPreferencesTestingOverride
-import com.ichi2.anki.CrashReportService.sendExceptionReport
 import com.ichi2.anki.analytics.UsageAnalytics
 import com.ichi2.anki.browser.SharedPreferencesLastDeckIdRepository
 import com.ichi2.anki.common.annotations.LegacyNotifications
 import com.ichi2.anki.common.annotations.NeedsTest
+import com.ichi2.anki.common.crash.CrashReportService.sendExceptionReport
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.compat.CompatHelper
 import com.ichi2.anki.contextmenu.AnkiCardContextMenu
@@ -134,8 +134,7 @@ open class AnkiDroidApp :
         // Ensures any change is propagated to widgets
         ChangeManager.subscribe(this)
 
-        val crashReporter = initializeAcraCrashReporter()
-        CrashReportService.setReporter(crashReporter)
+        initializeAcraCrashReporter()
         val logType = LogType.value
         when (logType) {
             LogType.DEBUG -> Timber.plant(DebugTree())

AnkiDroid/src/main/java/com/ichi2/anki/CoroutineHelpers.kt

@@ -41,6 +41,7 @@ import com.ichi2.anki.CrashReportData.HelpAction
 import com.ichi2.anki.CrashReportData.HelpAction.AnkiBackendLink
 import com.ichi2.anki.CrashReportData.HelpAction.OpenDeckOptions
 import com.ichi2.anki.common.annotations.UseContextParameter
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.dialogs.DatabaseErrorDialog.DatabaseErrorDialogType
 import com.ichi2.anki.exception.StorageAccessException

AnkiDroid/src/main/java/com/ichi2/anki/DayRolloverHandler.kt

@@ -35,6 +35,7 @@ import androidx.core.content.ContextCompat.RECEIVER_EXPORTED
 import anki.collection.OpChanges
 import anki.collection.opChanges
 import com.ichi2.anki.CollectionManager.withOpenColOrNull
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.exception.ManuallyReportedException
 import com.ichi2.anki.libanki.EpochSeconds
 import com.ichi2.anki.libanki.sched.Scheduler

AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt

@@ -94,6 +94,7 @@ import com.ichi2.anki.android.back.exitViaDoubleTapBackCallback
 import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.common.annotations.NeedsTest
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.common.time.TimeManager
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat

AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt

@@ -27,6 +27,7 @@ import android.os.Parcelable
 import androidx.annotation.CheckResult
 import androidx.annotation.RequiresApi
 import androidx.core.content.edit
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.compat.CompatHelper.Companion.sdkVersion
 import com.ichi2.anki.dialogs.DatabaseErrorDialog
 import com.ichi2.anki.exception.StorageAccessException

AnkiDroid/src/main/java/com/ichi2/anki/MediaRegistration.kt

@@ -22,6 +22,7 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.annotation.CheckResult
 import com.ichi2.anki.common.annotations.NeedsTest
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.compat.CompatHelper
 import com.ichi2.anki.libanki.exception.EmptyMediaException
 import com.ichi2.anki.multimediacard.fields.ImageField

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditorFragment.kt

@@ -90,6 +90,7 @@ import com.ichi2.anki.android.input.ShortcutGroup
 import com.ichi2.anki.android.input.ShortcutGroupProvider
 import com.ichi2.anki.android.input.shortcut
 import com.ichi2.anki.common.annotations.NeedsTest
+import com.ichi2.anki.common.crash.CrashReportService
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
 import com.ichi2.anki.common.utils.ext.ifZero
 import com.ichi2.anki.compat.CompatHelper.Companion.getSerializableCompat