Skip to content

Commit d3c6a15

Browse files
jmir1jmir1
committed
chore: Remove ACRA
1 parent 45d5591 commit d3c6a15

6 files changed

Lines changed: 10 additions & 44 deletions

File tree

‎.github/workflows/build_push.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ jobs:
3333
java-version: 17
3434
distribution: adopt
3535

36-
- name: Set ACRA properties
37-
env:
38-
acraUri: ${{ secrets.ACRA_URI }}
39-
acraLogin: ${{ secrets.ACRA_LOGIN }}
40-
acraPassword: ${{ secrets.ACRA_PASSWORD }}
41-
run: |
42-
echo "ACRA_URI=$acraUri" >> acra.properties
43-
echo "ACRA_LOGIN=$acraLogin" >> acra.properties
44-
echo "ACRA_PASSWORD=$acraPassword" >> acra.properties
45-
4636
- name: Build app and run unit tests
4737
uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
4838
with:

‎app/build.gradle.kts‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ android {
3333
buildConfigField("boolean", "PREVIEW", "false")
3434

3535
// Put these fields in acra.properties
36-
val acraProperties = Properties()
37-
rootProject.file("acra.properties")
38-
.takeIf { it.exists() }
39-
?.let { acraProperties.load(FileInputStream(it)) }
40-
val acraUri = acraProperties.getProperty("ACRA_URI", "")
41-
val acraLogin = acraProperties.getProperty("ACRA_LOGIN", "")
42-
val acraPassword = acraProperties.getProperty("ACRA_PASSWORD", "")
43-
buildConfigField("String", "ACRA_URI", "\"$acraUri\"")
44-
buildConfigField("String", "ACRA_LOGIN", "\"$acraLogin\"")
45-
buildConfigField("String", "ACRA_PASSWORD", "\"$acraPassword\"")
36+
// val acraProperties = Properties()
37+
// rootProject.file("acra.properties")
38+
// .takeIf { it.exists() }
39+
// ?.let { acraProperties.load(FileInputStream(it)) }
40+
// val acraUri = acraProperties.getProperty("ACRA_URI", "")
41+
// val acraLogin = acraProperties.getProperty("ACRA_LOGIN", "")
42+
// val acraPassword = acraProperties.getProperty("ACRA_PASSWORD", "")
43+
// buildConfigField("String", "ACRA_URI", "\"$acraUri\"")
44+
// buildConfigField("String", "ACRA_LOGIN", "\"$acraLogin\"")
45+
// buildConfigField("String", "ACRA_PASSWORD", "\"$acraPassword\"")
4646

4747
ndk {
4848
abiFilters += SUPPORTED_ABIS
@@ -251,9 +251,6 @@ dependencies {
251251
// Logging
252252
implementation(libs.logcat)
253253

254-
// Crash reports
255-
implementation(libs.bundles.acra)
256-
257254
// Shizuku
258255
implementation(libs.bundles.shizuku)
259256

‎app/src/main/java/eu/kanade/domain/base/BasePreferences.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package eu.kanade.domain.base
33
import android.content.Context
44
import android.content.pm.PackageManager
55
import dev.icerock.moko.resources.StringResource
6-
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
7-
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
86
import tachiyomi.core.common.preference.Preference
97
import tachiyomi.core.common.preference.PreferenceStore
108
import tachiyomi.i18n.MR
@@ -23,11 +21,6 @@ class BasePreferences(
2321

2422
fun extensionInstaller() = ExtensionInstallerPreference(context, preferenceStore)
2523

26-
fun acraEnabled() = preferenceStore.getBoolean(
27-
"acra.enable",
28-
isPreviewBuildType || isReleaseBuildType,
29-
)
30-
3124
fun deviceHasPip() = context.packageManager.hasSystemFeature(
3225
PackageManager.FEATURE_PICTURE_IN_PICTURE,
3326
)

‎app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import eu.kanade.tachiyomi.ui.more.OnboardingScreen
5858
import eu.kanade.tachiyomi.util.CrashLogUtil
5959
import eu.kanade.tachiyomi.util.system.isDevFlavor
6060
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
61-
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
6261
import eu.kanade.tachiyomi.util.system.isShizukuInstalled
6362
import eu.kanade.tachiyomi.util.system.powerManager
6463
import eu.kanade.tachiyomi.util.system.setDefaultSettings
@@ -98,12 +97,6 @@ object SettingsAdvancedScreen : SearchableSettings {
9897
val networkPreferences = remember { Injekt.get<NetworkPreferences>() }
9998

10099
return listOf(
101-
Preference.PreferenceItem.SwitchPreference(
102-
pref = basePreferences.acraEnabled(),
103-
title = stringResource(MR.strings.pref_enable_acra),
104-
subtitle = stringResource(MR.strings.pref_acra_summary),
105-
enabled = isPreviewBuildType || isReleaseBuildType,
106-
),
107100
Preference.PreferenceItem.TextPreference(
108101
title = stringResource(MR.strings.pref_dump_crash_logs),
109102
subtitle = stringResource(MR.strings.pref_dump_crash_logs_summary),

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[versions]
22
aboutlib_version = "11.2.2"
3-
acra = "5.11.3"
43
leakcanary = "2.14"
54
moko = "0.24.1"
65
okhttp_version = "5.0.0-alpha.14"
@@ -72,9 +71,6 @@ moko-gradle = { module = "dev.icerock.moko:resources-generator", version.ref = "
7271

7372
logcat = "com.squareup.logcat:logcat:0.1"
7473

75-
acra-http = { module = "ch.acra:acra-http", version.ref = "acra" }
76-
acra-scheduler = { module = "ch.acra:acra-advanced-scheduler", version.ref = "acra" }
77-
7874
aboutLibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlib_version" }
7975
aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
8076
aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" }
@@ -113,7 +109,6 @@ seeker = "io.github.2307vivek:seeker:1.2.2"
113109
truetypeparser = "io.github.yubyf:truetypeparser-light:2.1.4"
114110

115111
[bundles]
116-
acra = ["acra-http", "acra-scheduler"]
117112
okhttp = ["okhttp-core", "okhttp-logging", "okhttp-brotli", "okhttp-dnsoverhttps"]
118113
js-engine = ["quickjs-android"]
119114
sqlite = ["sqlite-framework", "sqlite-ktx", "sqlite-android"]

‎i18n/src/commonMain/moko-resources/base/strings.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,6 @@
542542
<string name="privacy_policy">Privacy policy</string>
543543
<string name="check_for_updates">Check for updates</string>
544544
<string name="updated_version">Updated to v%1$s</string>
545-
<string name="pref_enable_acra">Send crash reports</string>
546-
<string name="pref_acra_summary">Helps fix any bugs. No sensitive data will be sent</string>
547545
<string name="fdroid_warning">F-Droid builds are not officially supported.\nTap to learn more.</string>
548546
<string name="label_downloaded_only">Downloaded only</string>
549547
<string name="pref_incognito_mode">Incognito mode</string>

0 commit comments

Comments
 (0)