From 2b15e230addeb7782b037fdd0530bf97f91fa74b Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Wed, 15 Nov 2023 19:07:44 +0100 Subject: [PATCH] Revert "Add ACRA for crash reports (#180)" (#185) This reverts commit 3d0cf8b902fb0d12eb5f4df8ec4c8cf148ffac5e. --- .github/workflows/sign.yml | 3 -- app/build.gradle.kts | 16 ---------- app/src/main/java/gq/kirmanak/mealient/App.kt | 7 ---- .../mealient/extensions/ContextExtensions.kt | 32 ------------------- gradle/libs.versions.toml | 5 --- 5 files changed, 63 deletions(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index cd0b8eb..44cc6f5 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -32,9 +32,6 @@ jobs: MEALIENT_KEY_PASSWORD: ${{ secrets.MEALIENT_KEY_PASSWORD }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} APPSWEEP_API_KEY: ${{ secrets.APPSWEEP_API_KEY }} - ACRA_HOST: ${{ secrets.ACRA_HOST }} - ACRA_LOGIN: ${{ secrets.ACRA_LOGIN }} - ACRA_PASSWORD: ${{ secrets.ACRA_PASSWORD }} run: | echo "$MEALIENT_KEY_STORE" | base64 -d > app/keystore.jks echo "storeFile=keystore.jks" > keystore.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a67b350..a9d6e9c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,19 +22,6 @@ android { testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner" testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true") resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de") - - buildConfigField( - "String", - "ACRA_HOST", - System.getenv("ACRA_HOST")?.let { "\"$it\"" } ?: "\"\"") - buildConfigField( - "String", - "ACRA_LOGIN", - System.getenv("ACRA_LOGIN")?.let { "\"$it\"" } ?: "\"\"") - buildConfigField( - "String", - "ACRA_PASSWORD", - System.getenv("ACRA_PASSWORD")?.let { "\"$it\"" } ?: "\"\"") } signingConfigs { @@ -152,9 +139,6 @@ dependencies { implementation(libs.coil) implementation(libs.coil.compose) - implementation(libs.acra.http) - implementation(libs.acra.scheduler) - testImplementation(libs.junit) implementation(libs.jetbrains.kotlinx.coroutinesAndroid) diff --git a/app/src/main/java/gq/kirmanak/mealient/App.kt b/app/src/main/java/gq/kirmanak/mealient/App.kt index 028fee3..1368d87 100644 --- a/app/src/main/java/gq/kirmanak/mealient/App.kt +++ b/app/src/main/java/gq/kirmanak/mealient/App.kt @@ -1,14 +1,12 @@ package gq.kirmanak.mealient import android.app.Application -import android.content.Context import coil.Coil import coil.ImageLoader import com.google.android.material.color.DynamicColors import dagger.hilt.android.HiltAndroidApp import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration import gq.kirmanak.mealient.data.migration.MigrationDetector -import gq.kirmanak.mealient.extensions.setupCrashReporting import gq.kirmanak.mealient.logging.Logger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -33,11 +31,6 @@ class App : Application() { private val appCoroutineScope = CoroutineScope(Dispatchers.Main + Job()) - override fun attachBaseContext(base: Context?) { - super.attachBaseContext(base) - setupCrashReporting() - } - override fun onCreate() { super.onCreate() logger.v { "onCreate() called" } diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt index dd2074d..5c3c909 100644 --- a/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt +++ b/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt @@ -1,16 +1,8 @@ package gq.kirmanak.mealient.extensions import android.app.Activity -import android.app.Application -import android.app.job.JobInfo import android.content.Context import android.content.ContextWrapper -import gq.kirmanak.mealient.BuildConfig -import org.acra.config.httpSender -import org.acra.config.scheduler -import org.acra.data.StringFormat -import org.acra.ktx.initAcra -import org.acra.sender.HttpSender fun Context.findActivity(): Activity? { var context = this @@ -20,27 +12,3 @@ fun Context.findActivity(): Activity? { } return null } - -internal fun Application.setupCrashReporting() { - val acraHost = BuildConfig.ACRA_HOST.takeUnless { it.isBlank() } ?: return - val acraLogin = BuildConfig.ACRA_LOGIN.takeUnless { it.isBlank() } ?: return - val acraPassword = BuildConfig.ACRA_PASSWORD.takeUnless { it.isBlank() } ?: return - initAcra { - reportFormat = StringFormat.JSON - alsoReportToAndroidFramework = true - - httpSender { - uri = "$acraHost/report" - basicAuthLogin = acraLogin - basicAuthPassword = acraPassword - httpMethod = HttpSender.Method.POST - // TODO compressed reports are failing due to https://github.com/F43nd1r/Acrarium/issues/458 - compress = false - } - - scheduler { - requiresNetworkType = JobInfo.NETWORK_TYPE_UNMETERED - requiresBatteryNotLow = true - } - } -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e94501a..8eede0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,8 +93,6 @@ hiltNavigationCompose = "1.0.0" ktor = "2.3.5" # https://github.com/coil-kt/coil/releases coil = "2.5.0" -# https://github.com/ACRA/acra/releases -acra = "5.11.3" [libraries] android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } @@ -209,9 +207,6 @@ ktor-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", versi coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } -acra-http = { group = "ch.acra", name = "acra-http", version.ref = "acra" } -acra-scheduler = { group = "ch.acra", name = "acra-advanced-scheduler", version.ref = "acra" } - [plugins] sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" } appsweep = { id = "com.guardsquare.appsweep", version.ref = "appsweep" }