Skip to content

Commit 33c62ab

Browse files
committed
Clean up some unnecessary bits
- Remove analytics/crash reporting - Remove app update check - Remove F-Droid warning - Remove Discord references
1 parent 899bd26 commit 33c62ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+42
-289
lines changed

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ representative at an online or offline event.
5959
## Enforcement
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62-
reported to the community moderators responsible for enforcement at
63-
the [Tachiyomi Discord server](https://discord.gg/tachiyomi).
62+
reported to the community moderators via issues.
6463
All complaints will be reviewed and investigated promptly and fairly.
6564

6665
All community moderators are obligated to respect the privacy and security of the

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To auto-fix some linting errors, run the `ktlintFormat` Gradle task.
3030

3131
## Getting help
3232

33-
- Join [the Discord server](https://discord.gg/tachiyomi) for online help and to ask questions while developing.
33+
No support is currently provided.
3434

3535
# Translations
3636

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
| Build | Stable | Weekly Preview | Contribute | Support Server |
2-
|-------|----------|---------|------------|---------|
3-
| [![CI](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml/badge.svg)](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) | [![Discord](https://img.shields.io/discord/349436576037732353.svg?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/tachiyomi) |
1+
| Build | Stable | Weekly Preview | Contribute |
2+
|-------|--------|----------------|------------|
3+
| [![CI](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml/badge.svg)](https://github.com/tachiyomiorg/tachiyomi/actions/workflows/build_push.yml) | [![stable release](https://img.shields.io/github/release/tachiyomiorg/tachiyomi.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi/releases) | [![latest preview build](https://img.shields.io/github/v/release/tachiyomiorg/tachiyomi-preview.svg?maxAge=3600&label=download)](https://github.com/tachiyomiorg/tachiyomi-preview/releases) | [![Translation status](https://hosted.weblate.org/widgets/tachiyomi/-/svg-badge.svg)](https://hosted.weblate.org/engage/tachiyomi/?utm_source=widget) |
44

55
# ![app icon](./.github/readme-images/app-icon.png)Tachiyomi
66
Tachiyomi is a free and open source manga reader for Android 6.0 and above.
@@ -28,8 +28,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
2828

2929
<details><summary>Issues</summary>
3030

31-
1. **Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/docs/faq/general), the [changelog](https://tachiyomi.org/changelogs/) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).**
32-
2. If you are unsure, ask here: [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/tachiyomi)
31+
**Before reporting a new issue, take a look at the [FAQ](https://tachiyomi.org/docs/faq/general), the [changelog](https://tachiyomi.org/changelogs/) and the already opened [issues](https://github.com/tachiyomiorg/tachiyomi/issues).**
3332

3433
</details>
3534

@@ -70,7 +69,6 @@ See [CODE_OF_CONDUCT.md](./CODE_OF_CONDUCT.md).
7069
## FAQ
7170

7271
[See our website.](https://tachiyomi.org/)
73-
You can also reach out to us on [Discord](https://discord.gg/tachiyomi).
7472

7573
## License
7674

‎app/build.gradle.kts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ plugins {
88
id("com.github.zellius.shortcut-helper")
99
}
1010

11-
if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
12-
apply<com.google.gms.googleservices.GoogleServicesPlugin>()
13-
}
14-
1511
shortcutHelper.setFilePath("./shortcuts.xml")
1612

1713
val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -31,9 +27,6 @@ android {
3127
buildConfigField("boolean", "INCLUDE_UPDATER", "false")
3228
buildConfigField("boolean", "PREVIEW", "false")
3329

34-
// Please disable ACRA or use your own instance in forked versions of the project
35-
buildConfigField("String", "ACRA_URI", "\"https://tachiyomi.kanade.eu/crash_report\"")
36-
3730
ndk {
3831
abiFilters += SUPPORTED_ABIS
3932
}
@@ -245,10 +238,6 @@ dependencies {
245238
// Logging
246239
implementation(libs.logcat)
247240

248-
// Crash reports/analytics
249-
implementation(libs.bundles.acra)
250-
"standardImplementation"(libs.firebase.analytics)
251-
252241
// Shizuku
253242
implementation(libs.bundles.shizuku)
254243

‎app/proguard-rules.pro‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,3 @@
7171

7272
# XmlUtil
7373
-keep public enum nl.adaptivity.xmlutil.EventType { *; }
74-
75-
# Firebase
76-
-keep class com.google.firebase.installations.** { *; }
77-
-keep interface com.google.firebase.installations.** { *; }

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333

3434
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
3535

36-
<!-- Remove permission from Firebase dependency -->
37-
<uses-permission
38-
android:name="com.google.android.gms.permission.AD_ID"
39-
tools:node="remove" />
40-
4136
<application
4237
android:name=".App"
4338
android:allowBackup="false"
@@ -236,11 +231,6 @@
236231
android:name="android.webkit.WebView.MetricsOptOut"
237232
android:value="true" />
238233

239-
<!-- Disable advertising ID collection for Firebase -->
240-
<meta-data
241-
android:name="google_analytics_adid_collection_enabled"
242-
android:value="false" />
243-
244234
</application>
245235

246236
</manifest>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package eu.kanade.domain.base
22

33
import android.content.Context
44
import dev.icerock.moko.resources.StringResource
5-
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
6-
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
75
import tachiyomi.core.preference.Preference
86
import tachiyomi.core.preference.PreferenceStore
97
import tachiyomi.i18n.MR
@@ -22,8 +20,6 @@ class BasePreferences(
2220

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

25-
fun acraEnabled() = preferenceStore.getBoolean("acra.enable", isPreviewBuildType || isReleaseBuildType)
26-
2723
fun shownOnboardingFlow() = preferenceStore.getBoolean(Preference.appStateKey("onboarding_complete"), false)
2824

2925
enum class ExtensionInstaller(val titleRes: StringResource, val requiresSystemPermission: Boolean) {

‎app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package eu.kanade.presentation.more
22

3-
import androidx.compose.foundation.clickable
43
import androidx.compose.foundation.layout.Column
54
import androidx.compose.foundation.layout.WindowInsets
65
import androidx.compose.foundation.layout.WindowInsetsSides
@@ -23,7 +22,6 @@ import androidx.compose.ui.Modifier
2322
import androidx.compose.ui.graphics.vector.ImageVector
2423
import androidx.compose.ui.platform.LocalUriHandler
2524
import androidx.compose.ui.res.vectorResource
26-
import eu.kanade.presentation.components.WarningBanner
2725
import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
2826
import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
2927
import eu.kanade.tachiyomi.R
@@ -60,14 +58,7 @@ fun MoreScreen(
6058
),
6159
) {
6260
if (isFDroid) {
63-
WarningBanner(
64-
textRes = MR.strings.fdroid_warning,
65-
modifier = Modifier.clickable {
66-
uriHandler.openUri(
67-
"https://tachiyomi.org/docs/faq/general#how-do-i-update-from-the-f-droid-builds",
68-
)
69-
},
70-
)
61+
// Don't really care about slow updaters now
7162
}
7263
}
7364
},

‎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
@@ -48,7 +48,6 @@ import eu.kanade.tachiyomi.ui.more.OnboardingScreen
4848
import eu.kanade.tachiyomi.util.CrashLogUtil
4949
import eu.kanade.tachiyomi.util.system.isDevFlavor
5050
import eu.kanade.tachiyomi.util.system.isPreviewBuildType
51-
import eu.kanade.tachiyomi.util.system.isReleaseBuildType
5251
import eu.kanade.tachiyomi.util.system.isShizukuInstalled
5352
import eu.kanade.tachiyomi.util.system.powerManager
5453
import eu.kanade.tachiyomi.util.system.setDefaultSettings
@@ -88,12 +87,6 @@ object SettingsAdvancedScreen : SearchableSettings {
8887
return buildList {
8988
addAll(
9089
listOf(
91-
Preference.PreferenceItem.SwitchPreference(
92-
pref = basePreferences.acraEnabled(),
93-
title = stringResource(MR.strings.pref_enable_acra),
94-
subtitle = stringResource(MR.strings.pref_acra_summary),
95-
enabled = isPreviewBuildType || isReleaseBuildType,
96-
),
9790
Preference.PreferenceItem.TextPreference(
9891
title = stringResource(MR.strings.pref_dump_crash_logs),
9992
subtitle = stringResource(MR.strings.pref_dump_crash_logs_summary),

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

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package eu.kanade.presentation.more.settings.screen.about
22

33
import android.content.Context
4-
import androidx.compose.animation.AnimatedVisibility
54
import androidx.compose.foundation.layout.Arrangement
65
import androidx.compose.foundation.layout.Row
76
import androidx.compose.foundation.layout.fillMaxWidth
87
import androidx.compose.foundation.layout.padding
9-
import androidx.compose.foundation.layout.size
108
import androidx.compose.material.icons.Icons
119
import androidx.compose.material.icons.outlined.Public
12-
import androidx.compose.material3.CircularProgressIndicator
1310
import androidx.compose.runtime.Composable
1411
import androidx.compose.runtime.getValue
1512
import androidx.compose.runtime.mutableStateOf
@@ -30,13 +27,10 @@ import eu.kanade.presentation.util.LocalBackPress
3027
import eu.kanade.presentation.util.Screen
3128
import eu.kanade.tachiyomi.BuildConfig
3229
import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
33-
import eu.kanade.tachiyomi.data.updater.RELEASE_URL
34-
import eu.kanade.tachiyomi.ui.more.NewUpdateScreen
3530
import eu.kanade.tachiyomi.util.CrashLogUtil
3631
import eu.kanade.tachiyomi.util.lang.toDateTimestampString
3732
import eu.kanade.tachiyomi.util.system.copyToClipboard
3833
import eu.kanade.tachiyomi.util.system.toast
39-
import kotlinx.coroutines.launch
4034
import logcat.LogPriority
4135
import tachiyomi.core.util.lang.withIOContext
4236
import tachiyomi.core.util.lang.withUIContext
@@ -48,7 +42,6 @@ import tachiyomi.presentation.core.components.ScrollbarLazyColumn
4842
import tachiyomi.presentation.core.components.material.Scaffold
4943
import tachiyomi.presentation.core.i18n.stringResource
5044
import tachiyomi.presentation.core.icons.CustomIcons
51-
import tachiyomi.presentation.core.icons.Discord
5245
import tachiyomi.presentation.core.icons.Facebook
5346
import tachiyomi.presentation.core.icons.Github
5447
import tachiyomi.presentation.core.icons.Reddit
@@ -98,61 +91,6 @@ object AboutScreen : Screen() {
9891
)
9992
}
10093

101-
if (BuildConfig.INCLUDE_UPDATER) {
102-
item {
103-
TextPreferenceWidget(
104-
title = stringResource(MR.strings.check_for_updates),
105-
widget = {
106-
AnimatedVisibility(visible = isCheckingUpdates) {
107-
CircularProgressIndicator(
108-
modifier = Modifier.size(28.dp),
109-
strokeWidth = 3.dp,
110-
)
111-
}
112-
},
113-
onPreferenceClick = {
114-
if (!isCheckingUpdates) {
115-
scope.launch {
116-
isCheckingUpdates = true
117-
118-
checkVersion(
119-
context = context,
120-
onAvailableUpdate = { result ->
121-
val updateScreen = NewUpdateScreen(
122-
versionName = result.release.version,
123-
changelogInfo = result.release.info,
124-
releaseLink = result.release.releaseLink,
125-
downloadLink = result.release.getDownloadLink(),
126-
)
127-
navigator.push(updateScreen)
128-
},
129-
onFinish = {
130-
isCheckingUpdates = false
131-
},
132-
)
133-
}
134-
}
135-
},
136-
)
137-
}
138-
}
139-
140-
if (!BuildConfig.DEBUG) {
141-
item {
142-
TextPreferenceWidget(
143-
title = stringResource(MR.strings.whats_new),
144-
onPreferenceClick = { uriHandler.openUri(RELEASE_URL) },
145-
)
146-
}
147-
}
148-
149-
item {
150-
TextPreferenceWidget(
151-
title = stringResource(MR.strings.help_translate),
152-
onPreferenceClick = { uriHandler.openUri("https://tachiyomi.org/docs/contribute#translation") },
153-
)
154-
}
155-
15694
item {
15795
TextPreferenceWidget(
15896
title = stringResource(MR.strings.licenses),
@@ -179,11 +117,6 @@ object AboutScreen : Screen() {
179117
icon = Icons.Outlined.Public,
180118
url = "https://tachiyomi.org",
181119
)
182-
LinkIcon(
183-
label = "Discord",
184-
icon = CustomIcons.Discord,
185-
url = "https://discord.gg/tachiyomi",
186-
)
187120
LinkIcon(
188121
label = "X",
189122
icon = CustomIcons.X,

0 commit comments

Comments
 (0)