From 98f4b7086aa5b461ea50f85bd605364d75eca4da Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 1 Jan 2024 09:53:21 -0500 Subject: [PATCH] Defer ACRA reporting until device is idle/not low battery/on unmetered network (cherry picked from commit ec478cbb1bc0a80c18957169cbcc13505d46f37d) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/App.kt --- app/build.gradle.kts | 2 +- gradle/libs.versions.toml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 24d2927eb..013cb20d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -253,7 +253,7 @@ dependencies { implementation(libs.logcat) // Crash reports/analytics - // implementation(libs.acra.http) + // implementation(libs.bundles.acra) // "standardImplementation"(libs.firebase.analytics) // Shizuku diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2c058273..7f76209b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] aboutlib_version = "10.10.0" +acra = "5.11.3" leakcanary = "2.12" moko = "0.23.0" okhttp_version = "5.0.0-alpha.12" @@ -70,7 +71,8 @@ moko-gradle = { module = "dev.icerock.moko:resources-generator", version.ref = " logcat = "com.squareup.logcat:logcat:0.1" -acra-http = "ch.acra:acra-http:5.11.3" +acra-http = { module = "ch.acra:acra-http", version.ref = "acra" } +acra-scheduler = { module = "ch.acra:acra-advanced-scheduler", version.ref = "acra" } firebase-analytics = "com.google.firebase:firebase-analytics-ktx:21.5.0" aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" } @@ -100,6 +102,7 @@ voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", vers ktlint = "org.jlleitschuh.gradle:ktlint-gradle:12.0.3" [bundles] +acra = ["acra-http", "acra-scheduler"] okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"] js-engine = ["quickjs-android"] sqlite = ["sqlite-framework", "sqlite-ktx", "sqlite-android"]