From a47e88a9538dfdad6faece97c43f94dd0e1f28bb Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 17 Jan 2021 11:09:29 -0500
Subject: [PATCH] Move ACRA endpoint config to build.gradle.kts
(cherry picked from commit 3319ccfd41a75b5c80a4b05aa2a9f41e1739a50f)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/App.kt
---
app/build.gradle.kts | 20 +++++++++-----------
app/src/main/java/eu/kanade/tachiyomi/App.kt | 12 ++----------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 48559ca43..84b40027f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,17 +24,6 @@ if (!gradle.startParameter.taskRequests.toString().contains("Debug")) {
shortcutHelper.setFilePath("./shortcuts.xml")
-
-fun runCommand(command: String): String {
- val byteOut = ByteArrayOutputStream()
- project.exec {
- commandLine = command.split(" ")
- standardOutput = byteOut
- }
- return String(byteOut.toByteArray()).trim()
-}
-
-
android {
compileSdkVersion(AndroidConfig.compileSdk)
buildToolsVersion(AndroidConfig.buildTools)
@@ -376,3 +365,12 @@ fun getBuildTime(): String {
df.timeZone = TimeZone.getTimeZone("UTC")
return df.format(Date())
}
+
+fun runCommand(command: String): String {
+ val byteOut = ByteArrayOutputStream()
+ project.exec {
+ commandLine = command.split(" ")
+ standardOutput = byteOut
+ }
+ return String(byteOut.toByteArray()).trim()
+}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index 7606bc0a6..32ef1fdda 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -57,6 +57,8 @@ import kotlin.time.days
open class App : Application(), LifecycleObserver {
+ private val preferences: PreferencesHelper by injectLazy()
+
private lateinit var firebaseAnalytics: FirebaseAnalytics
override fun onCreate() {
@@ -67,15 +69,6 @@ open class App : Application(), LifecycleObserver {
workaroundAndroid7BrokenSSL()
- // Debug tool; see https://fbflipper.com/
- // SoLoader.init(this, false)
- // if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
- // val client = AndroidFlipperClient.getInstance(this)
- // client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
- // client.addPlugin(DatabasesFlipperPlugin(this))
- // client.start()
- // }
-
// TLS 1.3 support for Android < 10
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
Security.insertProviderAt(Conscrypt.newProvider(), 1)
@@ -135,7 +128,6 @@ open class App : Application(), LifecycleObserver {
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
@Suppress("unused")
fun onAppBackgrounded() {
- val preferences: PreferencesHelper by injectLazy()
if (preferences.lockAppAfter().get() >= 0) {
SecureActivityDelegate.locked = true
}